 lys
|
38a8d6aeaf
|
Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线
|
2024-10-21 17:56:21 +08:00 |
|
lys
|
92d75bf369
|
custom/领悦
|
2024-10-21 15:47:06 +08:00 |
|
lys
|
78d66f342f
|
custom/领悦
|
2024-10-21 14:32:25 +08:00 |
|
lys
|
9fd9860e4a
|
custom/领悦
|
2024-10-21 11:12:31 +08:00 |
|
lys
|
ebd228c496
|
Merge branch 'release/2.16.1.2410.01' into custom/领悦
|
2024-10-21 10:47:04 +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
|
4b11f39155
|
feature/2.15.2.2409.01合并业务线测试
|
2024-10-16 11:18:10 +08:00 |
|
lys
|
73de6b8417
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/searchPannel/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.less
|
2024-10-16 11:11:23 +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 |
|
黎永顺
|
99a011722d
|
custom/custom/鹰图软件
|
2024-10-12 17:22:15 +08:00 |
|
黎永顺
|
2f8d5cc74a
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.less
# pc4mobx/hrmSalary/index.js
|
2024-10-12 16:33:54 +08:00 |
|
黎永顺
|
5c8e6b8133
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
# pc4mobx/hrmSalary/stores/taxAgent.js
|
2024-10-12 16:05:19 +08:00 |
|
黎永顺
|
29122e2434
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-10-12 16:02:19 +08:00 |
|
黎永顺
|
1b8ff1030c
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js
|
2024-10-12 15:49:49 +08:00 |
|
黎永顺
|
9d06793a04
|
custom/领悦
|
2024-10-12 15:32:42 +08:00 |
|
黎永顺
|
48df3121fd
|
custom/领悦
|
2024-10-12 15:31:39 +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 |
|
黎永顺
|
925394e814
|
custom/领悦
|
2024-10-12 13:38:20 +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 |
|
黎永顺
|
167c2c5a20
|
feature/2.15.1.2407.01-权限
|
2024-10-11 15:19:38 +08:00 |
|
黎永顺
|
c72d34fb9a
|
feature/2.15.1.2407.01-权限
|
2024-10-11 11:11:06 +08:00 |
|
黎永顺
|
6aa662d432
|
feature/2.15.1.2407.01-权限
|
2024-10-11 10:01:46 +08:00 |
|
黎永顺
|
44fb334837
|
custom/领悦
|
2024-10-10 16:29:36 +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 |
|
黎永顺
|
cd768fff67
|
feature/2.15.1.2407.01-权限
|
2024-10-09 17:02:14 +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 |
|
黎永顺
|
94a4d3a930
|
feature/2.15.1.2407.01-权限
|
2024-10-09 14:51:55 +08:00 |
|
黎永顺
|
215094dac8
|
release/2.15.2.2409.01
|
2024-10-09 11:25:50 +08:00 |
|
黎永顺
|
b23662c09e
|
feature/2.15.1.2407.01-权限
|
2024-10-09 11:10:21 +08:00 |
|
黎永顺
|
255e8d8760
|
feature/2.15.1.2407.01-权限
|
2024-10-09 10:22:00 +08:00 |
|
黎永顺
|
dd82ecf445
|
feature/2.15.1.2407.01-权限
|
2024-10-08 17:57:10 +08:00 |
|
黎永顺
|
bd93223774
|
hotfix/2.15.1.2409.01
规则设置添加薪资报表中的组织信息设置切换功能
|
2024-10-08 15:08:00 +08:00 |
|
黎永顺
|
f55898b8a0
|
feature/2.15.1.2407.01-权限
|
2024-10-08 14:29:24 +08:00 |
|
黎永顺
|
f6789a0ea8
|
feature/2.15.1.2407.01-权限
|
2024-10-08 14:08:16 +08:00 |
|
黎永顺
|
53d45c2069
|
hotfix/2.15.1.2409.01
规则设置修改
|
2024-10-08 13:21:55 +08:00 |
|
黎永顺
|
d73372e5c4
|
feature/2.15.1.2407.01-权限
|
2024-10-08 10:07:23 +08:00 |
|
黎永顺
|
e92f06bce2
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-30 10:30:46 +08:00 |
|
黎永顺
|
3107914834
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-30 10:30:32 +08:00 |
|
黎永顺
|
9c318d22b7
|
hotfix/2.15.1.2409.01
|
2024-09-29 10:57:22 +08:00 |
|
黎永顺
|
c7a1b1e321
|
Merge branch 'feature/2.15.1.2407.01-权限' into custom/领悦业务线
|
2024-09-27 18:42:40 +08:00 |
|
黎永顺
|
198668654a
|
feature/2.15.1.2407.01-权限
|
2024-09-27 18:38:37 +08:00 |
|
黎永顺
|
0683625850
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
|
2024-09-27 18:35:25 +08:00 |
|
黎永顺
|
d4763dc2d2
|
feature/2.15.1.2407.01-权限
|
2024-09-27 18:30:31 +08:00 |
|
黎永顺
|
ce711f9c97
|
feature/2.15.1.2407.01-权限
|
2024-09-27 16:45:47 +08:00 |
|
黎永顺
|
6c99d5fbad
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限
|
2024-09-27 16:21:35 +08:00 |
|
黎永顺
|
8996fa8d79
|
feature/2.15.1.2407.01-权限
|
2024-09-27 16:20:28 +08:00 |
|
黎永顺
|
b4a966ea20
|
feature/2.15.1.2407.01-权限
|
2024-09-27 15:32:21 +08:00 |
|
黎永顺
|
e5d43e7dc5
|
feature/2.15.1.2407.01-权限
|
2024-09-27 13:38:48 +08:00 |
|
黎永顺
|
9a33cc96c6
|
Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线
|
2024-09-26 18:04:11 +08:00 |
|
黎永顺
|
5d5215609a
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-26 17:59:43 +08:00 |
|
黎永顺
|
e09fbb332f
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:59:14 +08:00 |
|
黎永顺
|
f1183af3e2
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:56:41 +08:00 |
|
黎永顺
|
929f285be2
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:50:15 +08:00 |
|
黎永顺
|
143d2ef8f8
|
Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.less
# pc4mobx/hrmSalary/index.js
|
2024-09-26 17:27:24 +08:00 |
|
黎永顺
|
8c19e33592
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-26 17:09:42 +08:00 |
|
黎永顺
|
666ec8f9be
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:06:08 +08:00 |
|
黎永顺
|
5093ff88a7
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-26 10:06:14 +08:00 |
|
黎永顺
|
112988ceba
|
feature/2.15.1.2407.01-权限
|
2024-09-26 10:01:49 +08:00 |
|
黎永顺
|
a7e67b9358
|
Merge branch 'feature/2.15.1.2407.01-薪资项目以及字段管理页面改造' into feature/2.15.1.2407.01-权限
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2024-09-25 18:01:35 +08:00 |
|
黎永顺
|
5ec07d20e0
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-09-25 15:37:02 +08:00 |
|
黎永顺
|
a4fffbcbd4
|
release/2.15.2.2409.01
|
2024-09-25 14:11:46 +08:00 |
|
黎永顺
|
f2b17872f7
|
release/2.15.2.2409.01
|
2024-09-25 11:12:53 +08:00 |
|
黎永顺
|
32940c9bcf
|
feature/2.15.1.2407.01-权
|
2024-09-25 10:46:55 +08:00 |
|
黎永顺
|
fd188c9f51
|
feature/2.15.1.2407.01-权限
|
2024-09-25 10:02:46 +08:00 |
|
黎永顺
|
2d15f19ddd
|
custom/西安秦华天燃气
|
2024-09-24 16:49:45 +08:00 |
|
黎永顺
|
fd067b653f
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-09-24 10:53:41 +08:00 |
|
黎永顺
|
2664903959
|
release/2.15.2.2409.01
|
2024-09-23 16:25:46 +08:00 |
|
黎永顺
|
7821a990e9
|
custom/领悦
|
2024-09-23 16:18:58 +08:00 |
|
黎永顺
|
efa75925ad
|
权限
|
2024-09-23 16:15:22 +08:00 |
|
黎永顺
|
f6f3a42333
|
权限
|
2024-09-23 10:37:10 +08:00 |
|
黎永顺
|
02b085c051
|
权限
|
2024-09-20 16:30:12 +08:00 |
|
黎永顺
|
e9abaa26bb
|
权限
|
2024-09-19 10:36:04 +08:00 |
|
黎永顺
|
f1f4258090
|
feature/2.15.1.2407.01-权限
|
2024-09-14 18:01:11 +08:00 |
|
黎永顺
|
4999cc12bf
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限
|
2024-09-14 15:55:46 +08:00 |
|
黎永顺
|
15cc213c8c
|
custom/大成
|
2024-09-14 15:52:12 +08:00 |
|
黎永顺
|
b597bdd2bb
|
feature/2.15.1.2407.01-权限
|
2024-09-14 14:28:58 +08:00 |
|
黎永顺
|
1ea3529b5a
|
custom/领悦
|
2024-09-14 13:56:02 +08:00 |
|
黎永顺
|
50a73b29eb
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:31:45 +08:00 |
|
黎永顺
|
1dca1d7268
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:31:12 +08:00 |
|
黎永顺
|
5de04424d2
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:18:18 +08:00 |
|
黎永顺
|
6928f89df6
|
feature/2.15.1.2407.01-权限
|
2024-09-14 11:41:31 +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 |
|
黎永顺
|
3bbe58562c
|
custom/领悦
|
2024-09-14 10:42:45 +08:00 |
|
黎永顺
|
658f4fa64f
|
custom/领悦
|
2024-09-14 09:55:54 +08:00 |