salary-management-front/pc4mobx/hrmSalary/components
黎永顺 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
..
EditTable 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
PersonalScopeModal 产品-系统多语言 2023-05-23 17:03:25 +08:00
PersonalScopeTable 产品-系统多语言 2023-05-23 17:03:25 +08:00
TipLabel 产品-多语言话 2023-04-14 13:29:21 +08:00
UnifiedTable 数据采集页面重构 2023-02-22 13:36:59 +08:00
canDeleteItem 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
contentWrapper 2022-02-25 2022-02-25 09:24:56 +08:00
customForm 薪资档案以及社保福利档案页面添加四个tab的列表查询 2022-10-17 10:03:01 +08:00
customPaginationTable 产品-多语言话 2023-04-13 17:32:27 +08:00
customTab bug 处理 2022-06-02 13:51:45 +08:00
customTable 薪资核算页面表格替换antd4.x的table组件 2022-08-11 17:38:03 +08:00
excelEditor 产品-公式编辑器bug修改 2023-05-29 16:49:45 +08:00
groupCard 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
importModal 产品-系统多语言· 2023-04-18 16:08:54 +08:00
logViewModal 个税扣缴义务人页面组件重构 2022-02-28 15:57:34 +08:00
monthRange 考勤列表 2022-03-14 14:08:22 +08:00
progressModal 产品-系统多语言 2023-04-14 14:21:23 +08:00
requiredLabelTip 验证 2022-04-06 14:26:16 +08:00
selectItemsModal 产品-系统多语言· 2023-04-18 16:08:54 +08:00
selectedTab 薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能 2022-11-15 15:42:09 +08:00
slideModalTitle 产品-多语言话 2023-04-14 13:29:21 +08:00
smallTab 统一所有页面你的弹框以及抽屉头部组件,样式bug的修改 2022-09-15 11:08:13 +08:00
stepSlide 工资单模板修改 2022-12-06 15:04:57 +08:00
tabWrapper 2022-02-25 2022-02-25 09:24:56 +08:00
twoColContent 考勤引用静态页面 2022-03-15 13:59:36 +08:00
index.js 统一系统右键 2022-12-01 14:28:30 +08:00