From 8619773213b648e86bd29ef3321053190e4b1d04 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 24 Mar 2022 10:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   | 149 ++----------------
 .../src/components/libraryAddForm/index.vue   |   2 +-
 jero-web/src/components/libraryPush/index.vue |  11 +-
 3 files changed, 23 insertions(+), 139 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index b2b4c52ae..246498a26 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -37,148 +37,14 @@
 </template>
 
 <script>
+  import { getAction, postAction } from '@/api/manage'
   export default {
     name: 'index',
     props: ['query', 'value'],
     data(){
       return{
         loading:true,
-        gData:[
-          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },          {
-            title: 'parent 1',
-            key: '0-0',
-            children: [
-              {
-                title: '张晨成',
-                key: '0-0-0',
-                disabled: true,
-                children: [
-                  { title: 'leaf', key: '0-0-0-0' },
-                  { title: 'leaf', key: '0-0-0-1' },
-                ],
-              },
-              {
-                title: 'parent 1-1',
-                key: '0-0-1',
-                children: [{ key: '0-0-1-0', title: 'zcvc' }],
-              },
-            ],
-          },
-        ],
+        gData:[],
         autoExpandParent: true,
         expandedKeys:[],
         visible: false,
@@ -210,6 +76,17 @@
       onChange(){
 
       },
+      queryDepartUserTreeList() {
+        this.confirmLoading = true
+        getAction('sys/user/queryDepartUserTreeList', { departId: this.departId }).then((res) => {
+          this.confirmLoading = false
+          if (res.success) {
+            this.gData = res.result
+          } else {
+            this.gData = []
+          }
+        })
+      },
     },
   }
 </script>
diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue
index 88811c83c..fbf2646e5 100644
--- a/jero-web/src/components/libraryAddForm/index.vue
+++ b/jero-web/src/components/libraryAddForm/index.vue
@@ -139,7 +139,7 @@
                 </div>
               </a-col>
 
-              <a-col :span="24" v-else-if="item.field_show_type === '9'">
+              <a-col :span="24" v-else-if="item.field_show_type === '9' || item.field_show_type == 'sel_user'">
                 <div class="box-title-text">
                   <div class="title-text">
                     <span class="Required" v-if="item.field_must_input == 1">*</span>
diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue
index ede6f8549..325eb4dd1 100644
--- a/jero-web/src/components/libraryPush/index.vue
+++ b/jero-web/src/components/libraryPush/index.vue
@@ -58,7 +58,7 @@
       }
     },
     mounted() {
-      this.queryDepartUserTreeList()
+
     },
     methods: {
       getPush(data) {
@@ -108,7 +108,14 @@
       },
       queryDepartUserTreeList() {
         this.confirmLoading = true
-        getAction('sys/user/queryDepartUserTreeList', { departId: this.departId }).then((res) => {
+        let gData = JSON.parse(JSON.stringify(this.gData))
+        if (gData && gData.length > 0) {
+          gData = JSON.stringify(gData)
+        }
+        postAction('sys/user/queryDepartUserTreeList', {
+          departId: this.departId,
+          json: gData
+        }).then((res) => {
           this.confirmLoading = false
           if (res.success) {
             this.gData = res.result