 lys
|
2357ee50a6
|
Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-02-12 15:25:54 +08:00 |
|
lys
|
6b8b604f55
|
feature/2.19.1.2501.01-套打功能
|
2025-02-08 11:16:43 +08:00 |
|
lys
|
a5cc09a2c5
|
release/2.17.1.2411.01
|
2024-11-20 16:25:59 +08:00 |
|
黎永顺
|
9759a529f5
|
feature/2.15.1.2407.01-权限
|
2024-09-10 12:23:18 +08:00 |
|
黎永顺
|
34bf2c8c52
|
feature/2.15.1.2407.01-权限
|
2024-09-09 09:35:02 +08:00 |
|
黎永顺
|
a56ee784db
|
feature/2.15.1.2407.01-权限
|
2024-09-06 15:45:57 +08:00 |
|
黎永顺
|
334a582d62
|
hotfix/2.15.1.2407.01
考勤引用，薪资账套多选
|
2024-08-07 11:11:53 +08:00 |
|
黎永顺
|
e5078dc37b
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 10:11:30 +08:00 |
|
黎永顺
|
d9f3fafd51
|
hotfix/2.12.1.2403.02
数据透视导出功能
|
2024-03-19 14:29:00 +08:00 |
|
黎永顺
|
c6ad730e1e
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-24 13:50:45 +08:00 |
|
黎永顺
|
6a91ce8b3c
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 19:05:57 +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 |
|
黎永顺
|
8bcf268ed0
|
hotfix/2.9.10.2312.02
|
2023-12-19 16:18:44 +08:00 |
|
黎永顺
|
676d8d2850
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-07 16:35:19 +08:00 |
|
黎永顺
|
f1b0fc588a
|
1release/2.9.9.2312.01
|
2023-12-06 14:49:34 +08:00 |
|
黎永顺
|
07c6ca839f
|
hotfix/2.9.9.2312.01
|
2023-12-01 17:56:16 +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 |
|
黎永顺
|
2c7633b0c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 15:29:07 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
858b694568
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-07 11:26:08 +08:00 |
|
黎永顺
|
560af8a703
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-06 09:24:47 +08:00 |
|
黎永顺
|
c44f92fb56
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-27 17:28:11 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +08:00 |
|
黎永顺
|
3c9cf1c730
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 11:13:44 +08:00 |
|
黎永顺
|
b260a41c7e
|
feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换
|
2023-10-12 15:52:15 +08:00 |
|
黎永顺
|
dd9d429a81
|
hotfix/2.9.42310.01
工资单查看权限
|
2023-10-11 16:23:55 +08:00 |
|
黎永顺
|
a583087f5f
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01
|
2023-09-11 13:43:28 +08:00 |
|
黎永顺
|
ce462fe51a
|
hotfix/2.9.42308.02
|
2023-09-06 14:27:23 +08:00 |
|
黎永顺
|
bb1e328c92
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 16:49:26 +08:00 |
|
黎永顺
|
6043159976
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 16:48:36 +08:00 |
|
黎永顺
|
c062f172f6
|
Merge branch 'feature/V2-非系统人员管理开发' into release/2.8.3.2307.02
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-20 13:47:42 +08:00 |
|
黎永顺
|
8356de0fa2
|
非系统人员开发合并
|
2023-07-12 14:34:07 +08:00 |
|
黎永顺
|
9226ef19b3
|
产品-移动端二次验证密码设置
|
2023-07-10 09:21:57 +08:00 |
|
黎永顺
|
93d07961c7
|
薪酬统计分析-员工明细列表开发
|
2023-05-25 13:27:17 +08:00 |
|
黎永顺
|
6c615453f7
|
产品-薪酬统计分析页面开发
|
2023-05-15 18:21:23 +08:00 |
|
黎永顺
|
d2c8928eba
|
Merge branch 'master' into feature/V2-薪酬统计分析
|
2023-04-28 10:53:05 +08:00 |
|
黎永顺
|
8f3320ae11
|
产品-薪酬统计分析管理
|
2023-04-23 11:28:18 +08:00 |
|
黎永顺
|
8e36bc89be
|
产品-薪資張濤月份说明数据的错误修改
|
2023-04-17 11:53:21 +08:00 |
|
黎永顺
|
8fe5f201c6
|
薪酬統計
|
2023-04-12 10:47:51 +08:00 |
|
黎永顺
|
cefe6ee46d
|
数据采集模块四个页面的导出全部功能添加参数的筛选功能以及薪资核算页面的带条件导出全部的功能
|
2023-04-06 17:07:22 +08:00 |
18652063575
|
72478c3fd8
|
专项附加扣除模块
|
2022-11-03 17:52:02 +08:00 |
|
18652063575
|
1d1ced8d77
|
社保福利台账添加线下对比的页面功能
|
2022-09-29 15:45:23 +08:00 |
|
18652063575
|
27e54073c6
|
统一所有页面你的弹框以及抽屉头部组件,样式bug的修改
|
2022-09-15 11:08:13 +08:00 |
|
liyongshun
|
2097d2faf7
|
薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口
|
2022-08-02 18:16:49 +08:00 |
MustangDeng
|
c5b401f9f4
|
bug修改
|
2022-05-31 16:21:25 +08:00 |
|
MustangDeng
|
f4ac00ddbd
|
补交
|
2022-05-26 09:46:28 +08:00 |
|
MustangDeng
|
1823149ae2
|
bug修复
|
2022-05-24 23:55:12 +08:00 |
|
MustangDeng
|
33e5009585
|
bug修改
|
2022-05-24 15:39:09 +08:00 |
|
MustangDeng
|
7cef5512ae
|
预览
|
2022-04-27 19:27:23 +08:00 |