Commit Graph

15 Commits

Author SHA1 Message Date
黎永顺 4d96075efc 产品-系统多语言合并 2023-08-08 15:57:47 +08:00
黎永顺 b6157dd074 产品-多语言 2023-07-27 11:34:37 +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
黎永顺 b77aad0e42 产品-工资单模板列表页面接口修改 2023-06-19 18:48:50 +08:00
黎永顺 661b3f66ca 产品-工资单发放基础设置水印设置的水印预览修改 2023-06-19 09:44:44 +08:00
黎永顺 7d07af3a22 产品-工资单水印设置修改弹框 2023-06-16 11:30:11 +08:00
黎永顺 92c73b846a 产品-工资单水印设置与预览等功能 2023-06-15 18:28:06 +08:00
黎永顺 d114e3b7bd 产品-合并系统多语言 2023-06-09 11:38:20 +08:00
黎永顺 d21d987823 产品-系统多语言 2023-05-23 17:03:25 +08:00
黎永顺 db2fc4ba2e 工资单模板上传背景组件的样式修改 2023-02-03 11:24:17 +08:00
liyongshun 2097d2faf7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
MustangDeng 00f867914a 工资单预览 2022-05-05 15:53:35 +08:00
MustangDeng 5b743bc4a9 工资单模板接口对接 2022-04-14 19:32:57 +08:00
MustangDeng 7f08c6ae5c 新增工资单模板 2022-04-13 16:56:31 +08:00