From 26071cccb101c9130aaa6f75f79ce2885964bf7c Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Tue, 25 Jun 2024 13:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/FM/UserEditPage.js | 28 -------------------
 .../CustomPages/HM/HM042ShowPrint.js          |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/components/CustomPages/FM/UserEditPage.js b/src/components/CustomPages/FM/UserEditPage.js
index 2b038ee..00ef5b3 100644
--- a/src/components/CustomPages/FM/UserEditPage.js
+++ b/src/components/CustomPages/FM/UserEditPage.js
@@ -772,34 +772,6 @@ class UserEditPage extends React.Component {
 
                 </Form.Item>
               </Col> */}
-              {/* style={{display:this.props.login.user?.NAME.indexOf("管理员") === -1 ?"none":"block"}} */}
-               <Col span={8}>
-                <Form.Item
-                  label={'生产单元'}
-                  {...formItemLayout}
-                >
-                {/* <CheckboxGroup options={this.props.app.enums.FMProductionUnit.options} value={this.state.data.MineType} onChange={onUnitChange} /> */}
-                <MultiSelectPagination api={'FM/Enum/GetEnumsByCode'}
-                    data={
-                      {
-                        navField: 'ID,VALUE,NAME',
-                        saveField: 'ENUMS_ID,Nav_Enums.VALUE,Nav_Enums.NAME',
-                        labelField: "Nav_Enums.NAME",
-                        showField: "NAME",
-                        filterField: "NAME",
-                        idField: "USER_ID",
-                        selectLabelField: "NAME",//不配置则默认取labelField，如果labelField也不配置，默认取NAME字段
-                      }
-                    }
-                    colConfig={{ field: "Nav_ProdutionUnit" }}
-                    record={this.state.data} onChange={onSelectProduction} onFilter={({ params }) => {
-                      // extendRule(params, 'CODE', 1, 'BSMineTypeEnum');
-                      params.OrderType = 1
-                      params.OrgId = this.state.data ? this.state.data.ORG_ID : this.props.login.OrgId
-                      // params.Parameter1='BSMineTypeEnum'
-                    }} />
-                </Form.Item>
-              </Col>
                   
               <Col span={12}>
                 <Form.Item
diff --git a/src/components/CustomPages/HM/HM042ShowPrint.js b/src/components/CustomPages/HM/HM042ShowPrint.js
index 9beceb8..01ee68f 100644
--- a/src/components/CustomPages/HM/HM042ShowPrint.js
+++ b/src/components/CustomPages/HM/HM042ShowPrint.js
@@ -128,7 +128,7 @@ class HM042ShowPrint extends React.Component {
                             onComplete: (result) => {
                                 if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
                                     this.setState({ isAudit: 'none' })
-                                } else if (ret.STATUS == 2 && this.props.data.TaskID != null && ret.DEPUTY_GROUP_LEADER_OPINION == 0 && ret.GROUP_LEADER_OPINION == 0){
+                                } else if (ret.STATUS == 4 && this.props.data.TaskID != null && ret.DEPUTY_GROUP_LEADER_OPINION == 0 && ret.GROUP_LEADER_OPINION == 0){
                                     this.setState({ isAudit: 'inline' })
                                 }
                             }