salary-management-front/pc4mobx/hrmSalary/pages/ledgerPage/components
黎永顺 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
..
LedgerBackCalculatedSalaryItemTable.js 产品-系统多语言 2023-06-08 18:13:37 +08:00
categoryAddModal.js feature/V2-dev合并多语言 2023-12-04 16:50:50 +08:00
copyLedgerModal.js feature/V2-dev合并多语言 2023-12-04 16:50:50 +08:00
index.less 产品-系统多语言合并 2023-08-08 15:57:47 +08:00
ledgerAdjustRuleAddModal.js feature/V2-dev合并多语言 2023-12-04 16:50:50 +08:00
ledgerAssociatedPersonnel.js 产品-系统多语言合并 2023-08-08 13:45:54 +08:00
ledgerBackCalcEditSlide.js 产品-系统多语言 2023-06-08 18:13:37 +08:00
ledgerBackCalculatedSalaryItem.js 产品-系统多语言 2023-06-08 18:13:37 +08:00
ledgerBaseSetting.js 产品-系统多语言合并 2023-08-04 17:45:18 +08:00
ledgerMovoTo.js Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
ledgerSalaryAdjustmentRules.js 产品-系统多语言 2023-06-08 18:13:37 +08:00
ledgerSalaryItem.js 产品-系统多语言 2023-06-08 18:13:37 +08:00
ledgerSalaryItemAddModal.js Merge branch 'develop' into feature/V2-dev合并多语言 2023-07-27 10:43:14 +08:00
ledgerSalaryItemBaseInfo.js Merge branch 'release/2.9.9.2312.01' into feature/V2-dev合并多语言 2023-12-13 11:44:19 +08:00
ledgerSalaryItemEditSlide.js Merge branch 'release/2.9.42310.01' into feature/V2-dev合并多语言 2023-10-09 18:38:26 +08:00
ledgerSalaryItemNormal.js feature/V2-dev合并多语言 2023-12-01 16:10:44 +08:00
ledgerSalaryItemPreviewModal.js Merge branch 'develop' into feature/V2-dev合并多语言 2023-07-04 10:50:53 +08:00
ledgerSalaryItemTable.js Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
ledgerSearchComp.js hotfix/2.9.9.2312.01 2023-12-07 13:55:52 +08:00
ledgerSlide.js Merge branch 'release/2.9.9.2312.01' into feature/V2-dev合并多语言 2023-12-13 11:44:19 +08:00
ledgerTable.js Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00