 黎永顺
|
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 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
0537f71eba
|
产品-合并系统多语言
|
2023-06-09 14:44:18 +08:00 |
|
黎永顺
|
0c9051917b
|
产品-系统多语言
|
2023-06-08 18:13:37 +08:00 |
|
黎永顺
|
a9309d9005
|
产品-系统多语言·
|
2023-04-18 16:08:54 +08:00 |
|
黎永顺
|
7500887660
|
数据采集-考勤引用页面重构
|
2023-03-08 15:03:08 +08:00 |
|
黎永顺
|
72959ca015
|
数据采集-考勤引用页面重构
|
2023-03-08 13:54:27 +08:00 |
|
黎永顺
|
6d5258daa5
|
数据采集-考勤引用页面重构
|
2023-03-07 14:47:47 +08:00 |
|
黎永顺
|
1fc70a9978
|
数据采集-考勤引用页面重构
|
2023-03-06 17:13:08 +08:00 |
|
黎永顺
|
33e96c4437
|
数据采集-考勤引用页面重构
|
2023-03-06 15:06:56 +08:00 |
18652063575
|
0cec0873fe
|
统一所有页面你的弹框以及抽屉头部组件
|
2022-09-13 16:39:15 +08:00 |
|
liyongshun
|
2097d2faf7
|
薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口
|
2022-08-02 18:16:49 +08:00 |
MustangDeng
|
218d648f33
|
设置表头
|
2022-03-23 13:11:01 +08:00 |
|
MustangDeng
|
236a6952a4
|
考勤数据导入
|
2022-03-14 17:07:26 +08:00 |