salary-management-front/pc4mobx/hrmSalary/stores
黎永顺 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
..
StandingBook.js feature/2.10.1.2401.01-社保福利台账列表页面重构 2024-01-23 15:38:03 +08:00
archives.js Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/V2-dev合并多语言 2023-12-04 11:30:54 +08:00
attendanceStore.js feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 2024-03-26 17:07:21 +08:00
baseForm.js release/2.10.1.2402.01-个税 2024-02-23 17:38:42 +08:00
baseTable.js 2022-02-25 2022-02-25 09:24:56 +08:00
calculate.js Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
cumDeduct.js hotfix/2.9.42310.02 2023-10-25 15:45:38 +08:00
cumSituation.js hotfix/2.9.42310.02 2023-10-25 15:45:38 +08:00
declare.js feature/2.9.42310.01-个税申报表页面重构 2023-10-12 13:57:14 +08:00
externalPersonManage.js 非系统人员管理-新功能开发 2023-03-13 10:43:25 +08:00
index.js 非系统人员管理-新功能开发 2023-03-13 10:43:25 +08:00
ledger.js feature/2.9.42311.02-社保核算以及薪资账套查询优化 2023-11-27 19:17:44 +08:00
mySalary.js hotfix/2.9.42311.02-我的薪资福利页面重构 2023-11-20 17:48:44 +08:00
otherDeduct.js hotfix/2.9.42310.02 2023-10-25 15:45:38 +08:00
payroll.js hotfix/2.12.1.2403.02 2024-03-21 13:49:18 +08:00
payrollFiles.js feature/2.9.10.2312.02-薪资档案页面重构 2024-01-15 18:18:26 +08:00
programme.js Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
salaryFile.js 薪资档案发薪员工页面的调薪页面重构 2023-09-04 16:48:36 +08:00
salaryItem.js hotfix/2.9.42310.01 2023-10-19 13:38:00 +08:00
specialAdd.js hotfix/2.9.42310.02 2023-10-25 15:45:38 +08:00
taxAgent.js feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 10:25:22 +08:00
taxRate.js 薪资档案待停薪页面添加取消待办的功能 2023-03-29 09:28:55 +08:00