From 697b799b324be2074deeb1e98adf81bfe78bac01 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 13 Jun 2022 18:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=97=E5=AE=9A=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/salaryFile/index.js   | 26 +++++++++++++++----
 .../socialSecurityBenefits/programme/index.js |  3 ++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js
index aadfa25e..01d1e624 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
+import { WeaTableNew } from "comsMobx";
 
 import {
   Button,
@@ -24,6 +25,8 @@ import {
   WeaHelpfulTip,
 } from "ecCom";
 
+const WeaTableComx = WeaTableNew.WeaTable;
+
 import { renderNoright, getSearchs } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中
 import CustomTab from "../../components/customTab";
 import ContentWrapper from "../../components/contentWrapper";
@@ -231,6 +234,14 @@ export default class SalaryFile extends React.Component {
     });
   }
 
+  showColumn = () => {
+    const { salaryFileStore: { tableStore } } = this.props;
+    console.log("showColumn:", tableStore.setColSetVisible(true));
+    tableStore.setColSetVisible(true);
+    tableStore.tableColSet(true);
+    console.log("showColumn:")
+  }
+
   render() {
     const { salaryFileStore } = this.props;
     const {
@@ -432,10 +443,15 @@ export default class SalaryFile extends React.Component {
             dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能
           >
             <CustomTab 
-                  searchOperationItem={
-                      renderRightOperation()
-                  }
-              />
+              searchOperationItem={
+                  renderRightOperation()
+              }
+            />
+            <WeaTableComx
+              style={{display: "none"}}
+              comsWeaTableStore={tableStore}
+              needScroll={true}
+            />
 
             <CustomPaginationTable
               loading={loading}
@@ -445,7 +461,7 @@ export default class SalaryFile extends React.Component {
               total={pageInfo.total}
               current={pageInfo.pageNum}
               pageSize={this.pageInfo.pageSize}
-              scroll={{x: 2300}}
+              scroll={{x: this.getColumns().length ? this.getColumns().length * 150 : 1200}}
               onPageChange={(value) => {
                 this.handlePageChange(value)
               }}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
index 8f8abd24..b84932c4 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
@@ -425,8 +425,9 @@ export default class Programme extends React.Component {
           measure={'%'}
           title={
             <SlideModalTitle 
-              subtitle={this.state.customEdit ? "修改社保方案": "新增社保方案"}
+              subtitle={this.state.customEdit ? "修改": "新增"}
               subTabs={[{title: "基础设置"}]}
+              editable={true}
               onSave={() => {
                 handleOnSave();
               }}