From 9518d46dba9103cdfdd1f2e760eeb7daaa7fcd3e 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, 20 Feb 2023 14:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fieldManagement/components/fieldSlide.js  | 28 +++++++++----------
 pc4mobx/hrmSalary/pages/salaryItem/columns.js | 14 +++++-----
 pc4mobx/hrmSalary/pages/salaryItem/options.js |  5 ++++
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 6775e651..1eabfd2e 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -212,20 +212,20 @@ class FieldSlide extends Component {
               <WeaInput viewAttr={3} value={name}
                         onChange={value => this.handleChangeFields("name", value)}/>
             </WeaFormItem>
-            {
-              editId &&
-              <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>
-            }
+            {/*{*/}
+            {/*  editId &&*/}
+            {/*  <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: 12 }}>
               <WeaCheckbox
                 value={useDefault}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
index a23f2db3..2d2bf75d 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
@@ -60,13 +60,13 @@ export const salaryItemFields = [
     viewAttr: 3,
     tip: ''
   },
-  {
-    key: 'useInEmployeeSalary',
-    label: '薪资档案引用',
-    type: 'SWITCH',
-    viewAttr: 2,
-    tip: '提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入'
-  },
+  // {
+  //   key: 'useInEmployeeSalary',
+  //   label: '薪资档案引用',
+  //   type: 'SWITCH',
+  //   viewAttr: 2,
+  //   tip: '提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入'
+  // },
   {
     key: 'useDefault',
     label: '默认使用',
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/options.js b/pc4mobx/hrmSalary/pages/salaryItem/options.js
index 1d7d0521..e80e8b89 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/options.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/options.js
@@ -57,6 +57,11 @@ export const patternOptions = [
         showname: "5",
         selected: false
     },
+    {
+        key: "6",
+        showname: "6",
+        selected: false
+    },
 ]
 
 export const dataTypeOptions = [