From 7e52c337c3c22c1f06999667eaa07f59bf9ac3f0 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 24 Aug 2022 17:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/grid/AppGridBlock/components/add.vue | 10 ++++---
 .../grid/AppGridBlock/components/list.vue     | 26 ++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/grid/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue
index 6bd7ea5d..d7bb0b64 100644
--- a/packages/grid/AppGridBlock/components/add.vue
+++ b/packages/grid/AppGridBlock/components/add.vue
@@ -17,10 +17,10 @@
                 <el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="网格长" prop="girdMemberManageList">
-                <ai-user-picker :instance="instance" v-model="forms.girdMemberManageList" :props="{label:'name', id: 'id'}"/>
+                <ai-user-selecter isShowUser :instance="instance" v-model="forms.girdMemberManageList" :props="{label:'name', id: 'id'}"/>
               </el-form-item>
               <el-form-item label="网格员" prop="girdMemberList">
-                <ai-user-picker :instance="instance" v-model="forms.girdMemberList" :props="{label:'name', id: 'id'}"/>
+                <ai-user-selecter isShowUser :instance="instance" v-model="forms.girdMemberList" :props="{label:'name', id: 'id'}"/>
               </el-form-item>
             </template>
           </ai-card>
@@ -185,13 +185,15 @@ export default {
             girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList.map(v => {
               return {
                 ...v,
-                id: v.wxUserId
+                id: v.wxUserId,
+                avatar: v.photo
               }
             }) : [],
             girdMemberList: res.data.girdMemberList ? res.data.girdMemberList.map(v => {
               return {
                 ...v,
-                id: v.wxUserId
+                id: v.wxUserId,
+                avatar: v.photo
               }
             }) : []
           };
diff --git a/packages/grid/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue
index ff999eab..440227c4 100644
--- a/packages/grid/AppGridBlock/components/list.vue
+++ b/packages/grid/AppGridBlock/components/list.vue
@@ -13,7 +13,6 @@
               node-key="id"
               ref="tree"
               :filter-node-method="filterNode"
-              default-expand-all
               highlight-current>
             <template slot-scope="{node,data}">
               <div v-text="node.label"/>
@@ -153,7 +152,7 @@ export default {
       treeObj: {
         treeList: [],
         defaultProps: {
-          children: "girdList",
+          children: "children",
           label: "girdName",
         },
         defaultExpandedKeys: [],
@@ -216,13 +215,28 @@ export default {
       this.getList();
     },
     getTreeList() {
-      this.instance.post("/app/appgirdinfo/listAllByTop").then(res => {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res?.data) {
-          this.treeObj.treeList = [res.data];
-          this.info = res.data
+          // this.treeObj.treeList = [res.data];
+          // this.info = res.data
           this.$nextTick(() => {
-            this.$refs.tree.setCurrentKey(this.info.id)
+            this.$refs.tree.setCurrentKey(res.data.id)
           })
+
+          this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
+          const parentGirdId = this.treeObj.treeList[0].id
+
+          this.treeObj.treeList.map(p => this.addChild(p, res.data.map(v => {
+            if (v.id === parentGirdId) {
+              // this.defaultExpandedKeys.push(v.id)
+            }
+
+            return {
+              ...v
+            }
+          }), {
+            parent: 'parentGirdId'
+          }))
         }
       });
     },