Commits · 11b3239253ca700cef2d655d6bbb416009d6d184 · wangxiaoming / traffic-front

14 May, 2019 4 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · 11b32392
  weizhikai authored May 14, 2019
  
  11b32392
- 1、批处理模块因部分英文版本导致宽度不够，增加左侧菜单栏的宽度；2、VAT数据预览关于是否关账进行状态码的转换；3、查看报表历史版本前面的图标箭头；4、CIT历… · 2f2499fe
  weizhikai authored May 14, 2019
```
1、批处理模块因部分英文版本导致宽度不够，增加左侧菜单栏的宽度；2、VAT数据预览关于是否关账进行状态码的转换；3、查看报表历史版本前面的图标箭头；4、CIT历史版本添加中英文版本；5、机构基本信息若没有则显示无；6、修改机构基本信息公司代码加上红色*；7、批处理日志界面美化；8、隐藏现金流量表的追加导入
```
  2f2499fe
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · 32ff80aa
  Eddie.Wu authored May 14, 2019
```
fix bug

See merge request root/atms!369
```
  32ff80aa
- fix bug · a30927ca
  chase authored May 14, 2019
  
  a30927ca
13 May, 2019 3 commits

Merge branch 'dev_wzk' into 'dev_mysql' · bfd9680b

Eddie.Wu authored May 13, 2019

1、导入分发细致划分；2、各个预览页面重置按钮不刷新数据；3、VAT科目余额查询条件bug修改；4、CIT预提查询条件bug；5、VAT日记账数据预览改变Grid防止水平滚轮滚动导致一些列会出现短暂空白	 1、导入分发页面条件框对齐；2、日记账预览去掉多余的列；3、财务数据抽取列的宽度；4、机构展示基本信息时展示出公司代码；5、VAT日记账预览导出去掉多余列 另导入分发细致划分功能需要更改数据库数据，不改变结构

See merge request root/atms!368

bfd9680b

1、VAT日记账预览导出去掉多余列 · d47fb570
weizhikai authored May 13, 2019

d47fb570
1、导入分发页面条件框对齐；2、日记账预览去掉多余的列；3、财务数据抽取列的宽度；4、机构展示基本信息时展示出公司代码 · ae756386
weizhikai authored May 13, 2019

ae756386

10 May, 2019 3 commits
- 1、VAT日记账数据预览改变Grid防止水平滚轮滚动导致一些列会出现短暂空白 · 4416f756
  weizhikai authored May 10, 2019
  
  4416f756
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · 62c0d7e4
  weizhikai authored May 10, 2019
  
  62c0d7e4
- 1、导入分发细致划分；2、各个预览页面重置按钮不刷新数据；3、VAT科目余额查询条件bug修改；4、CIT预提查询条件bug； · a4e708e9
  weizhikai authored May 10, 2019
  
  a4e708e9
09 May, 2019 4 commits
- Merge branch 'dev_wzk' into 'dev_mysql' · 13a0b5f1
  Eddie.Wu authored May 09, 2019
```
1、导入分发及数据抽取日期控件改成中英文都正确；2、开票记录与收入类型映射配置导入机构验证；3、修改机构基本信息时公司代码的disable属性去掉

See merge request root/atms!365
```
  13a0b5f1
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · 1121fbda
  weizhikai authored May 09, 2019
  
  1121fbda
- 1、导入分发及数据抽取日期控件改成中英文都正确；2、开票记录与收入类型映射配置导入机构验证；3、修改机构基本信息时放开公司代码的disable属性 · 07cc80ab
  weizhikai authored May 09, 2019
  
  07cc80ab
- 1、固资导入分类bug；2、预提重分类数据预览界面千分位及导出bug；3、报表导出数值千分位 · 2a9945c4
  weizhikai authored May 09, 2019
  
  2a9945c4
08 May, 2019 9 commits
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · bce53a58
  Eddie.Wu authored May 08, 2019
```
fix bug

See merge request root/atms!363
```
  bce53a58
- Merge branch 'dev_wzk' into 'dev_mysql' · 40f94ece
  Eddie.Wu authored May 08, 2019
```
机构地区三级联动选到区县展示问题

See merge request root/atms!361
```
  40f94ece
- fix bug · d8743c67
  chase authored May 08, 2019
  
  d8743c67
- 机构地区三级联动区县可选可不选，所以增加当前地区属于市还是区县的判断及后台查询 · 2b6738a8
  weizhikai authored May 08, 2019
  
  2b6738a8
- 机构地区三级联动选到区县展示问题 · e8f51d96
  weizhikai authored May 08, 2019
  
  e8f51d96
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · fc1419ff
  weizhikai authored May 08, 2019
  
  fc1419ff
- 机构地区三级联动选到区县展示问题 · 72e93798
  weizhikai authored May 08, 2019
  
  72e93798
- add profile · 03c90c29
  eddie.woo authored May 08, 2019
  
  03c90c29
- Merge branch 'dev_wzk' into 'dev_mysql' · 59d4fcbe
  Eddie.Wu authored May 08, 2019
```
1、VAT数据预览导出模板优化；2、查看报表-手工输入的数值允许输入千分位格式数值；3、EBS抽取针对先走callback再走responsebug ；4、导入分发各个模板优化；5、CIT试算平衡表导入时页面的展示及提示 ；6、导入分发导入文件后取消文件名；7、数据日志记录分页

See merge request root/atms!360
```
  59d4fcbe
07 May, 2019 5 commits
- 机构地区三级联动选到区县 · dae528a7
  weizhikai authored May 07, 2019
  
  dae528a7
- 1、VAT数据预览到处模板优化；2、查看报表-手工输入的数值允许输入千分位格式数值 · 7c182ce6
  weizhikai authored May 07, 2019
  
  7c182ce6
- 1、导入分发各个模板优化；2、CIT试算平衡表导入时页面的展示及提示 · 71a118bd
  weizhikai authored May 07, 2019
  
  71a118bd
- Merge branch 'dev_wzk' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · ab7696c2
  weizhikai authored May 07, 2019
  
  ab7696c2
- 1、导入分发导入文件后取消文件名；2、数据日志记录分页 · de9017ae
  weizhikai authored May 07, 2019
  
  de9017ae
06 May, 2019 4 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · ee504ab8
  zhkwei authored May 06, 2019
  
  ee504ab8
- 1、EBS callback；2、数据日志记录页面分页；3、VAT数据预览各列宽度；4、VAT日记账数据预览导出bug；5、VAT下载的模板 · c6777ae0
  zhkwei authored May 06, 2019
  
  c6777ae0
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · c590503e
  Eddie.Wu authored May 06, 2019
```
fix bug

See merge request root/atms!356
```
  c590503e
- fix bug · 862b5e7e
  chase authored May 06, 2019
  
  862b5e7e
05 May, 2019 3 commits
- Merge branch 'dev_wzk' into 'dev_mysql' · f9a7711a
  Eddie.Wu authored May 05, 2019
```
取消EBS抽取循环

See merge request root/atms!354
```
  f9a7711a
- 取消EBS抽取循环 · 14c21be7
  zhkwei authored May 05, 2019
  
  14c21be7
- 1、现金流量表排序；2、EBS抽取针对先走callback再走responsebug · f7da326b
  zhkwei authored May 05, 2019
  
  f7da326b
30 Apr, 2019 2 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · f9d7fce0
  zhkwei authored Apr 30, 2019
  
  f9d7fce0
- 1、更改机构账套要更换卡片对应的账套；2、EBS抽取汇率表状态设置；3、CIT导出报表bug；4、预提更改下载的模板 · 18602f5c
  zhkwei authored Apr 30, 2019
  
  18602f5c
29 Apr, 2019 1 commit
- 报表导出报错问题 · b8a9447a
  eddie.woo authored Apr 29, 2019
  
  b8a9447a
28 Apr, 2019 2 commits
- Merge branch 'revert-bfca9714' into 'dev_mysql' · 29dd5042
  Eddie.Wu authored Apr 28, 2019
```
Revert "Merge branch 'dev_kevin' into 'dev_mysql'"

See merge request root/atms!347
```
  29dd5042
- Revert "Merge branch 'dev_kevin' into 'dev_mysql'" · 7b7676fa
  Eddie.Wu authored Apr 28, 2019
```
This reverts merge request !341
```
  7b7676fa