From 010c3c9c964eb132a8087a84295eed23b2e92f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 9 Feb 2023 09:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=92=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E6=94=BE=E5=BC=80=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fieldManagement/components/fieldSlide.js  | 18 ++++++++-
 .../pages/salaryItem/customSalaryItemSlide.js | 40 +++++++++----------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 426e929b..50813d7c 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -21,7 +21,8 @@ class FieldSlide extends Component {
     this.state = {
       loading: false,
       name: "",
-      useDefault: "",
+      useInEmployeeSalary: "0",
+      useDefault: "0",
       sharedType: "",
       shareTypeList: [],
       taxAgentIds: "",
@@ -139,7 +140,8 @@ class FieldSlide extends Component {
   handleReset = () => {
     this.setState({
       name: "",
-      useDefault: "",
+      useDefault: "0",
+      useInEmployeeSalary: "0",
       sharedType: "",
       taxAgentIds: "",
       dataType: "number",
@@ -154,6 +156,7 @@ class FieldSlide extends Component {
     const {
       loading,
       name,
+      useInEmployeeSalary,
       useDefault,
       shareTypeList,
       sharedType,
@@ -189,6 +192,17 @@ class FieldSlide extends Component {
                         style={{ width: "80%" }}
                         onChange={value => this.handleChangeFields("name", value)}/>
             </WeaFormItem>
+            <WeaFormItem label="薪资档案引用" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+              <WeaCheckbox
+                value={useInEmployeeSalary}
+                display="switch"
+                onChange={value => this.handleChangeFields("useInEmployeeSalary", value)}
+              />
+              <WeaHelpfulTip style={{ marginLeft: "10px" }} width={200}
+                             title="提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入"
+                             placement="topLeft"
+              />
+            </WeaFormItem>
             <WeaFormItem label="默认使用" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
               <WeaCheckbox
                 value={useDefault}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index ae577236..2b153731 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -65,26 +65,26 @@ export default class CustomSalaryItemSlide extends React.Component {
               />
             </Col>
           </Row>
-          {/*<Row className="formItem">*/}
-          {/*  <Col span={4}>薪资档案引用</Col>*/}
-          {/*  <Col span={20}>*/}
-          {/*    <Switch*/}
-          {/*      disabled={*/}
-          {/*        !((editable && this.props.record.canEdit) || isAdd)*/}
-          {/*      }*/}
-          {/*      checked={useInEmployeeSalary == 1}*/}
-          {/*      onChange={value => {*/}
-          {/*        this.handleChange({ useInEmployeeSalary: value ? 1 : 0 });*/}
-          {/*      }}*/}
-          {/*    />*/}
-          {/*    <WeaHelpfulTip*/}
-          {/*      style={{ marginLeft: "10px" }}*/}
-          {/*      width={200}*/}
-          {/*      title="提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入"*/}
-          {/*      placement="topLeft"*/}
-          {/*    />*/}
-          {/*  </Col>*/}
-          {/*</Row>*/}
+          <Row className="formItem">
+            <Col span={4}>薪资档案引用</Col>
+            <Col span={20}>
+              <Switch
+                disabled={
+                  !((editable && this.props.record.canEdit) || isAdd)
+                }
+                checked={useInEmployeeSalary == 1}
+                onChange={value => {
+                  this.handleChange({ useInEmployeeSalary: value ? 1 : 0 });
+                }}
+              />
+              <WeaHelpfulTip
+                style={{ marginLeft: "10px" }}
+                width={200}
+                title="提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入"
+                placement="topLeft"
+              />
+            </Col>
+          </Row>
           <Row className="formItem">
             <Col span={4}>默认使用</Col>
             <Col span={20}>