Commit Graph

9 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 e06728670b 产品-数据采集页面列表样式修改 2023-06-20 14:25:30 +08:00
黎永顺 0c9051917b 产品-系统多语言 2023-06-08 18:13:37 +08:00
黎永顺 fbc842724d 产品-多语言开发 2023-06-07 15:27:24 +08:00
黎永顺 5196f38cb8 产品-系统多语言· 2023-04-18 14:32:20 +08:00
黎永顺 64dd62cc83 工资单模板背景bug修改 2023-03-02 17:23:23 +08:00
黎永顺 87024ceda9 数据采集页面重构 2023-02-21 18:05:54 +08:00
黎永顺 a11ad9d7d1 数据采集页面重构 2023-02-21 09:57:44 +08:00