From 54352aad95493809fdd0ba30a8e15feab703a3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 13 Aug 2024 17:58:28 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E6=B5=AE=E5=8A=A8?=
 =?UTF-8?q?=E8=96=AA=E9=85=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/salaryFileList/index.js        | 11 +++++------
 .../hrmSalary/pages/variableSalary/index.js   | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
index ba166f77..f3b0e52a 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
@@ -8,6 +8,7 @@
   * @description:
 */
 import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider } from "ecCom";
 import { WeaTableNew } from "comsMobx";
 import { message, Modal, Spin } from "antd";
@@ -17,6 +18,8 @@ import { toJS } from "mobx";
 const WeaTableComx = WeaTableNew.WeaTable;
 const getLabel = WeaLocaleProvider.getLabel;
 
+@inject("baseTableStore")
+@observer
 class Index extends Component {
   constructor(props) {
     super(props);
@@ -149,12 +152,8 @@ class Index extends Component {
             />
           </Spin>
         </div>
-        <WeaTableComx
-          style={{ display: "none" }}
-          comsWeaTableStore={SFTableStore}
-          needScroll={true}
-          columns={this.getColumns()}
-        />
+        <WeaTableComx style={{ display: "none" }} comsWeaTableStore={SFTableStore} needScroll={true}
+                      columns={this.getColumns()}/>
       </React.Fragment>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index ad97078c..eb784c1e 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -74,6 +74,11 @@ class Index extends Component {
         const payload = { salaryMonth, taxAgentIds, ...VSalryForm.getFormParams() };
         window.open(`/api/bs/hrmsalary/variableSalary/export?${convertToUrlString(payload)}`, "_blank");
         break;
+      case "custom_cols":
+        const { baseTableStore: { SFTableStore } } = this.props;
+        SFTableStore.setColSetVisible(true);
+        SFTableStore.tableColSet(true);
+        break;
       default:
         break;
     }
@@ -86,10 +91,13 @@ class Index extends Component {
     const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props;
     const tabs = [
       {
-        title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: showOperateBtn,
-        dropMenuDatas: showOperateBtn ? [{
-          key: "export", icon: <i className="icon-coms-export"/>, content: getLabel(111, "导出")
-        }] : [],
+        title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: true,
+        dropMenuDatas: showOperateBtn ? [
+          { key: "export", icon: <i className="icon-coms-export"/>, content: getLabel(111, "导出") },
+          { key: "custom_cols", icon: <i className="icon-coms-Custom"/>, content: getLabel(32535, "显示列定制") }
+        ] : [
+          { key: "custom_cols", icon: <i className="icon-coms-Custom"/>, content: getLabel(32535, "显示列定制") }
+        ],
         buttons: showOperateBtn ? [
           <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
           <Button type="ghost" onClick={() => this.handleOperate("import")}>{getLabel(111, "导入")}</Button>,
@@ -100,7 +108,8 @@ class Index extends Component {
           <AdvanceInputBtn searchType="advance" onOpenAdvanceSearch={() => this.openAdvanceSearch()}
                            onAdvanceSearch={this.handleAdvanceSearch}/>
         ] : [
-          <WeaDatePicker format="YYYY-MM" value={salaryMonth} onChange={val => this.setState({ salaryMonth: val })}/>,
+          <WeaDatePicker format="YYYY-MM" value={salaryMonth}
+                         onChange={val => this.setState({ salaryMonth: val }, () => this.handleAdvanceSearch())}/>,
           <WeaSelect options={taxAgentOption} style={{ width: 200, display: "flex" }} multiple value={taxAgentIds}
                      onChange={val => this.setState({ taxAgentIds: val }, () => this.handleAdvanceSearch())}/>,
           <AdvanceInputBtn searchType="advance" onOpenAdvanceSearch={() => this.openAdvanceSearch()}