 黎永顺
|
54b38ed997
|
custom/上海港湾多语言
|
2024-09-05 16:01:23 +08:00 |
|
黎永顺
|
e6753ee33c
|
custom/上海港湾多语言
|
2024-09-05 14:24:19 +08:00 |
|
黎永顺
|
4e2006ed31
|
custom/上海港湾多语言
|
2024-08-29 10:07:39 +08:00 |
|
黎永顺
|
d68ec3743b
|
custom/上海港湾多语言
|
2024-07-09 10:52:09 +08:00 |
|
黎永顺
|
72fd9a50e0
|
custom/上海港湾多语言
|
2024-06-13 16:04:07 +08:00 |
|
黎永顺
|
36f277c490
|
custom/上海港湾多语言
|
2024-06-13 14:55:57 +08:00 |
|
黎永顺
|
1c547fffc9
|
custom/上海港湾多语言
|
2024-06-13 11:50:34 +08:00 |
|
黎永顺
|
afa880ff84
|
custom/上海港湾-多语言版本----测试分支
|
2024-04-03 13:44:37 +08:00 |
|
黎永顺
|
e6623400bc
|
Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支
|
2024-04-02 17:47:43 +08:00 |
|
黎永顺
|
342aeed953
|
多语言bug
|
2024-04-02 17:45:59 +08:00 |
|
黎永顺
|
81d8c1c3b8
|
custom/上海港湾-多语言版本----测试分支
|
2024-04-01 15:48:24 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
75bb200e9d
|
release/2.12.1.2403.02
薪资明细以及薪资核算模板管理设置合并
|
2024-04-01 14:00:50 +08:00 |
|
黎永顺
|
223142e384
|
Merge branch 'feature/2.12.1.2403.02-薪资核算自定义导出模板设置' into release/2.12.1.2403.02
|
2024-04-01 13:59:18 +08:00 |
|
黎永顺
|
8dac6eab6b
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 16:52:28 +08:00 |
|
黎永顺
|
3ab97c5a70
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 16:15:11 +08:00 |
|
黎永顺
|
8a7f3fcb7a
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 14:37:49 +08:00 |
|
黎永顺
|
1fad3eabdf
|
release/2.12.1.2403.02
暂时去掉薪酬统计报表中的薪资明细tab
|
2024-03-29 10:48:31 +08:00 |
|
黎永顺
|
e5f1ede772
|
hotfix/2.12.1.2403.02
工资单模板bug修复
|
2024-03-29 10:36:39 +08:00 |
|
黎永顺
|
a768470afb
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-29 10:19:33 +08:00 |
|
黎永顺
|
9471a5a737
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-28 16:49:44 +08:00 |
|
黎永顺
|
15439581f4
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 14:07:25 +08:00 |
|
黎永顺
|
618c0edfb2
|
Merge branch 'release/2.12.1.2403.02' into hotfix/2.12.1.2403.02
|
2024-03-27 13:49:29 +08:00 |
|
黎永顺
|
e5078dc37b
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 10:11:30 +08:00 |
|
黎永顺
|
7fcc3594e5
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:08:06 +08:00 |
|
黎永顺
|
8d58561b88
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:07:21 +08:00 |
|
黎永顺
|
85c222def8
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
|
2024-03-26 09:14:32 +08:00 |
|
黎永顺
|
c51c93c812
|
hotfix/2.12.1.2403.02
调薪列表样式修改
|
2024-03-25 17:23:42 +08:00 |
|
黎永顺
|
b1cba712d8
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-21 13:49:51 +08:00 |
|
黎永顺
|
a7e75331e1
|
hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
|
2024-03-21 13:49:18 +08:00 |
|
黎永顺
|
59a2dbb300
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-20 15:30:07 +08:00 |
|
黎永顺
|
272e45d3e5
|
hotfix/2.12.1.2403.02
薪资档案调薪，薪资小数位配置
|
2024-03-20 09:10:06 +08:00 |
|
黎永顺
|
8af1f0a79a
|
hotfix/2.12.1.2403.02
完成导入报错的问题处理
|
2024-03-19 17:55:37 +08:00 |
|
黎永顺
|
d9f3fafd51
|
hotfix/2.12.1.2403.02
数据透视导出功能
|
2024-03-19 14:29:00 +08:00 |
|
黎永顺
|
90bfeedba3
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-18 16:03:31 +08:00 |
|
黎永顺
|
80acc5f18a
|
hotfix/2.12.1.2403.02
|
2024-03-18 16:03:04 +08:00 |
|
黎永顺
|
77cdcf2356
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-15 15:09:54 +08:00 |
|
黎永顺
|
689c837749
|
hotfix/3.00.0.2403.01
考情管理修改
|
2024-03-15 15:09:16 +08:00 |
|
黎永顺
|
196763681a
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-15 09:20:34 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
0a23b261b1
|
release/3.0.0.2403.01
|
2024-03-14 10:14:06 +08:00 |
|
黎永顺
|
0771ad9ed3
|
hotfix/3.0.0.2403.01
数据采集页面导入修改重构
|
2024-03-13 17:27:49 +08:00 |
|
黎永顺
|
ffaf5dc036
|
hotfix/3.0.0.2403.01
|
2024-03-13 14:23:08 +08:00 |
|
黎永顺
|
a12a097916
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-13 11:23:30 +08:00 |
|
黎永顺
|
b1ddea5305
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 11:22:54 +08:00 |
|
黎永顺
|
dc49211090
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 09:26:29 +08:00 |
|
黎永顺
|
20796bc14c
|
Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01
|
2024-03-12 09:37:44 +08:00 |
|
黎永顺
|
e4d272481c
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-11 17:19:20 +08:00 |
|
黎永顺
|
650f10a1ea
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-08 10:22:00 +08:00 |
|
黎永顺
|
3b0f7bd5ce
|
薪酬报表设置修改
|
2024-03-07 10:31:56 +08:00 |