From d8bad175140d901db490896ca29908f7dac1fe08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 6 May 2024 09:48:04 +0800
Subject: [PATCH] hotfix/2.12.1.2404.02

---
 .../pages/dataAcquisition/cumDeduct/index.js  | 32 +++++++++++--------
 .../pages/dataAcquisition/index.less          |  4 +++
 .../hrmSalary/pages/dataAcquisition/layout.js | 16 ----------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 7fca9256..6c7721ab 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -83,17 +83,18 @@ class Index extends Component {
    * Date: 2023/2/17
    */
   autoAddAll = () => {
-    const { declareMonth } = this.state;
+    const { declareMonth, taxAgentId } = this.state;
     this.setState({ addAllLoading: true });
-    autoAddAll({ yearMonth: declareMonth }).then(({ status, data, errormsg }) => {
-      this.setState({ addAllLoading: false });
-      if (status) {
-        message.success(data || "操作成功");
-        this.tableRef.getTableDate();
-      } else {
-        message.error(errormsg || "操作失败");
-      }
-    }).catch(() => this.setState({ addAllLoading: false }));
+    autoAddAll({ yearMonth: declareMonth, taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] })
+      .then(({ status, data, errormsg }) => {
+        this.setState({ addAllLoading: false });
+        if (status) {
+          message.success(data || "操作成功");
+          this.tableRef.getTableDate();
+        } else {
+          message.error(errormsg || "操作失败");
+        }
+      }).catch(() => this.setState({ addAllLoading: false }));
   };
   /*
    * Author: 黎永顺
@@ -363,7 +364,7 @@ class Index extends Component {
           value: taxAgentId,
           onChange: this.screenChange,
           options: [{ key: "", showname: "全部" }, ...taxAgentOption],
-          key: "taxAgentId"
+          key: "taxAgentId", multiple: true
         })
       }
     ];
@@ -500,7 +501,7 @@ class Index extends Component {
       declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition,
       importPayload, exportPayloadType, targetid
     } = this.state;
-    const tablePayload = { declareMonth: [declareMonth], taxAgentId };
+    const tablePayload = { declareMonth: [declareMonth], taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] };
     return (
       <Layout title="累计专项附加扣除" btns={this.getTopBtns()} leftComp={this.getScreen()}
               onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload}
@@ -543,10 +544,13 @@ export const DataCollectionDatePicker = (props) => {
   </WeaFormItem>;
 };
 export const DataCollectionSelect = (props) => {
-  const { value, label, onChange, options, key, labelCol = 10, wrapperCol = 14, viewAttr = 2 } = props;
+  const {
+    value, label, onChange, options, key, labelCol = 10,
+    wrapperCol = 14, viewAttr = 2, multiple = false
+  } = props;
   return <WeaFormItem label={label} labelCol={{ span: labelCol }} wrapperCol={{ span: wrapperCol }}>
     <WeaSelect value={value} onChange={(val) => onChange({ key, value: val })} options={options}
-               viewAttr={viewAttr}/>
+               viewAttr={viewAttr} multiple={multiple}/>
   </WeaFormItem>;
 };
 
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index a580739f..f5272aed 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -81,6 +81,10 @@
     .wea-helpful-tip {
       padding-left: 10px;
     }
+
+    .wea-form-item-wrapper {
+      display: inline-block !important;
+    }
   }
 
   .screenSituationWrapper {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index 0c42281c..9337f5f9 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -118,22 +118,6 @@ class Layout extends Component {
             importOpts={importOpts} importResult={importResult} templateLink={templateLink}
             previewUrl={previewUrl} onImportFile={onImportFile}
           />
-          {/*<ImportModal*/}
-          {/*  needimportSelected //下载模板需要带上导入所选项*/}
-          {/*  columns={columns}*/}
-          {/*  params={importOpts}*/}
-          {/*  step={step}*/}
-          {/*  setStep={onImportSetStep}*/}
-          {/*  importResult={importResult}*/}
-          {/*  onFinish={() => onCancel(true)}*/}
-          {/*  slideDataSource={slideDataSource}*/}
-          {/*  previewImport={onPreviewImport}*/}
-          {/*  importFile={onImportFile}*/}
-          {/*  templateLink={templateLink}*/}
-          {/*  renderFormComponent={() => importFormComponent}*/}
-          {/*  visiable={importVisiable}*/}
-          {/*  onCancel={onCancel}*/}
-          {/*/>*/}
           {/* 新增-编辑-详情弹框 */}
           <WeaSlideModal
             className="slideOuterWrapper"