 黎永顺
|
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 |
|
黎永顺
|
0f53d0912b
|
Merge branch 'release/2.9.9.2312.01-个税' into custom-艾志工业-合并个税
|
2023-12-07 16:03:29 +08:00 |
|
黎永顺
|
9f63f4e3a8
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-07 16:03:04 +08:00 |
|
黎永顺
|
b7047383a1
|
Merge branch 'release/2.9.9.2312.01-个税' into custom-艾志工业-合并个税
|
2023-12-07 15:44:28 +08:00 |
|
黎永顺
|
4fc6d1fabd
|
hotfix/2.9.9.2312.01-个税
个税扣缴义务人部门备案
|
2023-12-07 15:43:37 +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 |
|
黎永顺
|
5176ae4820
|
Merge branch 'release/2.9.9.2312.01-个税' into custom-艾志工业-合并个税
|
2023-12-06 18:51:41 +08:00 |
|
黎永顺
|
f4adb94893
|
release/2.9.9.2312.01-个税
|
2023-12-06 18:51:17 +08:00 |
|
黎永顺
|
2b4b5623bc
|
hotfix/2.9.9.2312.01
查看薪資核算页面添加权限，移动端薪资查看修改
|
2023-12-06 18:28:02 +08:00 |
|
黎永顺
|
dc3848dcfe
|
Merge branch 'release/2.9.9.2312.01-个税' into custom-艾志工业-合并个税
|
2023-12-06 17:19:18 +08:00 |
|
黎永顺
|
49ade22f26
|
release/2.9.9.2312.01-个税
人员信息报送导出的功能开发
|
2023-12-06 17:06:44 +08:00 |
|
黎永顺
|
a8ce369ce6
|
Merge branch 'hotfix/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-06 16:22:19 +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 |
|
黎永顺
|
beddc62901
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-06 14:50:24 +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 |
|
黎永顺
|
cb4ce3b93d
|
Merge branch 'release/2.9.9.2312.01-个税' into custom-艾志工业-合并个税
|
2023-12-05 17:25:31 +08:00 |
|
黎永顺
|
3638249033
|
release/2.9.9.2312.01-个税
|
2023-12-05 17:22:41 +08:00 |
|
黎永顺
|
ce1acae344
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-05 17:16:37 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
69f199cb9c
|
Merge branch 'release/2.9.42311.02-个税' into custom-艾志工业-合并个税
# Conflicts:
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
|
2023-11-30 14:10:05 +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 |
|
黎永顺
|
7d1b3f840f
|
Merge branch 'release/2.9.42311.02'
|
2023-11-28 13:53:37 +08:00 |