Commit Graph

150 Commits

Author SHA1 Message Date
lys 97a5d37044 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-07 16:06:48 +08:00
lys 02ff34c202 release/2.16.1.2410.01 2024-10-23 09:51:02 +08:00
lys 9d2fd951ef release/2.16.1.2410.01-个税 2024-10-18 16:49:52 +08:00
lys e7f1971370 feature/2.16.1.2410.01-薪资核算单元格锁定 2024-10-18 14:26:00 +08:00
lys 8c5b0acffa feature/2.16.1.2410.01-薪资核算单元格锁定 2024-10-18 11:51:06 +08:00
lys 4b125994f7 release/2.16.1.2410.01 2024-10-17 11:17:55 +08:00
黎永顺 591f29d934 release/2.15.2.2409.01 2024-10-11 17:15:11 +08:00
黎永顺 bdd4b4e446 release/2.15.2.2409.01 2024-10-10 15:32:41 +08:00
黎永顺 9c318d22b7 hotfix/2.15.1.2409.01 2024-09-29 10:57:22 +08:00
黎永顺 21ead59420 hotfix/2.15.1.2407.01 2024-08-29 15:21:37 +08:00
黎永顺 4810a09f29 hotfix/2.15.1.2407.01 2024-08-28 14:57:34 +08:00
黎永顺 a3f40f506d hotfix/2.15.1.2407.01 2024-08-19 16:28:53 +08:00
黎永顺 25b7a2341e hotfix/2.15.1.2407.01 2024-08-05 11:05:25 +08:00
黎永顺 964af55e3a hotfix/2.15.1.2407.01 2024-07-26 10:02:35 +08:00
黎永顺 15c81c8156 release/2.14.3.2406.01 2024-06-06 17:25:31 +08:00
黎永顺 6bfde3d28f feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:41 +08:00
黎永顺 c0079fe4b4 feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:17 +08:00
黎永顺 a4b98f253c Merge branch 'feature/2.12.1.2404.02-薪资核算判断账套是否修改提示' into release/2.14.2.2405.02 2024-05-23 11:04:34 +08:00
黎永顺 fd6fb3bd9d hotfix/2.14.2.2405.02 2024-05-21 15:11:52 +08:00
黎永顺 7cf0cc3357 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:13:12 +08:00
黎永顺 eeea664a8a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:09:08 +08:00
黎永顺 3b90b1def4 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 10:48:52 +08:00
黎永顺 020af95921 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-06 16:58:42 +08:00
黎永顺 718d1929bb hotfix/2.12.1.2404.02 2024-04-29 11:27:49 +08:00
黎永顺 ae427c033a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 17:37:22 +08:00
黎永顺 2fb3c89947 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 16:53:51 +08:00
黎永顺 11618b6aff hotfix/2.12.1.2403.02 2024-04-17 14:44:30 +08:00
黎永顺 6d56f162b1 hotfix/2.12.1.2403.02 2024-04-16 17:10:31 +08:00
黎永顺 8dac6eab6b feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 16:52:28 +08:00
黎永顺 3ab97c5a70 feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 16:15:11 +08:00
黎永顺 8a7f3fcb7a feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 14:37:49 +08:00
黎永顺 a768470afb feature/2.12.1.2403.02-个税-外籍人员信息报送 2024-03-29 10:19:33 +08:00
黎永顺 9471a5a737 feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-28 16:49:44 +08:00
黎永顺 8af1f0a79a hotfix/2.12.1.2403.02
完成导入报错的问题处理
2024-03-19 17:55:37 +08:00
黎永顺 ffaf5dc036 hotfix/3.0.0.2403.01 2024-03-13 14:23:08 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 a6f382a36b feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 10:24:15 +08:00
黎永顺 1a38752cc6 1release/2.9.10.2312.02 2024-01-17 09:44:50 +08:00
黎永顺 3155c2eb89 Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into release/2.9.10.2312.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
2024-01-08 13:44:57 +08:00
黎永顺 cd9d67b358 Merge branch 'hotfix/2.9.10.2312.02' into release/2.9.10.2312.02 2024-01-08 13:43:00 +08:00
黎永顺 5e5acc012c hotfix/2.9.10.2312.02
薪资项目添加显示宽度项
2024-01-04 18:36:20 +08:00
黎永顺 3a83207915 Merge branch 'feature/2.9.9.2312.01-薪资核算查看权限' into release/2.9.10.2312.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
2023-12-29 10:14:39 +08:00
黎永顺 93ceea808d Merge branch 'feature/2.9.9.2312.01-薪资核算列表在线编辑' into release/2.9.10.2312.02 2023-12-29 10:09:04 +08:00
黎永顺 4acefa765c hotfix/2.9.9.2312.01
导入组件优化
2023-12-12 15:19:59 +08:00
黎永顺 717a88667c feature/2.9.9.2312.01-薪资核算列表在线编辑 2023-12-12 10:41:33 +08:00
黎永顺 2e38e5a5c6 hotfix/2.9.9.2312.01
薪资核算导入下载模板
2023-12-12 10:25:02 +08:00
黎永顺 253ba3cc8c 薪资核算批量编辑 2023-12-11 13:32:17 +08:00
黎永顺 254d19c44e 薪资核算批量编辑 2023-12-11 13:31:46 +08:00
黎永顺 5617392a7c feature/2.9.9.2312.01-薪资核算查看权限 2023-12-08 09:19:43 +08:00
黎永顺 197849ecaa Merge branch 'master' into feature/2.9.9.2312.01-薪资核算查看权限
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/calculate/calculate.js
2023-12-07 16:45:47 +08:00