release/2.19.1.2501.01-个税

pc4mobx/hrmSalary/index.js

@@ -6,7 +6,6 @@ import SalaryAdjustmentRecords from "./pages/salaryAdjustmentRecords";
 import MySalaryMobile from "./pages/mySalaryMobile";
 import MySalary from "./pages/mySalaryBenefits";
 import Programme from "./pages/socialSecurityBenefits/welfarePlan";
-// import Archivess from "./pages/socialSecurityBenefits/archives";
 import Archives from "./pages/socialSecurityBenefits/welfareArchive"; //社保福利档案重构页面
 import StandingBook from "./pages/socialSecurityBenefits/standingBook/standingBook"; //社保福利台账重构页面
 import StandingBookDetail from "./pages/socialSecurityBenefits/standingBookDetail";
@@ -19,20 +18,16 @@ import CumSituation from "./pages/dataAcquisition/cumSituation";
 import Attendance from "./pages/dataAcquisition/attendance";
 import SpecialAddDeduction from "./pages/dataAcquisition/specialAddDeduction";
 import Ledger from "./pages/ledgerPage";
-// import Calculate from "./pages/calculate";
 import Calculate from "./pages/calculate/calculate"; //重构的薪资核算页面
-// import Payroll from "./pages/payroll";
 import Payroll from "./pages/payrollRelease"; //重构的工资单发放页面
 import PayrollGrant from "./pages/payroll/payrollGrant";
 import PayrollDetail from "./pages/payroll/payrollDetail/payrollDetail";
-// import Declare from "./pages/declare";
 import DeclareDetail from "./pages/declareDetail";
 import DeclareOnlineComparison from "./pages/declareOnlineComparison";
 import Employeedeclare from "./pages/employeedeclare";
 import EnterprisePayCertificationDetail from "./pages/enterprisePayCertificationDetail";
 import BankVoucherDetail from "./pages/bankVoucherDetail";
 import EmployeedeclareDetail from "./pages/employeedeclareDetail";
-// import Declare from "./pages/declare";
 import Declare from "./pages/declare/declare"; //重构的个税申报表
 import TaxRate from "./pages/taxRate";
 import TaxAgents from "./pages/taxAgent";
@@ -117,14 +112,9 @@ const Routes = (
     <Route key="employeedeclare" path="employeedeclare" component={Employeedeclare}/>
     <Route key="enterprisePayCertificationDetail" path="enterprisePayCertificationDetail"
            component={EnterprisePayCertificationDetail}/>
-    <Route key="bankVoucherDetail" path="bankVoucherDetail"
+    <Route key="bankVoucherDetail" path="bankVoucherDetail" component={BankVoucherDetail}/>
-           component={BankVoucherDetail}/>
     <Route key="employeedeclareDetail" path="employeedeclareDetail" component={EmployeedeclareDetail}/>
-    <Route
+    <Route key="generateDeclarationDetail" path="generateDeclarationDetail" component={GenerateDeclarationDetail}/>
-      key="generateDeclarationDetail"
-      path="generateDeclarationDetail"
-      component={GenerateDeclarationDetail}
-    />
     <Route key="taxRate" path="taxRate" component={TaxRate}/>
     <Route key="taxAgent" path="taxAgent" component={TaxAgent}/>
     <Route key="taxAgents" path="taxAgents" component={TaxAgents}/>

pc4mobx/hrmSalary/pages/employeedeclare/index.js

@@ -94,7 +94,7 @@ class Index extends Component {
                     width: 260,
                     render: (_, record) => (<React.Fragment>
                       <a
-                        href={`${window.ecologyContentPath || ""}/spa/hrmSalary/static/index.html#/main/hrmSalary/employeedeclareDetail?id=${record.id}&taxName=${record.taxAgentName}`}
+                        href={`${window.ecologyContentPath || ""}/spa/hrmSalary/static/index.html#/main/hrmSalary/employeedeclareDetail?id=${record.id}&taxName=${encodeURIComponent(record.taxAgentName)}`}
                         target="_blank">{getLabel(83110, "查看详情")}</a>
                       <Dropdown overlay={
                         <Menu>

pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js

@@ -454,6 +454,7 @@ class Index extends Component {
         {/*<Menu.Item key="2">{getLabel(111, "批量编辑")}</Menu.Item>*/}
         {/*<Menu.Item key="3">{getLabel(81272, "导出全部")}</Menu.Item>*/}
         {/*<Menu.Item key="4">{getLabel(543715, "导出所选")}</Menu.Item>*/}
+        <Menu.Item key="5">{getLabel(111, "扣除名单确认")}</Menu.Item>
       </Menu>
     );
     const buttons = [