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 (
-
-
- {getLabel(542604, "薪资所属月")}: - {salarySobCycle.salaryMonth} - } - style={{ marginLeft: 10 }} - /> -
-
+
+ + {getLabel(542604, "薪资所属月")}: + {salarySobCycle.salaryMonth} + } + style={{ marginLeft: 10 }} + /> +
]} leftStyle={{ width: "calc(100% - 180px)" }} + type="editable-inline" + onChange={(v) => this.setState({ selectedKey: v })} + />
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;