Commits · 23b09c1ac301be89d70a7affed231cd79f779f21 · wangxiaoming / traffic-front

25 Feb, 2019 1 commit
- CIT数据导入功能模块 · 23b09c1a
  zhkwei authored Feb 25, 2019
  
  23b09c1a
22 Feb, 2019 22 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 097ae99c
  zhkwei authored Feb 22, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/Scripts/module-part2.js
#	atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
```
  097ae99c
- CIT数据导入功能模块 · 618f7876
  zhkwei authored Feb 22, 2019
  
  618f7876
- fixbug · 772a2824
  gary authored Feb 22, 2019
  
  772a2824
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 3c8008dd
  gary authored Feb 22, 2019
  
  3c8008dd
- 1、补充模板 · be885e65
  gary authored Feb 22, 2019
  
  be885e65
- 1、excel导入-发票记录 · 77ed2226
  gary authored Feb 22, 2019
```
2、excel导入-已认证发票清单
```
  77ed2226
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 2258f171
  eddie.woo authored Feb 22, 2019
  
  2258f171
- reset form · e820f312
  eddie.woo authored Feb 22, 2019
  
  e820f312
- add ebs api request---Ken · f78ff302
  Ken you authored Feb 22, 2019
  
  f78ff302
- fix vat language---Ken · c8f8ab0e
  Ken you authored Feb 22, 2019
  
  c8f8ab0e
- 修改dffs跟jffs公式取值数据源 · 0ed8adc2
  chase authored Feb 22, 2019
  
  0ed8adc2
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 13db73b9
  gary authored Feb 22, 2019
  
  13db73b9
- tb_final · 91343675
  gary authored Feb 22, 2019
  
  91343675
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · afa5fe89
  eddie.woo authored Feb 22, 2019
  
  afa5fe89
- modify · eeafc2a5
  eddie.woo authored Feb 22, 2019
  
  eeafc2a5
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 6452bee7
  gary authored Feb 22, 2019
  
  6452bee7
- rate update · 3111d014
  gary authored Feb 22, 2019
  
  3111d014
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · a5325903
  chase authored Feb 22, 2019
  
  a5325903
- 添加mapper · 8f1c0940
  chase authored Feb 22, 2019
  
  8f1c0940
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · b8190048
  zhkwei authored Feb 22, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/common/utils/constant.js
```
  b8190048
- CIT数据导入功能模块 · 9f3ef673
  zhkwei authored Feb 22, 2019
  
  9f3ef673
- 修改税金公式定位不到数据行时数据的展示效果 · 421756f9
  chase authored Feb 22, 2019
  
  421756f9
21 Feb, 2019 11 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · ac2da005
  eddie.woo authored Feb 21, 2019
  
  ac2da005
- modify · f6cd03e1
  eddie.woo authored Feb 21, 2019
  
  f6cd03e1
- modify · 3ce7ed2b
  eddie.woo authored Feb 21, 2019
  
  3ce7ed2b
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 3b0925a3
  gary authored Feb 21, 2019
  
  3b0925a3
- 1、数据抽取前端 · f7e25c79
  gary authored Feb 21, 2019
```
2、模板下载
```
  f7e25c79
- 对上次提交的补充 · 01a3158a
  zhkwei authored Feb 21, 2019
  
  01a3158a
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 4ce8ca19
  zhkwei authored Feb 21, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html
```
  4ce8ca19
- CIT功能列表--数据导入（上传Excel文件导入部分） · 5d81340d
  zhkwei authored Feb 21, 2019
  
  5d81340d
- 修改税金公式支持不传参数 · 3006acfe
  chase authored Feb 21, 2019
  
  3006acfe
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 2caf2528
  chase authored Feb 21, 2019
  
  2caf2528
- 新增税金计算公式（按type定位） · ea289174
  chase authored Feb 21, 2019
  
  ea289174
20 Feb, 2019 6 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 31e382e2
  gary authored Feb 20, 2019
  
  31e382e2
- 1、fixbug · 3db150f2
  gary authored Feb 20, 2019
```
2、添加excel导入机构筛选
```
  3db150f2
- modify · d0f6bbe2
  eddie.woo authored Feb 20, 2019
  
  d0f6bbe2
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 03000ff9
  chase authored Feb 20, 2019
  
  03000ff9
- merge · 7e67c133
  eddie.woo authored Feb 20, 2019
  
  7e67c133
- modify · f6e95b16
  eddie.woo authored Feb 20, 2019
  
  f6e95b16