From e14ebaacad55b9796426cf105842a77d8b0cde51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 15 Mar 2023 14:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payrollFiles/components/importMenu.js     |  7 ++--
 .../pages/payrollFiles/config/index.js        |  7 ++++
 pc4mobx/hrmSalary/pages/payrollFiles/index.js | 32 ++++++++++++++++---
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js
index 74dd4b0e..90de4d67 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js
@@ -26,7 +26,7 @@ class ImportMenu extends Component {
       params.listType = "FIXED";
     } else {
       params.listType = this.state.importParams.importType;
-      params.importType = '';
+      params.importType = "";
     }
     API.salaryArchivePreview(params).then(({ status, data }) => {
       if (status) {
@@ -92,14 +92,15 @@ class ImportMenu extends Component {
   };
   // 导入档案
   handleImportFile = (params) => {
+    const { isExtEmp = false } = this.props;
     if (this.state.importParams.importType === "init" || this.state.importParams.importType === "salaryItemAdjust") {
       params.importType = this.state.importParams.importType;
       params.listType = "FIXED";
     } else {
-      params.importType = '';
+      params.importType = "";
       params.listType = this.state.importParams.importType;
     }
-    API.importSalaryArchive(params).then(({ status, data }) => {
+    API.importSalaryArchive({ ...params, isExtEmp }).then(({ status, data }) => {
       if (status) {
         data.errorData = data.errorNotice;
         this.setState({
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index 5440dcd5..89fdab3f 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -26,5 +26,12 @@ export const tabCondition = [
     showcount: true,
     title: "停薪员工",
     viewcondition: "stop"
+  },
+  {
+    color: "#000000",
+    groupid: "EXT",
+    showcount: false,
+    title: "非系统人员",
+    viewcondition: "ext"
   }
 ];
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index e52b9e38..1c642e24 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -441,6 +441,27 @@ class Index extends Component {
           }}/></Button>
         </Dropdown>
       ];
+    } else if (selectedKey === "ext" && showOperateBtn) {
+      return [
+        <WeaHelpfulTip
+          width={300}
+          title={<HelpfulDiv/>}
+          placement="topLeft"
+        />,
+        <Dropdown overlay={
+          <ImportMenu
+            isExtEmp importType={importType}
+            refreshList={() => {
+              this.query();
+              this.setState({ selectedRowKeys: [] });
+            }}/>
+        }>
+          <Button type="primary">导入<i className="icon-coms-down2" style={{
+            marginLeft: 8,
+            verticalAlign: "middle"
+          }}/></Button>
+        </Dropdown>
+      ];
     }
     return [];
   };
@@ -486,7 +507,7 @@ class Index extends Component {
                     <i className="icon-coms-more"/>
                   </Popover>
                 </div>;
-              } else if (selectedKey === "fixed") {
+              } else if (selectedKey === "fixed" || selectedKey === "ext") {
                 return <a onClick={() => this.handleEdit(record)}>调薪</a>;
               } else if (selectedKey === "suspend") {
                 return <div className="optWrapper">
@@ -579,7 +600,7 @@ class Index extends Component {
         window.open(`${linkUrl}&salaryArchiveId=${id}`);
       }}>发起调薪</Button>);
     }
-    if (showOperateBtn && selectedKey === "fixed") {
+    if (showOperateBtn && (selectedKey === "fixed" || selectedKey === "ext")) {
       arrList.push(<Button type="primary" onClick={() => {
         this.setState({ changeSalaryVisible: true });
       }}>调薪</Button>);
@@ -624,7 +645,7 @@ class Index extends Component {
         salaryItemId: it.id,
         adjustValue: String(it.value || "")
       })),
-      status: _.upperCase(selectedKey)
+      status: selectedKey === "ext" ? "FIXED" : _.upperCase(selectedKey)
     };
     API.savePaySet(payload).then(({ status, errormsg }) => {
       if (status) {
@@ -657,8 +678,11 @@ class Index extends Component {
       case "suspend":
         this.queryList("/api/bs/hrmsalary/salaryArchive/suspendList");
         break;
+      case "stop":
+        this.queryList("/api/bs/hrmsalary/salaryArchive/suspendList");
+        break;
       default:
-        this.queryList("/api/bs/hrmsalary/salaryArchive/stopList");
+        this.queryList("/api/bs/hrmsalary/salaryArchive/extList");
         break;
     }
   };