 lys
|
b0a45c9bbe
|
Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-14 09:36:26 +08:00 |
|
lys
|
e09f4da1cf
|
release/2.17.1.2411.01
|
2024-11-13 10:19:57 +08:00 |
|
lys
|
712b45453a
|
Merge branch 'feature/2.16.1.2410.01-次账号' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-12 18:05:44 +08:00 |
|
lys
|
3869a0a51b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 18:02:48 +08:00 |
|
lys
|
24cadda23f
|
release/2.16.1.2410.01
|
2024-11-12 17:58:50 +08:00 |
|
lys
|
6993e5655a
|
Merge branch 'feature/2.16.1.2410.01-薪资项目管理页面重构' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 13:49:41 +08:00 |
|
lys
|
8003e68796
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 13:49:18 +08:00 |
|
lys
|
01d1d3b0bd
|
Merge branch 'feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能' into release/2.16.1.2410.01
|
2024-11-11 14:43:34 +08:00 |
|
lys
|
3654e2a378
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-11 14:43:17 +08:00 |
|
lys
|
7063732d6f
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 16:01:18 +08:00 |
|
lys
|
3fbe08ab2e
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 15:16:09 +08:00 |
|
lys
|
5abe35ca60
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 10:27:47 +08:00 |
|
lys
|
641c5f367f
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 10:02:24 +08:00 |
|
lys
|
bd81fe44b2
|
release/2.16.1.2410.01
薪资档案添加调薪日期的泛微选择
|
2024-11-07 16:15:45 +08:00 |
|
lys
|
97a5d37044
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 16:06:48 +08:00 |
|
lys
|
0abeee25f3
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 09:23:46 +08:00 |
|
lys
|
e9f4d9b043
|
release/2.16.1.2410.01
|
2024-11-06 11:06:55 +08:00 |
|
lys
|
27ec1ae5ef
|
feature/2.16.1.2410.01-薪资项目管理页面重构
|
2024-11-06 10:33:25 +08:00 |
|
lys
|
5df1e3f0c1
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-06 09:23:10 +08:00 |
|
lys
|
83d14f6d82
|
release/2.16.1.2410.01
日志组件优化
|
2024-11-05 17:33:34 +08:00 |
|
lys
|
6563e6b5df
|
release/2.16.1.2410.01
|
2024-11-05 16:26:17 +08:00 |
|
lys
|
1a02222bd3
|
feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-11-04 18:01:33 +08:00 |
|
lys
|
88dc06c35e
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-次账号
|
2024-11-04 17:26:04 +08:00 |
|
lys
|
df4971fd27
|
release/2.16.1.2410.01
|
2024-11-01 18:28:12 +08:00 |
|
lys
|
98ca4cb03f
|
release/2.16.1.2410.01
|
2024-11-01 16:03:57 +08:00 |
|
lys
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +08:00 |
|
lys
|
728e683777
|
Merge branch 'feature/2.16.1.2410.01-数据采集重构' into feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-10-31 17:32:30 +08:00 |
|
lys
|
b461a2c801
|
custom/汇通建设
|
2024-10-31 17:05:24 +08:00 |
|
lys
|
f126179d1d
|
Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾
# Conflicts:
# pc4mobx/hrmSalary/apis/calculate.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-10-31 17:02:27 +08:00 |
|
lys
|
66c6c68460
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-31 10:22:16 +08:00 |
|
lys
|
004175f882
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 16:23:58 +08:00 |
|
lys
|
5e2f6bbbbc
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 10:59:46 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
lys
|
8488f54aac
|
release/2.16.1.2410.01
|
2024-10-29 09:21:38 +08:00 |
|
lys
|
444c9b19ab
|
release/2.16.1.2410.01
工资单模板设置添加薪资所属年的设置
|
2024-10-25 17:04:45 +08:00 |
|
lys
|
c10e6fb3ee
|
feature/2.16.1.2410.01-次账号
|
2024-10-25 11:46:00 +08:00 |
|
lys
|
02ff34c202
|
release/2.16.1.2410.01
|
2024-10-23 09:51:02 +08:00 |
|
lys
|
cfdc0cd5a0
|
release/2.16.1.2410.01
|
2024-10-22 14:53:36 +08:00 |
|
lys
|
9d2fd951ef
|
release/2.16.1.2410.01-个税
|
2024-10-18 16:49:52 +08:00 |
|
lys
|
e7f1971370
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 14:26:00 +08:00 |
|
lys
|
8c5b0acffa
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 11:51:06 +08:00 |
|
lys
|
f407d8520d
|
release/2.16.1.2410.01
|
2024-10-17 11:18:53 +08:00 |
|
lys
|
4b125994f7
|
release/2.16.1.2410.01
|
2024-10-17 11:17:55 +08:00 |
|
lys
|
1a0f594753
|
release/2.15.2.2409.01
|
2024-10-16 16:18:32 +08:00 |
|
lys
|
600bba8619
|
feature/2.15.2.2409.01
|
2024-10-16 15:23:21 +08:00 |
|
lys
|
0a447773b8
|
feature/2.15.2.2409.01
|
2024-10-16 14:42:57 +08:00 |
|
lys
|
bee1d73eb7
|
release/2.15.2.2409.01
|
2024-10-15 16:33:26 +08:00 |
|
黎永顺
|
b954e1696e
|
release/2.15.2.2409.01
|
2024-10-14 16:02:12 +08:00 |
|
黎永顺
|
7980acc6c2
|
release/2.15.2.2409.01
|
2024-10-14 14:20:02 +08:00 |
|
黎永顺
|
2b541a85df
|
Merge branch 'feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列' into release/2.15.2.2409.01
|
2024-10-12 13:39:15 +08:00 |
|
黎永顺
|
5b3a645dfc
|
release/2.15.2.2409.01
|
2024-10-12 10:07:36 +08:00 |
|
黎永顺
|
591f29d934
|
release/2.15.2.2409.01
|
2024-10-11 17:15:11 +08:00 |
|
黎永顺
|
0754316e77
|
feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列
|
2024-10-11 17:13:19 +08:00 |
|
黎永顺
|
90470c3a57
|
feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列
|
2024-10-11 17:06:54 +08:00 |
|
黎永顺
|
bdd4b4e446
|
release/2.15.2.2409.01
|
2024-10-10 15:32:41 +08:00 |
|
黎永顺
|
ca3c9079a1
|
release/2.15.2.2409.01
|
2024-10-10 13:57:09 +08:00 |
|
黎永顺
|
ab7d0c1f7f
|
release/2.15.2.2409.01
|
2024-10-09 18:12:06 +08:00 |
|
黎永顺
|
01ef84368d
|
Merge branch 'hotfix/2.15.1.2409.01' into release/2.15.2.2409.01
|
2024-10-09 14:55:29 +08:00 |
|
黎永顺
|
307f954eac
|
feature/2.15.1.2407.01-权限
|
2024-10-09 14:55:11 +08:00 |
|
黎永顺
|
215094dac8
|
release/2.15.2.2409.01
|
2024-10-09 11:25:50 +08:00 |
|
黎永顺
|
bd93223774
|
hotfix/2.15.1.2409.01
规则设置添加薪资报表中的组织信息设置切换功能
|
2024-10-08 15:08:00 +08:00 |
|
黎永顺
|
53d45c2069
|
hotfix/2.15.1.2409.01
规则设置修改
|
2024-10-08 13:21:55 +08:00 |
|
黎永顺
|
9c318d22b7
|
hotfix/2.15.1.2409.01
|
2024-09-29 10:57:22 +08:00 |
|
黎永顺
|
f2b17872f7
|
release/2.15.2.2409.01
|
2024-09-25 11:12:53 +08:00 |
|
黎永顺
|
2664903959
|
release/2.15.2.2409.01
|
2024-09-23 16:25:46 +08:00 |
|
黎永顺
|
1c1aac66d7
|
hotfix/2.15.1.2409.01
浮动薪酬模块页面样式调整
|
2024-09-14 11:15:25 +08:00 |
|
黎永顺
|
c738ba0c6f
|
Merge branch 'release/2.15.2.2409.01' into hotfix/2.15.1.2409.01
|
2024-09-14 10:43:55 +08:00 |
|
黎永顺
|
f780662b1b
|
hotfix/2.15.1.2407.01
|
2024-09-13 15:52:15 +08:00 |
|
黎永顺
|
99ebca78d0
|
hotfix/2.15.1.2407.01
|
2024-09-13 15:45:43 +08:00 |
|
黎永顺
|
687371ab39
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-09-13 11:18:48 +08:00 |
|
黎永顺
|
66f6cbc403
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-09-10 12:54:45 +08:00 |
|
黎永顺
|
3fae1f1a9d
|
hotfix/2.15.1.2407.01
|
2024-09-10 12:52:25 +08:00 |
|
黎永顺
|
e8d0006cbb
|
feature/2.15.1.2407.01-权限
|
2024-09-10 12:50:40 +08:00 |
|
黎永顺
|
4976f29240
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-09-05 10:13:37 +08:00 |
|
黎永顺
|
76da4dd1e1
|
hotfix/2.15.1.2407.01
|
2024-09-05 10:13:03 +08:00 |
|
黎永顺
|
841be03462
|
Merge branch 'feature/2.15.1.2407.01-社保档案保存校验' into release/2.15.1.2407.01
|
2024-09-03 09:24:02 +08:00 |
|
黎永顺
|
5717c1e635
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-30 13:42:43 +08:00 |
|
黎永顺
|
bf197d455e
|
hotfix/2.15.1.2407.01
薪酬统计报表数据穿透接口参数修改
|
2024-08-30 13:42:21 +08:00 |
|
黎永顺
|
1fb7b07b22
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-29 15:28:23 +08:00 |
|
黎永顺
|
21ead59420
|
hotfix/2.15.1.2407.01
|
2024-08-29 15:21:37 +08:00 |
|
黎永顺
|
9f2f7f0678
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-29 09:46:07 +08:00 |
|
黎永顺
|
4810a09f29
|
hotfix/2.15.1.2407.01
|
2024-08-28 14:57:34 +08:00 |
|
黎永顺
|
69fd955592
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-22 15:44:34 +08:00 |
|
黎永顺
|
421fca99cc
|
Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01
|
2024-08-20 13:37:39 +08:00 |
|
黎永顺
|
c0b517201f
|
feature/2.15.1.2407.01-社保档案保存校验
|
2024-08-20 10:07:29 +08:00 |
|
黎永顺
|
63eb373025
|
hotfix/2.15.1.2407.01
|
2024-08-20 09:23:41 +08:00 |
|
黎永顺
|
96f6135aba
|
hotfix/2.15.1.2407.01
|
2024-08-19 17:32:49 +08:00 |
|
黎永顺
|
b7e29df781
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 16:39:14 +08:00 |
|
黎永顺
|
55d39d6523
|
feature/2.15.1.2407.01-社保档案保存校验
|
2024-08-19 16:37:46 +08:00 |
|
黎永顺
|
a3f40f506d
|
hotfix/2.15.1.2407.01
|
2024-08-19 16:28:53 +08:00 |
|
黎永顺
|
dfcd27771f
|
feature/2.15.1.2407.01-社保档案保存校验
|
2024-08-19 15:01:53 +08:00 |
|
黎永顺
|
d31ae5a030
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:43:30 +08:00 |
|
黎永顺
|
6a56cee090
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:42:54 +08:00 |
|
黎永顺
|
1d26ef8176
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:27:02 +08:00 |
|
黎永顺
|
f730cba8de
|
feature/2.15.1.2407.01-导入工具
|
2024-08-16 16:37:45 +08:00 |
|
黎永顺
|
3d55619813
|
hotfix/2.15.1.2407.01
|
2024-08-15 17:43:03 +08:00 |
|
黎永顺
|
e8625fd0ef
|
feature/2.15.1.2407.01-导入工具
|
2024-08-15 16:29:21 +08:00 |
|
黎永顺
|
ae665fb72d
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 16:01:00 +08:00 |
|
黎永顺
|
5009cd5955
|
hotfix/2.15.1.2407.01
|
2024-08-15 15:43:52 +08:00 |
|
黎永顺
|
4be61e9179
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 15:24:00 +08:00 |
|
黎永顺
|
37f7a3bd6b
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 11:05:09 +08:00 |
|
黎永顺
|
5c9f954adb
|
hotfix/2.15.1.2407.01
|
2024-08-15 11:04:14 +08:00 |
|
黎永顺
|
f984cd3f59
|
hotfix/2.15.1.2407.01
|
2024-08-15 11:01:26 +08:00 |
|
黎永顺
|
23e9a6ba42
|
hotfix/2.15.1.2407.01
|
2024-08-15 10:28:18 +08:00 |
|
黎永顺
|
bbc11b0609
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-14 11:26:00 +08:00 |
|
黎永顺
|
54352aad95
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-13 17:58:28 +08:00 |
|
黎永顺
|
44c63e874a
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-13 16:14:28 +08:00 |
|
黎永顺
|
d9fc164504
|
hotfix/2.15.1.2407.01
|
2024-08-13 16:12:43 +08:00 |
|
黎永顺
|
9479a4ba9a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-13 14:33:10 +08:00 |
|
黎永顺
|
a2c1fbd485
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-12 16:57:53 +08:00 |
|
黎永顺
|
74ba398c90
|
feature/2.15.1.2407.01-导入工具
|
2024-08-12 16:56:51 +08:00 |
|
黎永顺
|
f05c43d011
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 14:58:36 +08:00 |
|
黎永顺
|
df2283d0f4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 11:12:10 +08:00 |
|
黎永顺
|
4a5f5b6e7a
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:56:58 +08:00 |
|
黎永顺
|
8c038c8d74
|
Merge branch 'hotfix/2.15.1.2407.01' into feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:27:43 +08:00 |
|
黎永顺
|
9d99557f4b
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:24:11 +08:00 |
|
黎永顺
|
86de787ed4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 18:24:45 +08:00 |
|
黎永顺
|
70fe54efb7
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 17:32:54 +08:00 |
|
黎永顺
|
36d90b35a6
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 14:36:11 +08:00 |
|
黎永顺
|
75b6c0969a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-07 15:22:10 +08:00 |
|
黎永顺
|
99d93b041e
|
hotfix/2.15.1.2407.01
|
2024-08-07 14:05:32 +08:00 |
|
黎永顺
|
334a582d62
|
hotfix/2.15.1.2407.01
考勤引用，薪资账套多选
|
2024-08-07 11:11:53 +08:00 |
|
黎永顺
|
25b7a2341e
|
hotfix/2.15.1.2407.01
|
2024-08-05 11:05:25 +08:00 |
|
黎永顺
|
d09c5f1d96
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-07-26 17:31:53 +08:00 |
|
黎永顺
|
964af55e3a
|
hotfix/2.15.1.2407.01
|
2024-07-26 10:02:35 +08:00 |
|
黎永顺
|
d3ad76f711
|
hotfix/2.15.1.2407.01
|
2024-07-23 11:15:05 +08:00 |
|
黎永顺
|
c16272755a
|
release/2.15.1.2407.01
|
2024-07-19 14:07:45 +08:00 |
|
黎永顺
|
6a33d3d99c
|
hotfix/2.15.1.2407.01
|
2024-07-19 10:52:09 +08:00 |
|
黎永顺
|
892114dbc2
|
hotfix/2.15.1.2407.01
|
2024-07-18 15:37:30 +08:00 |
|
黎永顺
|
af8a0a1bab
|
hotfix/2.15.1.2407.01
|
2024-07-16 15:59:38 +08:00 |
|
黎永顺
|
cff964c7f1
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 11:10:48 +08:00 |
|
黎永顺
|
adf8b1bddc
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 09:31:56 +08:00 |
|
黎永顺
|
fef6bac256
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 09:15:53 +08:00 |
|
黎永顺
|
5f5d6f95de
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 18:45:56 +08:00 |
|
黎永顺
|
0628c1499b
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 18:42:26 +08:00 |
|
黎永顺
|
6d73b146c4
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 18:18:57 +08:00 |
|
黎永顺
|
b349327088
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 17:14:55 +08:00 |
|
黎永顺
|
84ed52dfde
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03
|
2024-07-15 11:36:41 +08:00 |
|
黎永顺
|
8df63d4a8c
|
hotfix/2.14.2.2406.02
|
2024-07-15 11:35:53 +08:00 |
|
黎永顺
|
4d2058b180
|
hotfix/2.14.2.2406.02
|
2024-07-11 15:05:00 +08:00 |
|
黎永顺
|
acd27d2381
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03
|
2024-07-02 15:07:28 +08:00 |
|
黎永顺
|
5a2ecefa6f
|
hotfix/2.14.2.2406.02
|
2024-07-02 15:05:17 +08:00 |
|
黎永顺
|
b7ececb0c4
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03
|
2024-06-28 17:00:13 +08:00 |
|
黎永顺
|
230aea8d62
|
hotfix/2.14.2.2406.02
|
2024-06-28 16:57:05 +08:00 |
|
黎永顺
|
e8793795ba
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03
|
2024-06-26 10:08:11 +08:00 |
|
黎永顺
|
3ee2ece60d
|
hotfix/2.14.2.2406.02
|
2024-06-26 10:07:45 +08:00 |
|
黎永顺
|
210e788b38
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03
|
2024-06-26 10:03:13 +08:00 |
|
黎永顺
|
da6a8266f6
|
hotfix/2.14.2.2406.02
|
2024-06-26 10:02:45 +08:00 |
|
黎永顺
|
bf0ce0ecac
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-21 10:44:32 +08:00 |
|
黎永顺
|
a4e072e3ee
|
hotfix/2.14.2.2406.02
|
2024-06-21 10:05:47 +08:00 |