 黎永顺
|
29f8606b2f
|
Merge branch 'release/2.9.10.2312.02' into custom/陕西万众-薪资账套薪资核算配置
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
|
2024-01-10 14:46:15 +08:00 |
|
黎永顺
|
15bc21ecd5
|
release/2.9.10.2312.02
|
2024-01-10 14:43:07 +08:00 |
|
黎永顺
|
b7a3fcccfd
|
1release/2.9.10.2312.02
|
2024-01-09 17:44:36 +08:00 |
|
黎永顺
|
da7194d6b1
|
Merge branch 'feature/2.9.10.2312.02-社保档案个人和公司基数设置' into release/2.9.10.2312.02
|
2024-01-08 13:45:11 +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 |
|
黎永顺
|
0b8c335f0f
|
custom/陕西万众-薪资账套薪资核算配置
新增模板查询功能
|
2024-01-08 11:37:53 +08:00 |
|
黎永顺
|
bc1fd3f5dc
|
custom/陕西万众-薪资账套薪资核算配置
新增模板查询功能
|
2024-01-05 18:56:03 +08:00 |
|
黎永顺
|
8361220614
|
custom/陕西万众-薪资账套薪资核算配置
新增模板查询功能
|
2024-01-05 17:45:29 +08:00 |
|
黎永顺
|
e3e9e85338
|
custom/陕西万众-薪资账套薪资核算配置
|
2024-01-05 14:47:08 +08:00 |
|
黎永顺
|
08d4ed70ba
|
custom/陕西万众-薪资账套薪资核算配置
|
2024-01-05 10:33:24 +08:00 |
|
黎永顺
|
f808856de6
|
Merge branch 'hotfix/2.9.10.2312.02' into custom/陕西万众-薪资账套薪资核算配置
|
2024-01-05 09:24:02 +08:00 |
|
黎永顺
|
5e5acc012c
|
hotfix/2.9.10.2312.02
薪资项目添加显示宽度项
|
2024-01-04 18:36:20 +08:00 |
|
黎永顺
|
6a8a9f95ed
|
custom/陕西万众-薪资账套薪资核算配置
|
2024-01-03 11:26:44 +08:00 |
|
黎永顺
|
18b7140f4b
|
custom/陕西万众-薪资账套薪资核算配置
|
2024-01-03 09:17:04 +08:00 |
|
黎永顺
|
2193d35502
|
custom/陕西万众-薪资账套薪资核算配置
|
2024-01-02 16:37:30 +08:00 |
|
黎永顺
|
0162ec0369
|
custom/陕西万众-薪资账套薪资核算配置
|
2024-01-02 15:53:18 +08:00 |
|
黎永顺
|
5340dba06d
|
custom/陕西万众-薪资账套薪资核算配置
|
2023-12-29 16:45:37 +08:00 |
|
黎永顺
|
68e9fd5ad1
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 13:53:51 +08:00 |
|
黎永顺
|
69091b34ec
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-29 13:53:26 +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 |
|
黎永顺
|
6a7220ffc2
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 10:08:36 +08:00 |
|
黎永顺
|
1a8c6d5924
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-29 10:04:54 +08:00 |
|
黎永顺
|
d5fa8d7e84
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-25 14:54:55 +08:00 |
|
黎永顺
|
854949ab62
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-25 14:37:14 +08:00 |
|
黎永顺
|
238d97798a
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-22 14:42:27 +08:00 |
|
黎永顺
|
a59bc06d7a
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 13:25:47 +08:00 |
|
黎永顺
|
7db9e03b0d
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 10:18:58 +08:00 |
|
黎永顺
|
8bcf268ed0
|
hotfix/2.9.10.2312.02
|
2023-12-19 16:18:44 +08:00 |
|
黎永顺
|
446aaf2cad
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-15 13:37:21 +08:00 |
|
黎永顺
|
cf47cdeb56
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-14 14:14:32 +08:00 |
|
黎永顺
|
8c06171190
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-14 09:54:27 +08:00 |
|
黎永顺
|
670bbbbb75
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 17:21:16 +08:00 |
|
黎永顺
|
61f2b76440
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 11:12:18 +08:00 |
|
黎永顺
|
1eba04d9c8
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 10:21:14 +08:00 |
|
黎永顺
|
ffcb81650b
|
hotfix/2.9.10.2312.02
工资单模板bug修复
|
2023-12-13 10:19:37 +08:00 |
|
黎永顺
|
90ef0e1360
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-12 18:29:46 +08:00 |
|
黎永顺
|
8772a7eac7
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-12 17:19:23 +08:00 |
|
黎永顺
|
be8aceedaa
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-12 17:18:30 +08:00 |
|
黎永顺
|
a9bd1dc625
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-12 17:18:06 +08:00 |
|
黎永顺
|
41baa15ef2
|
hotfix/2.9.9.2312.01
|
2023-12-12 16:40:58 +08:00 |
|
黎永顺
|
4acefa765c
|
hotfix/2.9.9.2312.01
导入组件优化
|
2023-12-12 15:19:59 +08:00 |
|
黎永顺
|
b5dba954c6
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-12 13:41:59 +08:00 |
|
黎永顺
|
a0771be0b9
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-12 10:55:27 +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 |
|
黎永顺
|
43012b2025
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 15:56:39 +08:00 |