 黎永顺
|
1f332adcff
|
feature/V2-dev合并多语言
|
2023-12-14 16:45:09 +08:00 |
|
黎永顺
|
97bd0c8b4d
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/components/mobileTemplate/index.js
# pc4mobx/hrmSalary/components/pcTemplate/index.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
|
2023-12-14 14:33:38 +08:00 |
|
黎永顺
|
f0ea119865
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/components/importDialog/index.js
|
2023-12-13 11:17:52 +08:00 |
|
黎永顺
|
a9bd1dc625
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-12 17:18:06 +08:00 |
|
黎永顺
|
43012b2025
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 15:56:39 +08:00 |
|
黎永顺
|
3eb8c47a87
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 13:39:55 +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 |
|
黎永顺
|
78aaac8115
|
工资单修改
|
2023-12-01 16:39:31 +08:00 |
|
黎永顺
|
0b4cfd0650
|
feature/V2-dev合并多语言
|
2023-12-01 16:10:44 +08:00 |
|
黎永顺
|
b66ee38b18
|
Merge branch 'release/2.9.42311.02' into feature/V2-dev合并多语言
|
2023-11-30 16:07:37 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +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 |
|
黎永顺
|
c44f92fb56
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-27 17:28:11 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +08:00 |
|
黎永顺
|
4898ff8335
|
hotfix/2.9.42310.01
|
2023-10-20 11:39:20 +08:00 |
|
黎永顺
|
bec2e5a5b2
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 11:51:41 +08:00 |
|
黎永顺
|
5031d3a032
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 09:42:46 +08:00 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
774a52681b
|
feature/V2-dev合并多语言
|
2023-10-10 09:24:52 +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 |
|
黎永顺
|
ff3dd0ea60
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-25 15:35:11 +08:00 |
|
黎永顺
|
c0c908f6eb
|
Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 17:48:35 +08:00 |
|
黎永顺
|
85867da080
|
hotfix/2.9.42309.01
|
2023-09-14 14:19:08 +08:00 |
|
黎永顺
|
f18bda74f4
|
hotfix/2.9.42309.01
|
2023-09-14 11:50:22 +08:00 |
|
黎永顺
|
8a90d58196
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 10:25:22 +08:00 |
|
黎永顺
|
a994bc2346
|
产品-系统多语言合并
|
2023-08-04 17:45:18 +08:00 |
|
黎永顺
|
8b1f16e016
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/externalPersonManage/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-08-01 10:24:03 +08:00 |
|
黎永顺
|
df6eb00239
|
产品-系统多语言
|
2023-07-31 18:58:54 +08:00 |
|
黎永顺
|
8071a62ec8
|
产品-社保福利方案自定义方案添加删除功能
|
2023-07-27 14:58:32 +08:00 |
|
黎永顺
|
8bac520ff0
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/columns.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-07-27 10:43:14 +08:00 |
|
黎永顺
|
ce50c9cf91
|
Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
# pc4mobx/hrmSalary/util/index.js
|
2023-07-11 17:36:38 +08:00 |
|
黎永顺
|
c8623c713d
|
系统多语言-添加
|
2023-07-04 11:11:57 +08:00 |
|
黎永顺
|
6e832fe873
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/declare/generateModal.js
# pc4mobx/hrmSalary/pages/declare/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/mySalary/index.js
# pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/reportView/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
# pc4mobx/hrmSalary/pages/taxAgent/index.js
|
2023-07-04 10:50:53 +08:00 |
|
黎永顺
|
3d04a79fcd
|
产品-统一页面列表操作按钮
|
2023-07-03 15:42:11 +08:00 |
|
黎永顺
|
d71b879290
|
产品-工资单验证方式
|
2023-06-16 16:34:03 +08:00 |
|
黎永顺
|
ab3e5fbbf5
|
Merge branch 'feature/0612-工资单水印设置' into feature/0616-工资单验证方式
# Conflicts:
# pc4mobx/hrmSalary/apis/payroll.js
|
2023-06-16 15:33:15 +08:00 |
|
黎永顺
|
e9546e5329
|
产品-工资单验证方式
|
2023-06-16 15:32:05 +08:00 |
|
黎永顺
|
a80c4a37d5
|
产品-工资单验证方式修改
|
2023-06-16 11:12:20 +08:00 |
|
黎永顺
|
92c73b846a
|
产品-工资单水印设置与预览等功能
|
2023-06-15 18:28:06 +08:00 |
|
黎永顺
|
0537f71eba
|
产品-合并系统多语言
|
2023-06-09 14:44:18 +08:00 |
|
黎永顺
|
d114e3b7bd
|
产品-合并系统多语言
|
2023-06-09 11:38:20 +08:00 |
|
黎永顺
|
0c9051917b
|
产品-系统多语言
|
2023-06-08 18:13:37 +08:00 |
|
黎永顺
|
fbc842724d
|
产品-多语言开发
|
2023-06-07 15:27:24 +08:00 |
|
黎永顺
|
c059c013b2
|
Merge branch 'feature/V2-系统多语言' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
# pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/salaryItem/columns.js
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
# pc4mobx/hrmSalary/pages/taxAgent/index.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-06-02 11:35:39 +08:00 |
|
黎永顺
|
cc17ae7b09
|
产品-公式编辑器bug修改
|
2023-05-29 16:49:45 +08:00 |
|
黎永顺
|
d21d987823
|
产品-系统多语言
|
2023-05-23 17:03:25 +08:00 |
|
黎永顺
|
67ef55da46
|
产品-公式编辑器修改
|
2023-05-18 16:42:45 +08:00 |
|
黎永顺
|
ab161f8528
|
公式编辑器-去掉空提示语
|
2023-05-10 18:08:24 +08:00 |