From ef9f8478a726b54f52e9d7f288d6411b1134c9f8 Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Thu, 1 Sep 2022 17:52:00 +0800
Subject: [PATCH] =?UTF-8?q?bug=E7=9A=84=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/calculateDetail/index.js     |  8 +++++---
 pc4mobx/hrmSalary/pages/salaryFile/index.js          | 12 +++++++-----
 .../programme/defaultSlideForm.js                    |  5 +++++
 pc4mobx/hrmSalary/stores/salaryFile.js               |  5 +++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
index 7bcad934..cbe8bab7 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -19,6 +19,7 @@ export default class CalculateDetail extends React.Component {
         employeeName: "",
         departmentIds: "",
         positionIds: "",
+        subcompanyIds: "",
         status: "",
         consolidatedTaxation: "0"
       },
@@ -61,7 +62,7 @@ export default class CalculateDetail extends React.Component {
     );
   };
   Browser = (value, key) => {
-    const { positionIds, departmentIds } = this.state.searchItemsValue;
+    const { positionIds, departmentIds, subcompanyIds } = this.state.searchItemsValue;
     return (
       <WeaFormItem
         label={value}
@@ -70,7 +71,7 @@ export default class CalculateDetail extends React.Component {
       >
         <WeaBrowser
           isSingle={false}
-          value={key === "departmentIds" ? departmentIds : positionIds}
+          value={key === "departmentIds" ? departmentIds : key === "subcompanyIds" ? subcompanyIds : positionIds}
           tabs={key === "departmentIds" ? [
             {
               dataParams: { list: "1" },
@@ -81,7 +82,7 @@ export default class CalculateDetail extends React.Component {
               showOrder: 0
             }
           ] : null}
-          type={key === "departmentIds" ? 57 : 278}
+          type={key === "departmentIds" ? 57 : key === "subcompanyIds" ? 164 : 278}
           onChange={(val) => {
             this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } });
           }}/>
@@ -296,6 +297,7 @@ export default class CalculateDetail extends React.Component {
     const renderSearch = () => {
       const searchItems = [
         { com: this.Input("姓名", "employeeName") },
+        { com: this.Browser("分部", "subcompanyIds") },
         { com: this.Browser("部门", "departmentIds") },
         { com: this.Browser("岗位", "positionIds") },
         { com: this.Select("状态", "status") },
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js
index 4dab4e91..047b398d 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js
@@ -54,8 +54,9 @@ export default class SalaryFile extends React.Component {
         departmentIds: "",
         positionIds: "",
         userstatus: "",
-        archiveStatus: "",
-        taxAgentId: ""
+        archiveStatus: "EFFICIENT",
+        taxAgentId: "",
+        subcompanyIds: ""
       }
     };
     this.pageInfo = { current: 1, pageSize: 10 };
@@ -79,7 +80,7 @@ export default class SalaryFile extends React.Component {
     );
   };
   Browser = (value, key) => {
-    const { positionIds, departmentIds } = this.state.searchItemsValue;
+    const { positionIds, departmentIds, subcompanyIds } = this.state.searchItemsValue;
     return (
       <WeaFormItem
         label={value}
@@ -88,7 +89,7 @@ export default class SalaryFile extends React.Component {
       >
         <WeaBrowser
           isSingle={false}
-          value={key === "departmentIds" ? departmentIds : positionIds}
+          value={key === "departmentIds" ? departmentIds : key === "subcompanyIds" ? subcompanyIds : positionIds}
           tabs={key === "departmentIds" ? [
             {
               dataParams: null,
@@ -109,7 +110,7 @@ export default class SalaryFile extends React.Component {
               showOrder: 0
             }
           ] : null}
-          type={key === "departmentIds" ? 57 : 278}
+          type={key === "departmentIds" ? 57 : key === "subcompanyIds" ? 164 : 278}
           onChange={(val) => {
             this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } });
           }}/>
@@ -512,6 +513,7 @@ export default class SalaryFile extends React.Component {
     const renderSearch = () => {
       const searchItems = [
         { com: this.Input("姓名", "username") },
+        { com: this.Browser("分部", "subcompanyIds") },
         { com: this.Browser("部门", "departmentIds") },
         { com: this.Browser("岗位", "positionIds") },
         { com: this.Select("人员状态", "userstatus") },
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
index c77d99e5..aca99b5e 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
@@ -85,6 +85,11 @@ export default class DefaultSlideForm extends React.Component {
             selected: false,
             showname: "见分进角"
           },
+          {
+            key: "6",
+            selected: false,
+            showname: "向上取偶"
+          },
         ];
         item.render = (text, record) => {
           return (
diff --git a/pc4mobx/hrmSalary/stores/salaryFile.js b/pc4mobx/hrmSalary/stores/salaryFile.js
index 1031c466..17d4b252 100644
--- a/pc4mobx/hrmSalary/stores/salaryFile.js
+++ b/pc4mobx/hrmSalary/stores/salaryFile.js
@@ -115,11 +115,12 @@ export class salaryFileStore {
   getTableDatas = (params) => {
     this.loading = true;
     const formParams = this.form.getFormParams() || {};
-    const { departmentIds = "", positionIds = "", ...extraParams } = params || {};
+    const { departmentIds = "", positionIds = "", subcompanyIds="", ...extraParams } = params || {};
     params = {
       ...formParams, ...extraParams,
       departmentIds: departmentIds ? departmentIds.split(",") : "",
-      positionIds: positionIds ? positionIds.split(",") : ""
+      positionIds: positionIds ? positionIds.split(",") : "",
+      subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : "",
     };
     API.getArchiveList(params).then(action(res => {
       if (res.status) { // 接口请求成功/失败处理