Merge branch 'feature/V2-非系统人员管理开发' into develop

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js

@@ -24,6 +24,7 @@ import {
 import ImportModal from "../../../components/importModal";
 import { importEmployColumns } from "../../taxAgent/columns";
 import ExternalPersonModal from "../../../components/externalPersonModal";
+import { sysinfo } from "../../../apis/ruleconfig";
 
 const APIFox = {
   listInclude: getLedgerPersonRangeInclude,
@@ -55,10 +56,26 @@ class LedgerAssociatedPersonnel extends Component {
         visible: false,
         title: "关联人员",
         includeType: ""
-      }
+      },
+      extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
     };
   }
 
+  componentDidMount() {
+    this.getSysinfo();
+  }
+
+  /*
+    * Author: 黎永顺
+    * Description: 非系统人员开关查询
+    * Params:
+    * Date: 2023/7/14
+    */
+  getSysinfo = () => {
+    sysinfo().then(({ status, data }) => {
+      if (status) this.setState({ extEmpsWitch: data.extEmpsWitch });
+    });
+  };
   /*
    * Author: 黎永顺
    * Description:外部人员保存
@@ -202,7 +219,7 @@ class LedgerAssociatedPersonnel extends Component {
       importParams,
       previewDataSource,
       externalPersonModalVisible,
-      loading
+      loading, extEmpsWitch
     } = this.state;
     const { taxAgentStore: { showOperateBtn }, editId, saveSalarySobId } = this.props;
     const topTab = [
@@ -257,7 +274,7 @@ class LedgerAssociatedPersonnel extends Component {
     return (
       <div>
         <WeaTab
-          datas={topTab}
+          datas={extEmpsWitch === "0" ? _.dropRight(topTab) : topTab}
           keyParam="viewcondition" //主键
           selectedKey={selectedKey}
           buttons={showOperateBtn && selectedKey === "listInclude" ? btns : btns.slice(1)}

pc4mobx/hrmSalary/pages/payrollFiles/index.js

@@ -31,6 +31,7 @@ import BatchSuspendsPay from "./components/batchSuspendsPay";
 import SlideModalTitle from "../../components/slideModalTitle";
 import SalaryFileViewSlide from "../salaryFile/saralyFileViewSlide";
 import ChangeSalaryModal from "../salaryFile/changeSalaryModal";
+import { sysinfo } from "../../apis/ruleconfig";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -86,7 +87,8 @@ class Index extends Component {
         payStartDate: "",
         payEndDate: ""
       },
-      salaryArchiveDelete: "" //待定薪、停薪员工 是否允许删除薪资档案 0： 否， 1： 是
+      salaryArchiveDelete: "", //待定薪、停薪员工 是否允许删除薪资档案 0： 否， 1： 是，
+      extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
     };
   }
 
@@ -155,6 +157,7 @@ class Index extends Component {
     getTaxAgentSelectListAsAdmin();
     this.queryTabTotal();
     this.queryList("/api/bs/hrmsalary/salaryArchive/pendingList");
+    this.getSysinfo();
     const init = this.init();
     window.addEventListener("message", this.handleReceive, false);
   }
@@ -163,6 +166,18 @@ class Index extends Component {
     window.removeEventListener("message", this.handleReceive, false);
   }
 
+  /*
+   * Author: 黎永顺
+   * Description: 非系统人员开关查询
+   * Params:
+   * Date: 2023/7/14
+   */
+  getSysinfo = () => {
+    sysinfo().then(({ status, data }) => {
+      if (status) this.setState({ extEmpsWitch: data.extEmpsWitch });
+    });
+  };
+
   handleReceive = ({ data }) => {
     const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props;
     const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({
@@ -703,7 +718,8 @@ class Index extends Component {
       showSearchAd,
       slideParams,
       changeSalaryVisible,
-      paysetParams
+      paysetParams,
+      extEmpsWitch
     } = this.state;
     const { payrollFilesStore: { tableStore } } = this.props;
     const renderSearch = () => {
@@ -762,7 +778,7 @@ class Index extends Component {
           dropMenuDatas={rightMenu}
         >
           <WeaTab
-            datas={tabCondition}
+            datas={extEmpsWitch === "0" ? _.dropRight(tabCondition) : tabCondition}
             counts={tabCount}
             className="payrollFilesTab"
             keyParam="viewcondition" //主键

pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js

@@ -4,6 +4,7 @@ import { WeaButtonIcon, WeaFormItem, WeaInput, WeaSearchGroup, WeaTab, WeaTable
 import AddTaxAgentModal from "./addTaxAgentModal";
 import ImportModal from "../../components/importModal";
 import { taxAgentRangeImportData, taxAgentRangePreview } from "../../apis/taxAgent";
+import { sysinfo } from "../../apis/ruleconfig";
 import { importEmployColumns } from "./columns";
 import ExternalPersonModal from "../../components/externalPersonModal";
 
@@ -23,22 +24,26 @@ export default class SlideTaxagentUser extends React.Component {
         visible: false,
         step: 0,
         importResult: {}
-      }
+      },
+      extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
     };
   }
-
-  handleTabClick(includeType) {
-    const { onChangeTab } = this.props;
-    this.setState(
-      {
-        includeType
-      },
-      () => {
-        onChangeTab && onChangeTab(includeType);
-      }
-    );
+  componentDidMount() {
+    this.getSysinfo();
   }
 
+  /*
+    * Author: 黎永顺
+    * Description: 非系统人员开关查询
+    * Params:
+    * Date: 2023/7/14
+    */
+  getSysinfo = () => {
+    sysinfo().then(({ status, data }) => {
+      if (status) this.setState({ extEmpsWitch: data.extEmpsWitch });
+    });
+  };
+
   onSelectChange = selectedRowKeys => {
     this.setState({ selectedRowKeys });
   };
@@ -125,7 +130,7 @@ export default class SlideTaxagentUser extends React.Component {
       externalPersonModalVisible,
       importParams,
       previewDataSource,
-      showSearchAd
+      showSearchAd, extEmpsWitch
     } = this.state;
     const {
       submitLoading,
@@ -193,11 +198,18 @@ export default class SlideTaxagentUser extends React.Component {
     return (
       <div className="slideRefereUser">
         <WeaTab
-          datas={[
-            { title: "人员范围", viewcondition: "1" },
-            { title: "从范围中排除", viewcondition: "0" },
-            { title: "非系统人员范围", viewcondition: "2" }
-          ]}
+          datas={
+            extEmpsWitch === "0" ?
+              [
+                { title: "人员范围", viewcondition: "1" },
+                { title: "从范围中排除", viewcondition: "0" },
+              ] :
+              [
+                { title: "人员范围", viewcondition: "1" },
+                { title: "从范围中排除", viewcondition: "0" },
+                { title: "非系统人员范围", viewcondition: "2" }
+              ]
+          }
           keyParam="viewcondition" selectedKey={includeType}
           searchType={["base"]} advanceHeight={200}
           showSearchAd={showSearchAd} searchsAd={this.getSearchs()}