 黎永顺
|
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 |
|
黎永顺
|
d9f3fafd51
|
hotfix/2.12.1.2403.02
数据透视导出功能
|
2024-03-19 14:29:00 +08:00 |
|
黎永顺
|
6e193e028c
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 16:10:30 +08:00 |
|
黎永顺
|
b9e98f2b41
|
Merge branch 'release/2.9.42310.01' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
# pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
# pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
# pc4mobx/hrmSalary/pages/reportView/index.js
# pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
|
2023-10-09 18:38:26 +08:00 |
|
黎永顺
|
96032b5f1c
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 10:17:06 +08:00 |
|
黎永顺
|
8f922ce716
|
产品-合并系统多语言
|
2023-06-09 14:53:47 +08:00 |
|
黎永顺
|
8bb1146ca5
|
产品-数据透视以及薪资项目自定义弹框列表的改造
|
2023-06-08 14:52:09 +08:00 |
|
黎永顺
|
8f7a8e4192
|
产品-数据统计-数据透视
|
2023-06-08 11:24:05 +08:00 |