From f29d985e643ae69c0514aaf94531154597504dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 15 Sep 2023 16:53:17 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editCalcAdvanceSearchPannel.js            |  2 +-
 .../salaryEditCalc/editCalcTable.js           |  9 ++++++---
 .../doCalc/components/salaryEditCalc/index.js | 19 ++++++++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
index 392a42d1..c2dafe8b 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
@@ -61,7 +61,7 @@ class EditCalcAdvanceSearchPannel extends Component {
         {getSearchs(ECSearchForm, searchConditions, 2, false)}
         <div className="wea-search-buttons">
           <div style={{ textAlign: "center" }}>
-            <span style={{ marginLeft: 15 }}><Button type="primary">{getLabel(388113, "搜索")}</Button></span>
+            <span style={{ marginLeft: 15 }}><Button type="primary" onClick={this.props.onAdSearch}>{getLabel(388113, "搜索")}</Button></span>
             <span style={{ marginLeft: 15 }}><Button type="ghost"
                                                      onClick={() => ECSearchForm.resetForm()}>{getLabel(2022, "重置")}</Button></span>
             <span style={{ marginLeft: 15 }}><Button type="ghost"
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 00d33cd1..33531c55 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -41,6 +41,10 @@ class EditCalcTable extends Component {
           const { selectedRowKeys } = params;
           this.setState({ selectedRowKeys });
           break;
+        case "FORMULA":
+          const { dataIndex } = params;
+          this.props.onShowFormulaTd(dataIndex);
+          break;
         default:
           break;
       }
@@ -74,7 +78,6 @@ class EditCalcTable extends Component {
         const { list: dataSource, pageNum: current, pageSize, total } = list;
         this.setState({ pageInfo: { ...pageInfo, current, pageSize, total } }, () => {
           const { pageInfo, selectedRowKeys } = this.state;
-          console.log(selectedRowKeys);
           this.postMessageToChild({
             dataSource, pageInfo, selectedRowKeys,
             columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false }))
@@ -107,13 +110,13 @@ const traverse = (arr) => {
   return _.map(arr, item => {
     if (!_.isEmpty(item.children)) {
       return {
-        title: item.text, width: item.width + "px",
+        title: item.text, width: item.width + "px", ellipsis: true,
         dataIndex: item.column, children: traverse(item.children)
       };
     } else {
       return {
         title: item.text, width: item.width + "px",
-        dataIndex: item.column
+        dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus
       };
     }
   });
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index 0a2bda6e..3d7e518c 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -19,7 +19,8 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      salarySobCycle: {}, showSearchAd: false
+      salarySobCycle: {}, showSearchAd: false,
+      columnDesc: {}, formulaTd: ""
     };
   }
 
@@ -28,18 +29,25 @@ class Index extends Component {
   }
 
   openAdvanceSearch = () => this.setState({ showSearchAd: !this.state.showSearchAd });
+  onAdSearch = () => {
+    this.calcTableRef.wrappedInstance.queryCalcResultList();
+    this.openAdvanceSearch();
+  };
   init = async () => {
     const { routeParams: { salaryAcctRecordId } } = this.props;
     const [salarySobCycle, columnDesc] = await Promise.all([getSalarySobCycle({ salaryAcctRecordId }), getColumnDesc({ salaryAcctRecordId })]);
     if (salarySobCycle.status && columnDesc.status) {
       this.setState({
-        salarySobCycle: salarySobCycle.data
+        salarySobCycle: salarySobCycle.data,
+        columnDesc: columnDesc.data
       });
     }
   };
+  handleShowFormulaTa = (dataIndex) => this.setState({ formulaTd: dataIndex });
 
   render() {
-    const { salarySobCycle, showSearchAd } = this.state;
+    const { salarySobCycle, showSearchAd, formulaTd, columnDesc } = this.state;
+    const formulaObj = _.get(columnDesc, [formulaTd]) || {};
     return (
       <div className="salary-edit-calc-content">
         <div className="salary-flex-between weapp-salary-tb-tip">
@@ -57,16 +65,17 @@ class Index extends Component {
         <div className="salary-flex-between formula-detail-area">
           <div className="formula-detail">
             <span>{getLabel(18125, "公式")}=</span>
-            <span></span>
+            <span>{formulaObj.formulaContent}</span>
           </div>
           <div></div>
         </div>
         <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
           <EditCalcAdvanceSearchPannel
             onToggleSwitch={this.openAdvanceSearch}
+            onAdSearch={this.onAdSearch}
           />
         </div>
-        <EditCalcTable {...this.props}/>
+        <EditCalcTable ref={dom => this.calcTableRef = dom} {...this.props} onShowFormulaTd={this.handleShowFormulaTa}/>
       </div>
     );
   }