From 38802154d39932a8b4cb7a9b153a02c91b75d096 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 26 Apr 2022 15:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   | 35 +++++++++++++++----
 .../components/circulationHistory.vue         |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 1e541beb1..e91185584 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -23,7 +23,7 @@
       @close="handleCancel"
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <a-input-search style="margin-bottom: 8px":placeholder="$t('NodeQuickLookup')"
+      <a-input-search style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')"
                       v-model="searchModel" @search="onSearch"/>
       <div class="drawer-content">
         <a-tree
@@ -68,9 +68,9 @@
         departId: '',
         selectedKey: [],
         userIds: [],
-        searchModel:'',
+        searchModel: '',
         defaultExpandedKeys: [],
-        defaultCheckedKeys: [],
+        defaultCheckedKeys: []
       }
     },
     mounted() {
@@ -167,9 +167,32 @@
           if (res.success) {
             this.gData = res.result
             this.defaultExpandedKeys = [this.departId]
-            this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name + '_id'] ? this.personneQuery[this.query.db_field_name + '_id'].split(',') : []
-            this.selectedKey = this.personneQuery[this.query.db_field_name + '_id'] ? this.personneQuery[this.query.db_field_name + '_id'].split(',') : []
-            console.log(this.defaultCheckedKeys)
+            if (this.personneQuery[this.query.db_field_name + '_id']) {
+              this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name + '_id'].split(',')
+              this.selectedKey = this.personneQuery[this.query.db_field_name + '_id'].split(',')
+            } else if (this.personneQuery[this.query.db_field_name]) {
+              this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name].split(',')
+              this.selectedKey = this.personneQuery[this.query.db_field_name].split(',')
+            } else {
+              this.defaultCheckedKeys = []
+              this.selectedKey = []
+            }
+            if (this.personneQuery[this.query.db_field_name + 'Name']) {
+              this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
+            } else if (this.personneQuery[this.query.db_field_name]) {
+              this.userName = this.personneQuery[this.query.db_field_name].split(',')
+            } else {
+              this.userName = []
+            }
+            if (this.personneQuery[this.query.db_field_name + '_id']) {
+              this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
+            } else if (this.personneQuery[this.query.db_field_name]) {
+              this.userIds = this.personneQuery[this.query.db_field_name].split(',')
+            } else {
+              this.userIds = []
+            }
+            console.log(this.userIds)
+            console.log(this.userName)
             this.treeVisible = true
           } else {
             this.gData = []
diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index b70465423..e855c11ca 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -52,7 +52,7 @@
           },
           {
             title: this.$t('Operator'),
-            dataIndex: 'Operator',
+            dataIndex: 'assignee',
             align: 'center'
           },
           {