Commit Graph

2051 Commits

Author SHA1 Message Date
黎永顺 68bd42c2c0 feature/2.9.42310.02-社保福利档案页面重构 2023-11-03 09:54:02 +08:00
黎永顺 b0500cf8f9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 18:17:30 +08:00
黎永顺 a617c40c1f feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 16:33:16 +08:00
黎永顺 f9f47324e5 feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-02 14:30:18 +08:00
黎永顺 8a3a1dcf76 feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 09:18:16 +08:00
黎永顺 963b5492ef Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税 2023-11-01 16:20:18 +08:00
黎永顺 121d82d379 feature/2.9.42310.02-社保福利档案页面重构 2023-11-01 16:18:51 +08:00
黎永顺 b2dda3a728 feature/2.9.42310.02-社保福利档案页面重构 2023-11-01 09:10:28 +08:00
黎永顺 c068959e73 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 16:59:50 +08:00
黎永顺 a21982bf62 hotfix/2.9.42310.02 2023-10-31 15:50:52 +08:00
黎永顺 6aed11a411 hotfix/2.9.42310.02 2023-10-31 15:45:15 +08:00
黎永顺 b14fce7949 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 15:30:21 +08:00
黎永顺 cd9964a329 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-31 09:44:59 +08:00
黎永顺 e246e10af7 hotfix/2.9.42310.02 2023-10-30 15:54:25 +08:00
黎永顺 4acdff060c hotfix/2.9.42310.02 2023-10-30 08:55:15 +08:00
黎永顺 015e29ac47 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop 2023-10-27 17:28:21 +08:00
黎永顺 c44f92fb56 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-27 17:28:11 +08:00
黎永顺 32e01016c1 hotfix/2.9.42310.02 2023-10-27 16:27:01 +08:00
黎永顺 eed8d3a5bd feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 16:14:59 +08:00
黎永顺 235e7cc6f0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 10:43:23 +08:00
黎永顺 06895e5a36 Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
2023-10-26 10:41:40 +08:00
黎永顺 7d09c5b55b hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
2023-10-25 15:45:38 +08:00
黎永顺 d75aac6bf7 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-24 18:38:38 +08:00
黎永顺 f9c3225307 hotfix/2.9.42309.01-个税
个税申报表错误提示语
2023-10-24 18:37:53 +08:00
黎永顺 25c0c65269 hotfix/2.9.42309.01-个税
个税申报表错误提示语
2023-10-24 18:26:40 +08:00
黎永顺 ba878070a5 hotfix/2.9.42309.01-个税
个税申报表错误提示语
2023-10-24 18:19:10 +08:00
黎永顺 0e60e1e1c8 hotfix/2.9.42309.01-个税 2023-10-24 16:23:54 +08:00
黎永顺 d19a6ebbe3 hotfix/2.9.42309.01-个税 2023-10-24 14:04:37 +08:00
黎永顺 9e7e142296 hotfix/2.9.42309.01-个税 2023-10-24 08:42:07 +08:00
黎永顺 d0cc845911 hotfix/2.9.42310.02 2023-10-23 18:38:07 +08:00
黎永顺 63dcd77589 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop 2023-10-23 18:30:47 +08:00
黎永顺 4a392f2357 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-23 18:30:35 +08:00
黎永顺 bc28d4ea2f Merge branch 'feature/2.9.42310.01-社保档案操作日志' into develop 2023-10-23 18:30:25 +08:00
黎永顺 967d0bacd1 feature/2.9.42310.01-社保档案操作日志 2023-10-23 18:28:29 +08:00
黎永顺 510e46045e feature/2.9.42310.01-社保档案操作日志 2023-10-23 18:06:09 +08:00
黎永顺 8b7bb221e2 feature/2.9.42310.01-社保档案操作日志 2023-10-23 17:37:17 +08:00
黎永顺 452c22c262 feature/2.9.42310.01-社保档案操作日志 2023-10-23 15:29:26 +08:00
黎永顺 d61fccaf43 hotfix/2.9.42309.01-个税 2023-10-23 14:35:10 +08:00
黎永顺 cd163693c8 release/2.9.42310.01-个税 2023-10-23 11:06:04 +08:00
黎永顺 8f23fc6c8b Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 2023-10-23 10:57:27 +08:00
黎永顺 e21bbcb3f8 Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/declare/index.less
#	pc4mobx/hrmSalary/stores/declare.js
2023-10-23 10:57:05 +08:00
黎永顺 d075fceb05 hotfix/2.9.42310.01 2023-10-20 14:41:42 +08:00
黎永顺 4898ff8335 hotfix/2.9.42310.01 2023-10-20 11:39:20 +08:00
黎永顺 26b25e04df hotfix/2.9.42310.01 2023-10-20 11:21:14 +08:00
黎永顺 f78a59285a hotfix/2.9.42310.01 2023-10-20 11:18:27 +08:00
黎永顺 d0aa6e93a0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-20 10:27:00 +08:00
黎永顺 86980f33b0 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2023-10-19 13:39:53 +08:00
黎永顺 fafbfbe253 Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-19 13:38:26 +08:00
黎永顺 8838566b05 hotfix/2.9.42310.01 2023-10-19 13:38:00 +08:00
黎永顺 bec2e5a5b2 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 11:51:41 +08:00