黎永顺 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
..
components	产品-系统多语言合并	2023-08-08 15:57:47 +08:00
payrollDetail	Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支	2024-04-01 15:31:34 +08:00
payrollGrant	feature/V2-dev合并多语言	2023-10-10 09:24:52 +08:00
stepForm	Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支	2024-04-01 15:31:34 +08:00
templatePreview	Merge branch 'release/2.9.9.2312.01' into feature/V2-dev合并多语言	2023-12-13 11:44:19 +08:00
SalarySendList.js	产品-系统多语言合并	2023-08-08 15:57:47 +08:00
columns.js	工资单发放	2022-03-18 09:41:48 +08:00
copyModal.js	产品-合并系统多语言	2023-06-09 11:38:20 +08:00
index.js	feature/V2-dev合并多语言	2023-10-10 09:24:52 +08:00
index.less	feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）	2023-10-08 10:51:26 +08:00
templateBaseSettings.js	Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支	2024-04-01 15:31:34 +08:00
templateSettingList.js	产品-统一页面列表操作按钮	2023-07-03 16:03:56 +08:00
watermarkPreview.js	产品-工资单水印预览和查看不一致的问题处理，账套项目预览隐藏分组未实现， 数据采集查看明细时页面显示不对齐问题处理	2023-06-30 10:17:23 +08:00