 黎永顺
|
8f7244f119
|
Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支
# Conflicts:
# pc4mobx/hrmSalary/components/mobileTemplate/index.js
# pc4mobx/hrmSalary/components/pcTemplate/content.js
# pc4mobx/hrmSalary/components/selectItemsModal/index.js
# pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js
# pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
# pc4mobx/hrmSalary/pages/calculate/calculate.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/externalPersonManage/index.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/fieldManagement/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
# pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
# pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
# pc4mobx/hrmSalary/pages/reportView/components/condition.js
# pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/paymentPeriodModal.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/logDialog/index.js
# pc4mobx/hrmSalary/pages/taxAgent/index.js
# pc4mobx/hrmSalary/stores/baseForm.js
# pc4mobx/hrmSalary/stores/programme.js
# pc4mobx/hrmSalary/util/request.js
|
2024-04-01 15:31:34 +08:00 |
|
黎永顺
|
1364c52674
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-25 17:56:56 +08:00 |
|
黎永顺
|
0b4cfd0650
|
feature/V2-dev合并多语言
|
2023-12-01 16:10:44 +08:00 |
|
黎永顺
|
b66ee38b18
|
Merge branch 'release/2.9.42311.02' into feature/V2-dev合并多语言
|
2023-11-30 16:07:37 +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 |
|
黎永顺
|
b9e98f2b41
|
Merge branch 'release/2.9.42310.01' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
# pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
# pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
# pc4mobx/hrmSalary/pages/reportView/index.js
# pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
|
2023-10-09 18:38:26 +08:00 |
|
黎永顺
|
f5638d9453
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-21 13:06:49 +08:00 |
|
黎永顺
|
9030e22449
|
hotfix/2.9.42309.01
|
2023-09-21 12:04:55 +08:00 |
|
黎永顺
|
089bed1f53
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:26:19 +08:00 |
|
黎永顺
|
5b6480f076
|
hotfix/2.9.42308.02-工资单模板设置名称保存失败bug修复
|
2023-09-01 11:08:35 +08:00 |
|
黎永顺
|
38e2b1b61b
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-17 08:43:43 +08:00 |
|
黎永顺
|
6d10c01f0c
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/stores/payroll.js
|
2023-08-17 08:36:27 +08:00 |
|
黎永顺
|
6503ec43f1
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/externalPersonManage/conditions.js
# pc4mobx/hrmSalary/pages/externalPersonManage/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
|
2023-08-04 17:38:25 +08:00 |
|
黎永顺
|
262976cc5e
|
产品-合并代码
|
2023-08-04 13:55:20 +08:00 |
|
黎永顺
|
cb94dabd30
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-01 16:10:29 +08:00 |
|
黎永顺
|
5eec7139d6
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:09:23 +08:00 |
|
黎永顺
|
a433de7671
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:03:48 +08:00 |
|
黎永顺
|
b03c193927
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:51:02 +08:00 |
|
黎永顺
|
dbae61623d
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:48:47 +08:00 |
|
黎永顺
|
4601742b9d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-01 13:37:54 +08:00 |
|
黎永顺
|
ce87730349
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-01 13:37:35 +08:00 |
|
黎永顺
|
8b1f16e016
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/externalPersonManage/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-08-01 10:24:03 +08:00 |
|
黎永顺
|
d1594e5620
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into develop
|
2023-08-01 09:04:49 +08:00 |
|
黎永顺
|
df6eb00239
|
产品-系统多语言
|
2023-07-31 18:58:54 +08:00 |
|
黎永顺
|
763c307f3d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 11:20:37 +08:00 |
|
黎永顺
|
223effab98
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 11:20:14 +08:00 |
|
黎永顺
|
6fd55967bd
|
产品-合并问题处理
|
2023-07-27 14:09:21 +08:00 |
|
黎永顺
|
b6157dd074
|
产品-多语言
|
2023-07-27 11:34:37 +08:00 |
|
黎永顺
|
8bac520ff0
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/columns.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-07-27 10:43:14 +08:00 |
|
黎永顺
|
07ba7a61c2
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2307.02
|
2023-07-24 09:46:30 +08:00 |
|
黎永顺
|
bf7a1478c5
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-21 10:16:12 +08:00 |
|
黎永顺
|
3091232181
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-21 10:15:48 +08:00 |
|
黎永顺
|
bc9214edcd
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-20 18:27:11 +08:00 |
|
黎永顺
|
8e399f979a
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 18:26:34 +08:00 |
|
黎永顺
|
f7cd085c92
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 16:16:43 +08:00 |
|
黎永顺
|
9d94619c1d
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 13:35:37 +08:00 |
|
黎永顺
|
f15ace5c33
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 17:45:24 +08:00 |
|
黎永顺
|
377039ade2
|
产品-工资单反馈添加提示语
|
2023-07-17 17:40:30 +08:00 |
|
黎永顺
|
70bd93ef2f
|
Merge branch 'release/2.8.3.2307.01' into feature/2.8.3.2307.02-工资单反馈
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 17:09:27 +08:00 |
|
黎永顺
|
8ca7a02f82
|
产品-工资单反馈跳转验证
|
2023-07-17 15:21:05 +08:00 |
|
黎永顺
|
b3e5d2ba1c
|
dev合并工资单反馈代码
|
2023-07-13 14:58:27 +08:00 |
|
黎永顺
|
92edd14872
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
|
2023-07-13 14:49:42 +08:00 |
|
黎永顺
|
aff963b5c6
|
工资单反馈功能新增
|
2023-07-13 14:45:25 +08:00 |
|
黎永顺
|
ae79ab24c3
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 14:04:26 +08:00 |
|
黎永顺
|
e501aa293e
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 10:54:39 +08:00 |
|
黎永顺
|
d2fe01c759
|
产品-工资单模板定时发放bug处理以及规则设置
|
2023-07-04 17:37:04 +08:00 |
|
黎永顺
|
6e832fe873
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/declare/generateModal.js
# pc4mobx/hrmSalary/pages/declare/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/mySalary/index.js
# pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/reportView/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
# pc4mobx/hrmSalary/pages/taxAgent/index.js
|
2023-07-04 10:50:53 +08:00 |
|
黎永顺
|
fbf16f97dc
|
产品-工资单模板定时发放功能开发
|
2023-07-03 13:52:20 +08:00 |
|
黎永顺
|
8f922ce716
|
产品-合并系统多语言
|
2023-06-09 14:53:47 +08:00 |