qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.14.1.2405.01' into release/2.14.1.2405.01-个税 

# Conflicts:
#	pc4mobx/hrmSalary/index.js
This commit is contained in:
黎永顺 2024-05-20 10:03:04 +08:00
parent 26391a35fa 888df02e07
commit e74ce42f39
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pc4mobx/hrmSalary/index.js
View File

@ -126,41 +126,23 @@ const DataAcquisition = (props) => props.children;
// intelligentCalculateSalarySettings 智能算薪
const Routes = (
<Route
key="hrmSalary"
path="hrmSalary"
onEnter={getLocaleLabel}
component={Home}>
<Route key="hrmSalary" path="hrmSalary" onEnter={getLocaleLabel} component={Home}>
<Route key="historicalPayroll" path="historicalPayroll" component={HistoricalPayroll}/>
<Route key="salaryAdjustmentRecords" path="salaryAdjustmentRecords" component={SalaryAdjustmentRecords}/>
<Route key="mySalaryMobile" path="mySalaryMobile" component={MySalaryMobile}/>
<Route key="mySalary" path="mySalary" component={MySalary}/>
<Route key="mySalaryView" path="mySalary/:salaryInfoId" component={MySalaryView}/>
<Route
key="socialSecurityBenefits"
path="socialSecurityBenefits"
component={SocialSecurityBenefits}>
<Route key="socialSecurityBenefits" path="socialSecurityBenefits" component={SocialSecurityBenefits}>
<Route key="programme" path="programme" component={Programme}/>
<Route key="archives" path="archives" component={Archives}/>
<Route key="standingBook" path="standingBook" component={StandingBook}/>
<Route
key="standingBookDetail"
path="standingBookDetail"
component={StandingBookDetail}
/>
<Route
key="sbofflineComparison"
path="sbofflineComparison"
component={StandingBookOfflineComparison}
/>
<Route key="standingBookDetail" path="standingBookDetail" component={StandingBookDetail} />
<Route key="sbofflineComparison" path="sbofflineComparison" component={StandingBookOfflineComparison} />
</Route>
<Route key="salaryItem" path="salaryItem" component={SalaryItem}/>
<Route key="salaryFile" path="salaryFile" component={SalaryFiles}/>
<Route key="adjustSalaryManage" path="adjustSalaryManage" component={AdjustSalaryManage}/>
<Route
key="dataAcquisition"
path="dataAcquisition"
component={DataAcquisition}>
<Route key="dataAcquisition" path="dataAcquisition" component={DataAcquisition}>
<Route key="cumDeduct" path="cumDeduct" component={CumDeduct}/>
<Route key="otherDeduct" path="otherDeduct" component={OtherDeduct}/>
<Route key="cumSituation" path="cumSituation" component={CumSituation}/>