 黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
8bd1cd51af
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-06 17:05:26 +08:00 |
|
黎永顺
|
560af8a703
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-06 09:24:47 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30:18 +08:00 |
|
黎永顺
|
963b5492ef
|
Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税
|
2023-11-01 16:20:18 +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 |
|
黎永顺
|
e246e10af7
|
hotfix/2.9.42310.02
|
2023-10-30 15:54:25 +08:00 |
|
黎永顺
|
7d0a4872dd
|
custom-艾志工业-合并个税
|
2023-10-30 15:43:12 +08:00 |
|
黎永顺
|
dc93634385
|
custom-甘肃金控/v2-薪资档案修改
|
2023-10-30 14:52:32 +08:00 |
|
黎永顺
|
4acdff060c
|
hotfix/2.9.42310.02
|
2023-10-30 08:55:15 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
7765da9158
|
Merge branch 'release/2.9.42310.01-个税' into custom-艾志工业-合并个税
|
2023-10-24 18:20:02 +08:00 |
|
黎永顺
|
ba878070a5
|
hotfix/2.9.42309.01-个税
个税申报表错误提示语
|
2023-10-24 18:19:10 +08:00 |
|
黎永顺
|
b424d8b784
|
Merge branch 'release/2.9.42310.01-个税' into custom-艾志工业-合并个税
|
2023-10-24 16:24:53 +08:00 |
|
黎永顺
|
0e60e1e1c8
|
hotfix/2.9.42309.01-个税
|
2023-10-24 16:23:54 +08:00 |
|
黎永顺
|
48163e0de3
|
Merge branch 'release/2.9.42310.01-个税' into custom-艾志工业-合并个税
|
2023-10-24 14:05:22 +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 |
|
黎永顺
|
967d0bacd1
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 18:28:29 +08:00 |
|
黎永顺
|
4aab5c1433
|
Merge branch 'release/2.9.42310.01-个税' into custom-艾志工业-合并个税
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-10-23 18:08:31 +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 |