 黎永顺
|
9854e56324
|
Merge branch 'master' into custom-昂立/薪资账套配置流程审批地址
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
|
2023-11-13 14:23:20 +08:00 |
|
黎永顺
|
115a0ee64f
|
Merge branch 'hotfix/2.9.42311.02'
|
2023-11-13 14:18:16 +08:00 |
|
黎永顺
|
0798d2bf96
|
hotfix/2.9.42311.02
|
2023-11-13 14:15:49 +08:00 |
|
黎永顺
|
9f114e9867
|
hotfix/2.9.42311.02
|
2023-11-13 11:17:38 +08:00 |
|
黎永顺
|
28c50dc563
|
hotfix/2.9.42311.02
|
2023-11-13 11:03:19 +08:00 |
|
黎永顺
|
7908f925ea
|
release/2.9.42311.01
|
2023-11-09 16:27:33 +08:00 |
|
黎永顺
|
1afaa04129
|
1release/2.9.42311.01
|
2023-11-09 15:36:13 +08:00 |
|
黎永顺
|
8252cebd98
|
1release/2.9.42311.01
|
2023-11-08 18:11:38 +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 |
|
黎永顺
|
5fd2120f14
|
feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置
|
2023-11-07 16:21:17 +08:00 |
|
黎永顺
|
8bd1cd51af
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-06 17:05:26 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30: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 |
|
黎永顺
|
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 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
edff18685b
|
Merge branch 'release/2.9.42310.01-个税' into custom-昂立/薪资账套配置流程审批地址
|
2023-10-23 14:45:41 +08:00 |
|
黎永顺
|
d61fccaf43
|
hotfix/2.9.42309.01-个税
|
2023-10-23 14:35:10 +08:00 |
|
黎永顺
|
75aa87eef5
|
Merge branch 'release/2.9.42310.01-个税' into custom-昂立/薪资账套配置流程审批地址
|
2023-10-23 11:15:00 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
19c3e900bf
|
Merge branch 'release/2.9.42310.01' into custom-昂立/薪资账套配置流程审批地址
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-10-18 17:22:39 +08:00 |
|
黎永顺
|
3dd6ede31c
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-18 17:19:14 +08:00 |
|
黎永顺
|
429853a6a6
|
hotfix/2.9.42310.01
公式测试结果显示修改
|
2023-10-18 17:18:44 +08:00 |
|
黎永顺
|
773d276134
|
custom-昂立/薪资账套配置流程审批地址
|
2023-10-18 11:13:50 +08:00 |
|
黎永顺
|
0e279b0e48
|
custom-昂立/薪资账套配置流程审批地址
|
2023-10-18 11:12:47 +08:00 |
|
黎永顺
|
a61e6eb847
|
Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01
|
2023-10-18 10:25:08 +08:00 |
|
黎永顺
|
4519401f64
|
Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into release/2.9.42310.01
|
2023-10-18 10:24:54 +08:00 |
|
黎永顺
|
5a78344e2f
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-18 10:24:41 +08:00 |
|
黎永顺
|
db166275c4
|
hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制
|
2023-10-18 10:24:13 +08:00 |
|
黎永顺
|
a84a216000
|
hotfix/2.9.42309.01-个税
|
2023-10-17 11:01:29 +08:00 |
|
黎永顺
|
9a03c6ad8b
|
feature/2.9.42310.01-调薪记录
|
2023-10-16 15:27:29 +08:00 |
|
黎永顺
|
984192fdf2
|
Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录
|
2023-10-16 14:13:53 +08:00 |
|
黎永顺
|
f63b709085
|
Merge branch 'release/2.9.42310.01-个税' into custom-昂立/薪资账套配置流程审批地址
|
2023-10-13 10:58:15 +08:00 |