黎永顺 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
..
adjustReason.js	薪资方案	2022-04-02 17:34:40 +08:00
changeSalaryModal.js	产品-系统多语言合并	2023-08-08 11:03:34 +08:00
columns.js	薪资档案发薪员工页面的调薪页面重构	2023-09-04 16:48:36 +08:00
editAgentModal.js	已知bug修复	2023-02-24 15:52:19 +08:00
index.js	社保福利台账添加线下对比的页面功能	2022-09-29 15:45:23 +08:00
index.less	hotfix/2.12.1.2403.02	2024-03-25 17:23:42 +08:00
salaryArchiveEditAdjLogRecord.js	Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支	2024-04-01 15:31:34 +08:00
salaryItemChangeList.js	Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支	2024-04-01 15:31:34 +08:00
saralyFileViewSlide.js	feature/V2-dev合并多语言	2023-12-04 16:50:50 +08:00
searchPanel.js	工资单模块开始	2022-04-12 18:29:28 +08:00
slideAgent.js	薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口	2022-08-02 18:16:49 +08:00
slideSalaryItem.js	薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口	2022-08-02 18:16:49 +08:00
taxAgentChangeList.js	产品-系统多语言·	2023-04-18 14:00:08 +08:00