 黎永顺
|
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 |
|
黎永顺
|
8d58561b88
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:07:21 +08:00 |
|
黎永顺
|
3b0f7bd5ce
|
薪酬报表设置修改
|
2024-03-07 10:31:56 +08:00 |
|
黎永顺
|
d1f8f5d9aa
|
薪酬报表修复
|
2024-03-07 10:10:04 +08:00 |
|
黎永顺
|
5e9a9c2822
|
hotfix/2.10.1.2402.01
薪酬统计报表设置添加薪资账套的设置项
|
2024-02-28 15:48:22 +08:00 |
|
黎永顺
|
d5fa8d7e84
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-25 14:54:55 +08:00 |
|
黎永顺
|
854949ab62
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-25 14:37:14 +08:00 |
|
黎永顺
|
45e3196e96
|
Merge branch 'release/2.9.9.2312.01' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/components/importDialog/index.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.js
# pc4mobx/hrmSalary/pages/reportView/components/condition.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/salaryItem/options.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/accountDialog.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/constant.js
|
2023-12-13 11:44:19 +08:00 |
|
黎永顺
|
117b068baf
|
feature/V2-dev合并多语言
|
2023-12-04 16:50:50 +08:00 |
|
黎永顺
|
b080e47190
|
feature/V2-dev合并多语言
|
2023-12-04 14:36:26 +08:00 |
|
黎永顺
|
4f00d117d6
|
feature/V2-dev合并多语言
|
2023-12-04 10:40:07 +08:00 |
|
黎永顺
|
7cc9e422b1
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 13:44:53 +08:00 |
|
黎永顺
|
83dad72062
|
Merge branch 'master' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
# pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
# pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
# pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-11-22 10:29:45 +08:00 |
|
黎永顺
|
1afaa04129
|
1release/2.9.42311.01
|
2023-11-09 15:36:13 +08:00 |
|
黎永顺
|
8252cebd98
|
1release/2.9.42311.01
|
2023-11-08 18:11:38 +08:00 |
|
黎永顺
|
8bd1cd51af
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-06 17:05:26 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30:18 +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 |
|
黎永顺
|
d664ad2769
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 17:03:24 +08:00 |
|
黎永顺
|
6ac979e9e7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-20 09:25:10 +08:00 |
|
黎永顺
|
0c9051917b
|
产品-系统多语言
|
2023-06-08 18:13:37 +08:00 |
|
黎永顺
|
fbc842724d
|
产品-多语言开发
|
2023-06-07 15:27:24 +08:00 |
|
黎永顺
|
93d07961c7
|
薪酬统计分析-员工明细列表开发
|
2023-05-25 13:27:17 +08:00 |
|
黎永顺
|
6c615453f7
|
产品-薪酬统计分析页面开发
|
2023-05-15 18:21:23 +08:00 |
|
黎永顺
|
835a04c72b
|
产品-薪酬统计分析完善
|
2023-04-26 15:14:06 +08:00 |
|
黎永顺
|
43c71e32cc
|
产品-薪酬统计分析完善
|
2023-04-25 09:37:04 +08:00 |
|
黎永顺
|
29b8d377d3
|
产品-薪酬统计分析管理模块
|
2023-04-24 18:30:47 +08:00 |
|
黎永顺
|
c048565890
|
产品-薪酬统计分析管理
|
2023-04-24 16:25:07 +08:00 |
|
黎永顺
|
ac9aab6f5f
|
产品-薪酬统计分析管理
|
2023-04-24 09:28:25 +08:00 |
|
黎永顺
|
8f3320ae11
|
产品-薪酬统计分析管理
|
2023-04-23 11:28:18 +08:00 |