 黎永顺
|
cf268d9931
|
feature/V2-dev合并多语言
|
2023-12-04 11:35:43 +08:00 |
|
黎永顺
|
e5265d3875
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
|
2023-12-04 11:30:54 +08:00 |
|
黎永顺
|
4f00d117d6
|
feature/V2-dev合并多语言
|
2023-12-04 10:40:07 +08:00 |
|
黎永顺
|
0b4cfd0650
|
feature/V2-dev合并多语言
|
2023-12-01 16:10:44 +08:00 |
|
黎永顺
|
4448393373
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-01 11:21:01 +08:00 |
|
黎永顺
|
8ca2462507
|
feature/V2-dev合并多语言
|
2023-12-01 11:01:48 +08:00 |
|
黎永顺
|
a702e31295
|
feature/V2-dev合并多语言
|
2023-12-01 09:16:11 +08:00 |
|
黎永顺
|
83f77d4e16
|
feature/V2-dev合并多语言
|
2023-11-30 16:42:46 +08:00 |
|
黎永顺
|
b66ee38b18
|
Merge branch 'release/2.9.42311.02' into feature/V2-dev合并多语言
|
2023-11-30 16:07:37 +08:00 |
|
黎永顺
|
b14c2f9f87
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-30 15:13:09 +08:00 |
|
黎永顺
|
f113cb437f
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-30 14:52:14 +08:00 |
|
黎永顺
|
e01b5bf1c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 17:52:17 +08:00 |
|
黎永顺
|
5e60775029
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 17:45:11 +08:00 |
|
黎永顺
|
2c7633b0c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 15:29:07 +08:00 |
|
黎永顺
|
7579a8cd31
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-24 14:45:37 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
bbb9bce35a
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-11-24 13:55:58 +08:00 |
|
黎永顺
|
c2f4c4372c
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-24 11:43:03 +08:00 |
|
黎永顺
|
6f9f24f7a8
|
feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置
|
2023-11-23 15:50:21 +08:00 |
|
黎永顺
|
83dad72062
|
Merge branch 'master' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
# pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
# pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
# pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-11-22 10:29:45 +08:00 |
|
黎永顺
|
94b3f056f4
|
hotfix/2.9.42311.02-我的薪资福利页面重构
|
2023-11-20 17:48:44 +08:00 |
|
黎永顺
|
373b0aad56
|
hotfix/2.9.42311.02
|
2023-11-17 13:33:56 +08:00 |
|
黎永顺
|
f4574570d9
|
hotfix/2.9.42311.02
|
2023-11-15 13:53:56 +08:00 |
|
黎永顺
|
f0b657f26e
|
Merge branch 'release/2.9.42311.02' into hotfix/2.9.42311.02
|
2023-11-15 13:32:40 +08:00 |
|
黎永顺
|
7dfd328aae
|
hotfix/2.9.42311.02
|
2023-11-14 14:45:13 +08:00 |
|
黎永顺
|
ff870c110c
|
hotfix/2.9.42311.02-薪资核算名称修改
|
2023-11-13 16:51:40 +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 |
|
黎永顺
|
d46f40b086
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-10 13:34:36 +08:00 |
|
黎永顺
|
436db457db
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 17:51:38 +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 |
|
黎永顺
|
f0f4bfb877
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 13:54:34 +08:00 |
|
黎永顺
|
aa1cef89b2
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 13:52:54 +08:00 |
|
黎永顺
|
8252cebd98
|
1release/2.9.42311.01
|
2023-11-08 18:11:38 +08:00 |
|
黎永顺
|
1eac37cd38
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-08 13:37:33 +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 |
|
黎永顺
|
8162e02796
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 19:13:38 +08:00 |
|
黎永顺
|
675d583557
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 16:57:47 +08:00 |
|
黎永顺
|
5fd2120f14
|
feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置
|
2023-11-07 16:21:17 +08:00 |
|
黎永顺
|
4c7b3f9a6a
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 10:28:44 +08:00 |
|
黎永顺
|
8bd1cd51af
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-06 17:05:26 +08:00 |
|
黎永顺
|
eefa47164a
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-06 16:09:23 +08:00 |
|
黎永顺
|
68bd42c2c0
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-03 09:54:02 +08:00 |
|
黎永顺
|
b0500cf8f9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-02 18:17:30 +08:00 |
|
黎永顺
|
a617c40c1f
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-02 16:33:16 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30:18 +08:00 |