Commit Graph

1400 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 5031d3a032 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 09:42:46 +08:00
黎永顺 3dd6ede31c Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-18 17:19:14 +08:00
黎永顺 429853a6a6 hotfix/2.9.42310.01
公式测试结果显示修改
2023-10-18 17:18:44 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +08:00
黎永顺 55c6fd80be hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制 2023-10-18 11:09:37 +08:00
黎永顺 a61e6eb847 Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01 2023-10-18 10:25:08 +08:00
黎永顺 4519401f64 Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into release/2.9.42310.01 2023-10-18 10:24:54 +08:00
黎永顺 5a78344e2f Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-18 10:24:41 +08:00
黎永顺 db166275c4 hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制 2023-10-18 10:24:13 +08:00
黎永顺 0acc570a24 feature/2.9.42310.01-工资单发放页面重构单 2023-10-18 10:18:26 +08:00
黎永顺 7e30f73069 feature/2.9.42310.01-工资单发放页面重构单 2023-10-17 17:17:01 +08:00
黎永顺 a84a216000 hotfix/2.9.42309.01-个税 2023-10-17 11:01:29 +08:00
黎永顺 2e613014fe feature/2.9.42310.01-工资单发放页面重构 2023-10-17 09:17:37 +08:00
黎永顺 6ea39d8255 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 16:09:30 +08:00
黎永顺 9a03c6ad8b feature/2.9.42310.01-调薪记录 2023-10-16 15:27:29 +08:00
黎永顺 984192fdf2 Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录 2023-10-16 14:13:53 +08:00
黎永顺 3c9cf1c730 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 11:13:44 +08:00
黎永顺 c2efaf193b feature/2.9.42310.01-工资单发放页面重构 2023-10-13 15:53:43 +08:00
黎永顺 53ddc607b3 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 14:52:59 +08:00
黎永顺 79a3f460e7 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 10:57:47 +08:00
黎永顺 ab3be2c1f9 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 10:20:14 +08:00
黎永顺 7b79fe5dc5 feature/2.9.42310.01-调薪记录 2023-10-13 09:51:50 +08:00
黎永顺 02863814ba feature/2.9.42310.01-工资单发放页面重构 2023-10-13 09:17:54 +08:00