From 8ffb9e519abd1eed24a2433db421008484b83a53 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Thu, 10 Mar 2022 10:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/index.js                    | 50 +++++++++----------
 .../columns.js                                |  0
 .../{salaryAccounting => calculate}/index.js  |  2 +-
 .../columns.js                                |  0
 .../index.js                                  |  2 +-
 .../columns.js                                |  0
 .../index.js                                  |  2 +-
 .../columns.js                                |  0
 .../index.js                                  |  2 +-
 .../{payrollPayment => declare}/columns.js    |  0
 .../index.js                                  |  2 +-
 .../{salaryAccounting => ledger}/columns.js   |  0
 .../pages/{salarySet => ledger}/index.js      |  2 +-
 .../pages/{salarySet => payroll}/columns.js   |  0
 .../{payrollPayment => payroll}/index.js      |  2 +-
 .../columns.js                                |  0
 .../index.js                                  |  2 +-
 17 files changed, 33 insertions(+), 33 deletions(-)
 rename pc4mobx/hrmSalary/pages/{individualIncomeTaxApplicationForm => calculate}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/{salaryAccounting => calculate}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/dataAcquisition/{attendanceReference => attendance}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/dataAcquisition/{attendanceReference => attendance}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/dataAcquisition/{cumulativeSituationInPreviousPeriods => cumSituation}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/dataAcquisition/{cumulativeSituationInPreviousPeriods => cumSituation}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/dataAcquisition/{otherTaxExemptDeductions => otherDeduct}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/dataAcquisition/{otherTaxExemptDeductions => otherDeduct}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/{payrollPayment => declare}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/{individualIncomeTaxApplicationForm => declare}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/{salaryAccounting => ledger}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/{salarySet => ledger}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/{salarySet => payroll}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/{payrollPayment => payroll}/index.js (97%)
 rename pc4mobx/hrmSalary/pages/{salaryItemManagement => salaryItem}/columns.js (100%)
 rename pc4mobx/hrmSalary/pages/{salaryItemManagement => salaryItem}/index.js (97%)

diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 07b2918e..40f1131b 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -5,16 +5,16 @@ import MySalary from './pages/mySalary';
 import Programme from './pages/socialSecurityBenefits/programme';
 import Archives from './pages/socialSecurityBenefits/archives';
 import StandingBook from './pages/socialSecurityBenefits/standingBook';
-import SalaryItemManagement from './pages/salaryItemManagement';
+import SalaryItem from './pages/salaryItem';
 import SalaryFile from './pages/salaryFile';
 import CumDeduct from './pages/dataAcquisition/cumDeduct';
-import OtherTaxExemptDeductions from './pages/dataAcquisition/otherTaxExemptDeductions';
-import CumulativeSituationInPreviousPeriods from './pages/dataAcquisition/cumulativeSituationInPreviousPeriods';
-import AttendanceReference from './pages/dataAcquisition/attendanceReference';
-import SalarySet from './pages/salarySet';
-import SalaryAccounting from './pages/salaryAccounting';
-import PayrollPayment from './pages/payrollPayment';
-import IndividualIncomeTaxApplicationForm from './pages/individualIncomeTaxApplicationForm';
+import OtherDeduct from './pages/dataAcquisition/otherDeduct';
+import CumSituation from './pages/dataAcquisition/cumSituation';
+import Attendance from './pages/dataAcquisition/attendance';
+import Ledger from './pages/ledger';
+import Calculate from './pages/calculate';
+import Payroll from './pages/payroll';
+import Declare from './pages/declare';
 import TaxRate from './pages/taxRate';
 import TaxAgent from './pages/taxAgent';
 
@@ -42,18 +42,18 @@ const DataAcquisition = props => props.children;
 // 	programme  社保福利方案
 // 	archives	社保福利档案
 // 	standingBook 社保福利台账
-// salaryItemManagement	薪资项目管理
+// salaryItem	薪资项目管理
 // salaryFile	薪资档案
 // dataAcquisition	数据采集
 // 	CumDeduct	累计专项附加扣除
-// 	otherTaxExemptDeductions	其他免税扣除
-// 	cumulativeSituationInPreviousPeriods 	往期累计情况
-// 	attendanceReference	考勤引用
-// salarySet	薪资账套
-// salaryAccounting	薪资核算
-// payrollPayment 	工资单发放
-// individualIncomeTaxApplicationForm 	个税申请表
-// individualIncomeTaxRateForm		个税税率表
+// 	otherDeduct	其他免税扣除
+// 	cumSituation 	往期累计情况
+// 	attendance	考勤引用
+// ledger	薪资账套
+// calculate	薪资核算
+// payroll 	工资单发放
+// declare 	个税申请表
+// taxRate		个税税率表
 // taxAgent	个税扣缴义务人
 
 const Routes = (
@@ -64,18 +64,18 @@ const Routes = (
       <Route key='archives' path='archives' component={Archives} />
       <Route key='standingBook' path='standingBook' component={StandingBook} />
     </Route>
-    <Route key='salaryItemManagement' path='salaryItemManagement' component={SalaryItemManagement} />
+    <Route key='salaryItem' path='salaryItem' component={SalaryItem} />
     <Route key='salaryFile' path='salaryFile' component={SalaryFile} />
     <Route key='dataAcquisition' path='dataAcquisition' component={DataAcquisition}>
       <Route key='cumDeduct' path='cumDeduct' component={CumDeduct} />
-      <Route key='otherTaxExemptDeductions' path='otherTaxExemptDeductions' component={OtherTaxExemptDeductions} />
-      <Route key='cumulativeSituationInPreviousPeriods' path='cumulativeSituationInPreviousPeriods' component={CumulativeSituationInPreviousPeriods} />
-      <Route key='attendanceReference' path='attendanceReference' component={AttendanceReference} />
+      <Route key='otherDeduct' path='otherDeduct' component={OtherDeduct} />
+      <Route key='cumSituation' path='cumSituation' component={CumSituation} />
+      <Route key='attendance' path='attendance' component={Attendance} />
     </Route>
-    <Route key='salarySet' path='salarySet' component={SalarySet} />
-    <Route key='salaryAccounting' path='salaryAccounting' component={SalaryAccounting} />
-    <Route key='payrollPayment' path='payrollPayment' component={PayrollPayment} />
-    <Route key='individualIncomeTaxApplicationForm' path='individualIncomeTaxApplicationForm' component={IndividualIncomeTaxApplicationForm} />
+    <Route key='ledger' path='ledger' component={Ledger} />
+    <Route key='calculate' path='calculate' component={Calculate} />
+    <Route key='payroll' path='payroll' component={Payroll} />
+    <Route key='declare' path='declare' component={Declare} />
     <Route key='taxRate' path='taxRate' component={TaxRate} />
     <Route key='taxAgent' path='taxAgent' component={TaxAgent} />
   </Route>
diff --git a/pc4mobx/hrmSalary/pages/individualIncomeTaxApplicationForm/columns.js b/pc4mobx/hrmSalary/pages/calculate/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/individualIncomeTaxApplicationForm/columns.js
rename to pc4mobx/hrmSalary/pages/calculate/columns.js
diff --git a/pc4mobx/hrmSalary/pages/salaryAccounting/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/salaryAccounting/index.js
rename to pc4mobx/hrmSalary/pages/calculate/index.js
index 5bd7be42..dfb750d3 100644
--- a/pc4mobx/hrmSalary/pages/salaryAccounting/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class SalaryAccounting extends React.Component {
+export default class Calculate extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendanceReference/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/dataAcquisition/attendanceReference/columns.js
rename to pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendanceReference/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/dataAcquisition/attendanceReference/index.js
rename to pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index 0943fcb4..a4cab7ed 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendanceReference/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class AttendanceReference extends React.Component {
+export default class Attendance extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumulativeSituationInPreviousPeriods/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/dataAcquisition/cumulativeSituationInPreviousPeriods/columns.js
rename to pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumulativeSituationInPreviousPeriods/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/dataAcquisition/cumulativeSituationInPreviousPeriods/index.js
rename to pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index 13282c62..f8e65762 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumulativeSituationInPreviousPeriods/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class CumulativeSituationInPreviousPeriods extends React.Component {
+export default class CumSituation extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherTaxExemptDeductions/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/dataAcquisition/otherTaxExemptDeductions/columns.js
rename to pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherTaxExemptDeductions/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/dataAcquisition/otherTaxExemptDeductions/index.js
rename to pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
index 02adf211..5c4b1957 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherTaxExemptDeductions/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class OtherTaxExemptDeductions extends React.Component {
+export default class OtherDeduct extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/payrollPayment/columns.js b/pc4mobx/hrmSalary/pages/declare/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/payrollPayment/columns.js
rename to pc4mobx/hrmSalary/pages/declare/columns.js
diff --git a/pc4mobx/hrmSalary/pages/individualIncomeTaxApplicationForm/index.js b/pc4mobx/hrmSalary/pages/declare/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/individualIncomeTaxApplicationForm/index.js
rename to pc4mobx/hrmSalary/pages/declare/index.js
index d8fd0c3b..e853e91a 100644
--- a/pc4mobx/hrmSalary/pages/individualIncomeTaxApplicationForm/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class IndividualIncomeTaxApplicationForm extends React.Component {
+export default class Declare extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/salaryAccounting/columns.js b/pc4mobx/hrmSalary/pages/ledger/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/salaryAccounting/columns.js
rename to pc4mobx/hrmSalary/pages/ledger/columns.js
diff --git a/pc4mobx/hrmSalary/pages/salarySet/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/salarySet/index.js
rename to pc4mobx/hrmSalary/pages/ledger/index.js
index 372f22b2..68cf290d 100644
--- a/pc4mobx/hrmSalary/pages/salarySet/index.js
+++ b/pc4mobx/hrmSalary/pages/ledger/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class SalarySet extends React.Component {
+export default class Ledger extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/salarySet/columns.js b/pc4mobx/hrmSalary/pages/payroll/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/salarySet/columns.js
rename to pc4mobx/hrmSalary/pages/payroll/columns.js
diff --git a/pc4mobx/hrmSalary/pages/payrollPayment/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/payrollPayment/index.js
rename to pc4mobx/hrmSalary/pages/payroll/index.js
index 8c106784..9f13e7d4 100644
--- a/pc4mobx/hrmSalary/pages/payrollPayment/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class PayrollPayment extends React.Component {
+export default class Payroll extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/pc4mobx/hrmSalary/pages/salaryItemManagement/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
similarity index 100%
rename from pc4mobx/hrmSalary/pages/salaryItemManagement/columns.js
rename to pc4mobx/hrmSalary/pages/salaryItem/columns.js
diff --git a/pc4mobx/hrmSalary/pages/salaryItemManagement/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
similarity index 97%
rename from pc4mobx/hrmSalary/pages/salaryItemManagement/index.js
rename to pc4mobx/hrmSalary/pages/salaryItem/index.js
index 0731422d..7ed75fa2 100644
--- a/pc4mobx/hrmSalary/pages/salaryItemManagement/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -16,7 +16,7 @@ const { MonthPicker } = DatePicker;
 
 @inject('baseTableStore')
 @observer
-export default class SalaryItemManagement extends React.Component {
+export default class SalaryItem extends React.Component {
   constructor(props) {
     super(props);
     this.state = {