From 6d73b146c49e08253d1aaedc0ae20978d843b267 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, 15 Jul 2024 18:18:57 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.14.5.2406.03-=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/salaryDetailList/index.js      | 28 ++++++++++++++-----
 .../payroll/payrollDetail/payrollDetail.js    |  8 ++----
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
index fc64f6a8..cec8fa94 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
@@ -39,9 +39,7 @@ class Index extends Component {
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.isQuery !== this.props.isQuery) {
-      console.log("componentWillReceiveProps", nextProps.isQuery);
-    }
+    if (nextProps.isQuery !== this.props.isQuery) this.setState({ updateSum: true }, () => this.getPayrollDetailList());
   }
 
   handleReceive = async ({ data }) => {
@@ -50,6 +48,13 @@ class Index extends Component {
       this.getPayrollDetailList();
     } else if (type === "turn") {
       switch (id) {
+        case "PAGEINFO":
+          const { pageNum: current, size: pageSize } = params;
+          this.setState({
+            pageInfo: { ...this.state.pageInfo, current, pageSize },
+            updateSum: false
+          }, () => this.getPayrollDetailList());
+          break;
         default:
           break;
       }
@@ -64,11 +69,13 @@ class Index extends Component {
       departmentIds: form.getFormParams().departmentIds ? form.getFormParams().departmentIds.split(",") : [],
       subCompanyIds: form.getFormParams().subCompanyIds ? form.getFormParams().subCompanyIds.split(",") : []
     };
+    this.setState({ loading: true });
     API.getPayrollDetailList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
       if (status) {
-        const { dataKey, pageInfo, datas: dataSource } = data;
+        const { dataKey, pageInfo: pageResult, datas: dataSource } = data;
         const { datas } = dataKey;
-        const { pageNum: current, pageSize, total } = pageInfo;
+        const { pageNum: current, pageSize, total } = pageResult;
         salaryTableStore.getDatas(datas);
         this.setState({ payload, dataSource, pageInfo: { ...pageInfo, current, pageSize, total } });
       }
@@ -99,6 +106,13 @@ class Index extends Component {
     const childFrameObj = document.getElementById("atdTable");
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
+  handleSetCustomCols = () => {
+    const { payrollStore: { salaryTableStore } } = this.props;
+    this.setState({ updateSum: true }, () => {
+      salaryTableStore.setColSetVisible(true);
+      salaryTableStore.tableColSet(true);
+    });
+  };
 
 
   render() {
@@ -108,9 +122,9 @@ class Index extends Component {
     const columnNum = total > 10 ? pageSize + 1 : total + 1;
     return (
       <div style={{
-        height: `calc((39px * ${columnNum + 2}) + 92px)`,
+        height: `calc((39px * ${columnNum}) + 126.84px)`,
         maxHeight: "678px",
-        minHeight: "342px"
+        minHeight: "270px"
       }}>
         <Spin spinning={loading}>
           <iframe
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
index 99c7fbb8..d54798c1 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
@@ -33,6 +33,7 @@ class PayrollDetail extends Component {
       salarySendDetailBaseInfo: {}, showSearchAd: false, isQuery: false, conditions: [],
       showTotalCell: false
     };
+    this.listRef = null;
   }
 
   async componentDidMount() {
@@ -57,10 +58,7 @@ class PayrollDetail extends Component {
         key: "BTN_COLUMN",
         icon: <i className="icon-coms-Custom"/>,
         content: getLabel(111, "显示列定制"),
-        onClick: () => {
-          salaryTableStore.setColSetVisible(true);
-          salaryTableStore.tableColSet(true);
-        }
+        onClick: () => this.listRef.wrappedInstance.handleSetCustomCols()
       }
     ];
     const btns = [
@@ -96,7 +94,7 @@ class PayrollDetail extends Component {
                                       conditions={conditions}/>
           </div>
           {/*列表*/}
-          <SalaryDetailList isQuery={isQuery} showTotalCell={showTotalCell}/>
+          <SalaryDetailList isQuery={isQuery} showTotalCell={showTotalCell} ref={dom => this.listRef = dom}/>
         </div>
       </WeaTop>
     );