Commit Graph

20 Commits

Author SHA1 Message Date
黎永顺 df6eb00239 产品-系统多语言 2023-07-31 18:58:54 +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
黎永顺 3a8dd06e3c 产品-工资单水印预览和查看不一致的问题处理,账套项目预览隐藏分组未实现, 数据采集查看明细时页面显示不对齐问题处理 2023-06-30 10:17:23 +08:00
黎永顺 d114e3b7bd 产品-合并系统多语言 2023-06-09 11:38:20 +08:00
黎永顺 0c9051917b 产品-系统多语言 2023-06-08 18:13:37 +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
黎永顺 d21d987823 产品-系统多语言 2023-05-23 17:03:25 +08:00
黎永顺 8e36bc89be 产品-薪資張濤月份说明数据的错误修改 2023-04-17 11:53:21 +08:00
黎永顺 c6d02c80c4 薪资账套-基本信息修改 2023-03-13 09:18:17 +08:00
黎永顺 a219206bc2 薪资账套修改 2023-02-15 18:47:37 +08:00
黎永顺 570493267e 薪资账套修改 2023-02-14 15:38:04 +08:00
黎永顺 cd897394b6 字段管理 2023-01-28 10:10:00 +08:00
黎永顺 ace2bcb8b5 薪资账套修改 2023-01-18 09:22:14 +08:00
黎永顺 b0604f854c 薪资账套报错 2023-01-05 15:03:03 +08:00
黎永顺 00f87ba5e5 薪资账套非空判断 2022-12-16 11:05:07 +08:00
黎永顺 d44b5d279d 薪资账套页面重构,薪资核算页面添加回算功能以及核算详情页面添加补发已发tab 2022-12-14 19:40:05 +08:00
黎永顺 fa45739e66 薪资账套页面重构 2022-12-12 11:38:43 +08:00
黎永顺 1e0c47364f 薪资账套页面重构 2022-12-12 10:24:07 +08:00
黎永顺 ac8c1ee43a 薪资账套页面重构 2022-12-09 15:26:21 +08:00
黎永顺 c6d6693198 薪资账套页面重构 2022-12-09 14:16:11 +08:00