From 08d4ed70ba9c0abfb52fb721457d927c0baefc2a 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, 5 Jan 2024 10:33:24 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=99=95=E8=A5=BF=E4=B8=87=E4=BC=97-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E8=96=AA=E8=B5=84=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryEditCalc/index.js | 33 ++++++++++---------
 .../components/salaryEditCalc/index.less      |  6 ++++
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index caf11158..b05643f1 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -5,8 +5,7 @@
  * Date: 2023/9/14
  */
 import React, { Component } from "react";
-import { WeaHelpfulTip, WeaLocaleProvider } from "ecCom";
-import { Button } from "antd";
+import { WeaHelpfulTip, WeaLocaleProvider, WeaTab } from "ecCom";
 import { getColumnDesc, getSalarySobCycle } from "../../../../../apis/calculate";
 import { sysConfCodeRule } from "../../../../../apis/ruleconfig";
 import EditCalcAdvanceSearchPannel from "./editCalcAdvanceSearchPannel";
@@ -21,7 +20,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      salarySobCycle: {}, showSearchAd: false,
+      salarySobCycle: {}, showSearchAd: false, selectedKey: "",
       columnDesc: {}, formulaTd: "", showTotalCell: false
     };
   }
@@ -54,22 +53,26 @@ class Index extends Component {
   };
 
   render() {
-    const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell } = this.state;
+    const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell, selectedKey } = this.state;
     const { routeParams: { salaryAcctRecordId } } = this.props;
     const formulaObj = _.get(columnDesc, [formulaTd]) || {};
     return (
       <div className="salary-edit-calc-content">
-        <div className="salary-flex-between weapp-salary-tb-tip">
-          <div>
-            <span>{getLabel(542604, "薪资所属月")}：</span>
-            <span>{salarySobCycle.salaryMonth}</span>
-            <WeaHelpfulTip
-              width={200} placement="topLeft"
-              title={<SalaryMonthTip {...salarySobCycle}/>}
-              style={{ marginLeft: 10 }}
-            />
-          </div>
-          <div></div>
+        <div className="sxwz-tab-edit-wrapper">
+          <WeaTab
+            datas={[]} keyParam="viewcondition" selectedKey={selectedKey} showAddBtn
+            buttons={[<div>
+              <span>{getLabel(542604, "薪资所属月")}：</span>
+              <span>{salarySobCycle.salaryMonth}</span>
+              <WeaHelpfulTip
+                width={200} placement="topLeft"
+                title={<SalaryMonthTip {...salarySobCycle}/>}
+                style={{ marginLeft: 10 }}
+              />
+            </div>]} leftStyle={{ width: "calc(100% - 180px)" }}
+            type="editable-inline"
+            onChange={(v) => this.setState({ selectedKey: v })}
+          />
         </div>
         <div className="salary-flex-between formula-detail-area">
           <div className="formula-detail">
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 77f3e425..ee48ac8a 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -2,6 +2,12 @@
   height: 100%;
   display: flex;
   flex-direction: column;
+  //陕西万众
+  .sxwz-tab-edit-wrapper {
+    .wea-tab .wea-tab-right {
+      background: transparent;
+    }
+  }
 
   .salary-flex-between {
     display: flex;