custom-艾志工业-合并个税

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js

@@ -271,9 +271,10 @@ class Index extends Component {
 
   render() {
     const {
-      taxAgentStore: { statisticsReportBtn, PageAndOptAuth, showOperateBtn },
+      taxAgentStore: { statisticsReportBtn, PageAndOptAuth },
       attendanceStore: { statisticsForm, reportForm, tableStore }
     } = this.props;
+    const { isOpenDevolution, isChief } = PageAndOptAuth;
     const {
       selectedKey, modalReq, slideReq, conditions, reportConditions,
       reportName, keyword, year, logDialogVisible, filterConditions,
@@ -327,7 +328,7 @@ class Index extends Component {
       { key: "salaryDetail", title: getLabel(111, "薪资明细") }
     ];
     dropMenuDatas = selectedKey === "salaryDetail" ? dropMenuDatas.slice(-1) : dropMenuDatas.slice(0, 1);
-    !showOperateBtn && dropMenuDatas.shift();
+    isOpenDevolution && !isChief && dropMenuDatas.shift();
     return (
       <WeaReqTop
         title={getLabel(111, "薪酬统计报表")} icon={<i className="icon-coms-fa"/>} selectedKey={selectedKey}

pc4mobx/hrmSalary/pages/calculate/calcView/index.js

@@ -74,7 +74,7 @@ class Index extends Component {
       <Dropdown.Button type="primary" style={{ marginRight: "10px" }}
                        onClick={() => this.handleMenuClick({ key: "exportAll" })}
                        overlay={<Menu onClick={(e) => this.handleMenuClick(e)}>
-                         <Menu.Item key="export_selected">{getLabel(543715, "导出所选")}</Menu.Item>
+                         {/*<Menu.Item key="export_selected">{getLabel(543715, "导出所选")}</Menu.Item>*/}
                          <Menu.Item key="export_custom">{getLabel(544270, "自定义导出")}</Menu.Item>
                        </Menu>}>{getLabel(81272, "导出全部")}</Dropdown.Button>,
       <AdvanceInputBtn onOpenAdvanceSearch={() => this.calc.openAdvanceSearch()}
@@ -87,7 +87,9 @@ class Index extends Component {
                 showDropIcon={false} buttons={btns}
         >
           <div className="salary-calculate-view">
-            {showChildren && <SalaryEditCalc {...this.props} calcDetail ref={dom => this.calc = dom}/>}
+            {showChildren &&
+              <SalaryEditCalc {...this.props} taxAgentStore={{ showOperateBtn: false, PageAndOptAuth: {} }} calcDetail
+                              ref={dom => this.calc = dom}/>}
             {/*  薪资核算-自定义导出*/}
             <CustomCalcExportDialog
               {...customExpDialog}

pc4mobx/hrmSalary/pages/calculate/doCalc/index.js

@@ -221,9 +221,9 @@ class Index extends Component {
     this.setState({ loading: { ...this.state.loading, az: true } });
     API.AZ[type](payload).then(({ status, errormsg }) => {
       this.setState({ loading: { ...this.state.loading, az: false } });
+      this.calc.onAdSearch(false);
       if (status) {
         message.success(getLabel(111, "操作成功！"));
-        this.calc.onAdSearch(false);
       } else {
         message.error(errormsg);
       }