From 8416f73376ccbe76316c9f90da1edd51f23990d4 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 19:45:08 +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=E7=B7=A8=E8=BC=AF=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/salaryItem/customSalaryItemSlide.js | 45 ++++++++++---------
 pc4mobx/hrmSalary/stores/salaryItem.js        |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index 2b153731..aa355a5a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -65,26 +65,29 @@ 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>
+          {
+            !isAdd &&
+            <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}>
@@ -159,7 +162,7 @@ export default class CustomSalaryItemSlide extends React.Component {
                 <Col span={8}>字段类型</Col>
                 <Col span={16}>
                   <WeaSelect
-                    disabled={isAdd ? false : true}
+                    disabled={!((editable && this.props.record.canEdit) || isAdd)}
                     value={dataType}
                     viewAttr={3}
                     options={dataTypeOptions}
diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js
index 83c66094..b5436279 100644
--- a/pc4mobx/hrmSalary/stores/salaryItem.js
+++ b/pc4mobx/hrmSalary/stores/salaryItem.js
@@ -257,7 +257,7 @@ export class SalaryItemStore {
       return false;
     }
 
-    if (params.sharedType && !notNull(params.taxAgentIds)) {
+    if (params.sharedType == 1 && !notNull(params.taxAgentIds)) {
       message.warning("可见性范围不能为空");
       return false;
     }