 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
|
2e94324bb7
|
feature/2.15.2.2409.01合并业务线测试
|
2024-11-04 16:33:32 +08:00 |
|
lys
|
2699266c4c
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-11-04 14:41:29 +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
|
e4800170a8
|
feature/2.15.2.2409.01合并业务线测试
|
2024-10-31 15:13:57 +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
|
09ea3da3e3
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-10-30 10:27:18 +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
|
000f36ec0e
|
feature/2.15.2.2409.01合并业务线测试
|
2024-10-28 14:57:09 +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
|
ef86c4faef
|
release/2.16.1.2410.01
|
2024-10-25 09:49:15 +08:00 |
|
lys
|
368542a52b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
|
2024-10-25 09:43:15 +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
|
8cdc711e71
|
custom/领悦业务线
|
2024-10-22 11:47:02 +08:00 |
|
lys
|
af13777e2d
|
Merge branch 'custom/领悦' 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/pages/ledgerPage/components/ledgerSearchComp.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
|
2024-10-21 18:12:51 +08:00 |
|
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 |