From 65e64ba2586b7872500c36896f5be326a9567861 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 30 Sep 2022 21:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/PersonnelSelection/index.vue   | 15 +++++++++++++--
 jero-web/src/views/externalReports/index.vue      |  4 ++--
 .../processForm/handshakeProcess/index.vue        |  1 -
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 3586254e2..a3e26e2bc 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -322,12 +322,23 @@
                     content.push(res)
                   }
                 } else if (res.type == 'Depart') {
+                  if (!this.selectDepartment) {
+                    res.disabled = true
+                  }
                   content.push(res)
                 }
               })
               this.gData = this.toTree(content)
             } else {
-              this.gData = this.toTree(JSON.parse(gData))
+              let content = JSON.parse(gData)
+              if (!this.selectDepartment) {
+                content.forEach(res => {
+                  if (res.type == 'Depart') {
+                    res.disabled = true
+                  }
+                })
+              }
+              this.gData = this.toTree(content)
             }
           }
           this.defaultCheckedKeys = this.userIds
@@ -524,6 +535,6 @@
   }
 
   .treeWrap {
-    height: 600px;
+    height: calc(100vh - 240px);
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 64f59d9b7..8fd7b0010 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -208,7 +208,7 @@
                         <a-form-model-item class="itemModel" prop="authManageIdsName">
                           <PersonnelSelection class="box-input add-input"
                                               :personneQuery="form"
-                                              selectDepartment
+                                              :selectDepartment="true"
                                               :query="{db_field_name:'authManageIds',db_field_txt:$t('Administrativeprivileges')}"
                                               @change="PersonnelSelectionChange"
                                               v-model="form.authManageIdsName"/>
@@ -226,7 +226,7 @@
                         <a-form-model-item class="itemModel" prop="authViewIdsName">
                           <PersonnelSelection
                             class="box-input add-input"
-                            selectDepartment
+                            :selectDepartment="true"
                             :personneQuery="form"
                             :query="{db_field_name:'authViewIds',db_field_txt:$t('Checkthepermissions')}"
                             @change="PersonnelSelectionChange"
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 8fa4c4500..c19d1eb3c 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -33,7 +33,6 @@
           :title="titleName"
           :isSendBack="isSendBackOne"
           ref="examineInformationRef"
-          :isSendBack="isSendBackOne"
           :url="url"/>
         <!--        @terminationProcess="terminationProcess"-->
         <footerProcess