qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
salary-management-front/pc4mobx/hrmSalary/components
History
黎永顺 8f7244f119 Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 
# Conflicts:
#	pc4mobx/hrmSalary/components/mobileTemplate/index.js
#	pc4mobx/hrmSalary/components/pcTemplate/content.js
#	pc4mobx/hrmSalary/components/selectItemsModal/index.js
#	pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js
#	pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
#	pc4mobx/hrmSalary/pages/calculate/calculate.js
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.js
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
#	pc4mobx/hrmSalary/pages/externalPersonManage/index.js
#	pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
#	pc4mobx/hrmSalary/pages/fieldManagement/index.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
#	pc4mobx/hrmSalary/pages/ledgerPage/index.js
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
#	pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
#	pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
#	pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
#	pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
#	pc4mobx/hrmSalary/pages/reportView/components/condition.js
#	pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
#	pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/paymentPeriodModal.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/logDialog/index.js
#	pc4mobx/hrmSalary/pages/taxAgent/index.js
#	pc4mobx/hrmSalary/stores/baseForm.js
#	pc4mobx/hrmSalary/stores/programme.js
#	pc4mobx/hrmSalary/util/request.js
 		2024-04-01 15:31:34 +08:00
..
EditTable 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
PersonalScopeModal feature/V2-dev合并多语言 2023-12-04 16:50:50 +08:00
PersonalScopeTable 产品-系统多语言 2023-05-23 17:03:25 +08:00
TipLabel 产品-多语言开发 2023-06-07 15:27:24 +08:00
UnifiedTable 产品-统一页面列表操作按钮 2023-07-03 15:42:11 +08:00
canDeleteItem 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
captchaModal 系统多语言-添加 2023-07-04 11:11:57 +08:00
contentWrapper 2022-02-25 2022-02-25 09:24:56 +08:00
customForm 产品-社保福利方案自定义方案添加删除功能 2023-07-27 14:58:32 +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 Merge branch 'master' into feature/V2-dev合并多语言 2023-11-22 10:29:45 +08:00
externalPersonModal 非系统人员修改 2023-03-16 11:03:52 +08:00
groupCard 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
importDialog Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
importModal 产品-系统多语言合并 2023-08-04 17:45:18 +08:00
logViewModal feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
mobileTemplate Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
monthRange 考勤列表 2022-03-14 14:08:22 +08:00
pcTemplate Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
progressModal 产品-系统多语言 2023-06-08 18:13:37 +08:00
requiredLabelTip 验证 2022-04-06 14:26:16 +08:00
selectItemsModal Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 2024-04-01 15:31:34 +08:00
selectedTab 薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能 2022-11-15 15:42:09 +08:00
slideModalTitle 产品-多语言开发 2023-06-07 15:27:24 +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
upload 系统多语言-添加 2023-07-04 11:11:57 +08:00
index.js 统一系统右键 2022-12-01 14:28:30 +08:00