 黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
ffcb81650b
|
hotfix/2.9.10.2312.02
工资单模板bug修复
|
2023-12-13 10:19:37 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
3eb8c47a87
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 13:39:55 +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 |
|
黎永顺
|
23911d8e37
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-07 16:44:38 +08:00 |
|
黎永顺
|
676d8d2850
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-07 16:35:19 +08:00 |
|
黎永顺
|
e4573bb95e
|
hotfix/2.9.9.2312.01
|
2023-12-07 13:55:52 +08:00 |
|
黎永顺
|
2864e1e446
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-07 09:40:34 +08:00 |
|
黎永顺
|
2b4b5623bc
|
hotfix/2.9.9.2312.01
查看薪資核算页面添加权限，移动端薪资查看修改
|
2023-12-06 18:28:02 +08:00 |
|
黎永顺
|
3dca9da904
|
hotfix/2.9.9.2312.01
|
2023-12-06 16:19:05 +08:00 |
|
黎永顺
|
8a8804f0c1
|
1release/2.9.9.2312.01
|
2023-12-06 15:55:44 +08:00 |
|
黎永顺
|
f1b0fc588a
|
1release/2.9.9.2312.01
|
2023-12-06 14:49:34 +08:00 |
|
黎永顺
|
bc78a26578
|
Merge branch 'feature/2.9.42311.02-我的薪资福利移动端列表查看' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-12-06 14:48:35 +08:00 |
|
黎永顺
|
6e56b436d6
|
feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项
|
2023-12-06 14:46:36 +08:00 |
|
黎永顺
|
72d02ad754
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-05 17:15:55 +08:00 |
|
黎永顺
|
143e9503e1
|
Merge branch 'feature/2.9.9.2312.01-社保核算以及薪资账套查询优化' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
|
2023-12-05 11:34:00 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
2196dde486
|
Merge branch 'master' into hotfix/2.9.9.2312.01
|
2023-11-30 09:22:40 +08:00 |