qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
salary-management-front/pc4mobx/hrmSalary/apis
History
黎永顺 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
..
adjustManage.js feature/2.9.42310.01-调薪记录 2023-10-16 15:27:29 +08:00
archive.js feature/V2-dev合并多语言 2023-12-14 16:45:09 +08:00
attendance.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
calculate.js feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 14:37:49 +08:00
cumDeduct.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
cumSituation.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
declare.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
externalPersonManage.js 产品-非系统人员管理导入 2023-08-01 17:44:59 +08:00
fieldManage.js 字段管理 2023-01-28 13:42:32 +08:00
index.js feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 2024-03-26 17:07:21 +08:00
item.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
ledger.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
mySalaryBenefits.js Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
offlineCompare.js 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
otherDeduct.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
payroll.js Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并 2023-11-30 13:55:38 +08:00
payrollFiles.js hotfix/2.12.1.2403.02 2024-03-19 14:29:00 +08:00
ruleconfig.js Merge branch 'feature/非系统人员开关' into develop 2023-07-14 10:43:05 +08:00
special.js 专项附加扣除模块页面接口联调完成 2022-11-07 13:57:22 +08:00
standingBook.js Merge branch 'feature/2.10.1.2402.01-社保台账导入缓存' into release/2.10.1.2402.01 2024-03-06 14:08:15 +08:00
statistics.js feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 2024-03-26 17:07:21 +08:00
sysconfig.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
taxAgent.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
taxrate.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
welfareArchive.js Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into feature/V2-dev合并多语言 2023-12-14 14:33:38 +08:00
welfareScheme.js feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00