Commit Graph

1559 Commits

Author SHA1 Message Date
黎永顺 07c6ca839f hotfix/2.9.9.2312.01 2023-12-01 17:56:16 +08:00
黎永顺 04ab495c25 hotfix/2.9.9.2312.01 2023-12-01 17:22:34 +08:00
黎永顺 78aaac8115 工资单修改 2023-12-01 16:39:31 +08:00
黎永顺 4448393373 feature/2.9.42310.02-社保福利档案页面重构 2023-12-01 11:21:01 +08:00
黎永顺 66392e6e10 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-12-01 09:25:33 +08:00
黎永顺 49eab11325 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-30 15:41:55 +08:00
黎永顺 b14c2f9f87 feature/2.9.42310.02-社保福利档案页面重构 2023-11-30 15:13:09 +08:00
黎永顺 f113cb437f feature/2.9.42310.02-社保福利档案页面重构 2023-11-30 14:52:14 +08:00
黎永顺 36eb6eae6a feature/2.9.9.2312.01-接口复写合并 2023-11-30 14:04:57 +08:00
黎永顺 39650fa172 Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并
# Conflicts:
#	pc4mobx/hrmSalary/apis/archive.js
2023-11-30 13:55:38 +08:00
黎永顺 7fd754ad0f release/2.9.9.2312.01-个税 2023-11-30 13:48:33 +08:00
黎永顺 2196dde486 Merge branch 'master' into hotfix/2.9.9.2312.01 2023-11-30 09:22:40 +08:00
黎永顺 4f23b8db3c hotfix/2.9.9.2312.01 2023-11-30 09:22:35 +08:00
黎永顺 9949df47fb feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-30 09:10:59 +08:00
黎永顺 84d4df6d3d feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-29 18:29:55 +08:00
黎永顺 b163858722 release/2.9.9.2312.01-个税 2023-11-29 15:38:10 +08:00
黎永顺 198c7c8b76 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into release/2.9.9.2312.01-个税 2023-11-29 15:08:46 +08:00
黎永顺 79fca386d3 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-29 14:02:53 +08:00
黎永顺 80cf2835d3 Merge branch 'master' into release/2.9.42311.02-个税 2023-11-28 15:25:28 +08:00
黎永顺 3da1d6964b 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 15:24:48 +08:00
黎永顺 7cc9e422b1 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 13:44:53 +08:00
黎永顺 23f15bd423 feature/2.9.42311.02-社保核算以及薪资账套查询优化 2023-11-27 19:17:44 +08:00
黎永顺 e01b5bf1c9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 17:52:17 +08:00
黎永顺 5e60775029 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 17:45:11 +08:00
黎永顺 2c7633b0c9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 15:29:07 +08:00
黎永顺 7579a8cd31 feature/2.9.42310.02-社保福利档案页面重构 2023-11-24 14:45:37 +08:00
黎永顺 24cf38e964 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02 2023-11-24 14:06:48 +08:00
黎永顺 bbb9bce35a feature/2.9.42310.01-工资单发放页面重构 2023-11-24 13:55:58 +08:00
黎永顺 c2f4c4372c feature/2.9.42310.02-社保福利档案页面重构 2023-11-24 11:43:03 +08:00
黎永顺 6f9f24f7a8 feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置 2023-11-23 15:50:21 +08:00
黎永顺 94b3f056f4 hotfix/2.9.42311.02-我的薪资福利页面重构 2023-11-20 17:48:44 +08:00
黎永顺 4ffd2731ee Merge branch 'hotfix/2.9.42311.02' into release/2.9.42311.02-个税 2023-11-17 13:47:56 +08:00
黎永顺 373b0aad56 hotfix/2.9.42311.02 2023-11-17 13:33:56 +08:00
黎永顺 f4574570d9 hotfix/2.9.42311.02 2023-11-15 13:53:56 +08:00
黎永顺 f0b657f26e Merge branch 'release/2.9.42311.02' into hotfix/2.9.42311.02 2023-11-15 13:32:40 +08:00
黎永顺 7dfd328aae hotfix/2.9.42311.02 2023-11-14 14:45:13 +08:00
黎永顺 ff870c110c hotfix/2.9.42311.02-薪资核算名称修改 2023-11-13 16:51:40 +08:00
黎永顺 f51de57661 feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 15:49:45 +08:00
黎永顺 1d110fe25d feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 15:35:43 +08:00
黎永顺 115a0ee64f Merge branch 'hotfix/2.9.42311.02' 2023-11-13 14:18:16 +08:00
黎永顺 0798d2bf96 hotfix/2.9.42311.02 2023-11-13 14:15:49 +08:00
黎永顺 3ab54027f9 feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 14:13:03 +08:00
黎永顺 9f114e9867 hotfix/2.9.42311.02 2023-11-13 11:17:38 +08:00
黎永顺 28c50dc563 hotfix/2.9.42311.02 2023-11-13 11:03:19 +08:00
黎永顺 0a1173faaa feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 10:41:47 +08:00
黎永顺 3ec45fc1ba Merge branch 'release/2.9.42311.01' into release/2.9.42311.01-个税 2023-11-10 13:35:41 +08:00
黎永顺 d46f40b086 feature/2.9.42310.02-社保福利档案页面重构 2023-11-10 13:34:36 +08:00
黎永顺 436db457db feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 17:51:38 +08:00
黎永顺 7908f925ea release/2.9.42311.01 2023-11-09 16:27:33 +08:00
黎永顺 c194711c78 Merge branch 'release/2.9.42311.01' into release/2.9.42310.01-个税 2023-11-09 15:36:38 +08:00
黎永顺 1afaa04129 1release/2.9.42311.01 2023-11-09 15:36:13 +08:00
黎永顺 f0f4bfb877 feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 13:54:34 +08:00
黎永顺 aa1cef89b2 feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 13:52:54 +08:00
黎永顺 b1ac23227a 合并1101的代码以及添加个税扣缴义务人中的非系统人员配置 2023-11-09 10:27:20 +08:00
黎永顺 62704f5825 Merge branch 'release/2.9.42311.01' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
2023-11-09 10:26:44 +08:00
黎永顺 8252cebd98 1release/2.9.42311.01 2023-11-08 18:11:38 +08:00
黎永顺 84a908e94e feature/2.9.42310.02-社保福利档案页面重构 2023-11-08 16:14:10 +08:00
黎永顺 1eac37cd38 feature/2.9.42310.02-社保福利档案页面重构 2023-11-08 13:37:33 +08:00
黎永顺 a075c4a479 Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01 2023-11-07 19:16:27 +08:00
黎永顺 147d0908f1 Merge branch 'feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置' into release/2.9.42311.01
# Conflicts:
#	pc4mobx/hrmSalary/apis/statistics.js
2023-11-07 19:16:10 +08:00
黎永顺 8162e02796 feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 19:13:38 +08:00
黎永顺 675d583557 feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 16:57:47 +08:00
黎永顺 d9a7814080 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 16:43:23 +08:00
黎永顺 5fd2120f14 feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置 2023-11-07 16:21:17 +08:00
黎永顺 858b694568 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 11:26:08 +08:00
黎永顺 4c7b3f9a6a feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 10:28:44 +08:00
黎永顺 8bd1cd51af feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-06 17:05:26 +08:00
黎永顺 eefa47164a feature/2.9.42310.02-社保福利档案页面重构 2023-11-06 16:09:23 +08:00
黎永顺 560af8a703 feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
黎永顺 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
黎永顺 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
黎永顺 50b56c76d1 Merge branch 'hotfix/2.9.42310.01' into develop 2023-10-18 10:40:51 +08:00
黎永顺 2256d9e0a1 Merge branch 'feature/2.9.42310.01-调薪记录' into develop 2023-10-18 10:40:20 +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
黎永顺 89d6eebf77 Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into develop 2023-10-12 15:52:54 +08:00
黎永顺 9f4e8468e7 Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into develop 2023-10-12 15:52:44 +08:00
黎永顺 b260a41c7e feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换 2023-10-12 15:52:15 +08:00
黎永顺 618d9f12cd Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-12 14:14:42 +08:00
黎永顺 f2027627f4 hotfix/2.9.42310.01 2023-10-12 14:08:48 +08:00
黎永顺 ca5b60f6aa feature/2.9.42310.01-个税申报表页面重构 2023-10-12 13:57:14 +08:00