From 8fa7e9c083319d538a8aedb27100d7ffc89ebd75 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 25 Aug 2022 09:34:40 +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

---
 .../AppCommunityManage/components/Add.vue     | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/grid/AppCommunityManage/components/Add.vue b/packages/grid/AppCommunityManage/components/Add.vue
index 2c699885..d6996755 100644
--- a/packages/grid/AppCommunityManage/components/Add.vue
+++ b/packages/grid/AppCommunityManage/components/Add.vue
@@ -37,17 +37,20 @@
           </el-form-item>
         </el-form>
       </div>
-      <ai-dialog title="选择网格" :visible.sync="showGrid" :customFooter="true" :destroyOnClose="true"
-                 @opened="beforeSelectTree" border width="720px">
+      <ai-dialog title="选择网格" :visible.sync="showGrid" :customFooter="true" :destroyOnClose="true" border width="720px">
         <div class="grid">
-          <el-tree :data="treeObj.treeList" :props="treeObj.defaultProps" node-key="id" ref="tree"
-                   :check-strictly="true" show-checkbox
-                   :default-checked-keys="treeObj.checkedKeys" default-expand-all
-                   @check="onCheckChange">
-            <template slot-scope="{node,data}">
-              <el-tooltip :content="node.label">
-                <div class="el-tree-node__label" v-text="node.label"/>
-              </el-tooltip>
+          <el-tree
+            :data="treeObj.treeList"
+            :props="treeObj.defaultProps"
+            node-key="id"
+            ref="tree"
+            :check-strictly="true"
+            show-checkbox
+            :default-checked-keys="treeObj.checkedKeys"
+            :default-expanded-keys="treeObj.checkedKeys"
+            @check="onCheckChange">
+            <template slot-scope="{node}">
+              <div class="el-tree-node__label" :title="node.label" v-text="node.label"/>
             </template>
           </el-tree>
         </div>
@@ -98,7 +101,7 @@ export default {
       treeObj: {
         treeList: [],
         defaultProps: {
-          children: "girdList",
+          children: "children",
           label: "girdName",
         },
         checkedKeys: [],
@@ -115,6 +118,7 @@ export default {
   },
 
   created() {
+    this.beforeSelectTree()
     this.dict.load('cardType', 'sex', 'nation').then(() => {
       if (this.params && this.params.id) {
         this.getInfo(this.params.id)
@@ -123,15 +127,23 @@ export default {
   },
   methods: {
     beforeSelectTree() {
-      this.treeObj.checkedKeys = [];
-      this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res.code == 0) {
-          this.treeObj.treeList = this.format(res.data)
+          this.treeObj.checkedKeys = []
           if (this.form.girdInfoList.length) {
             this.form.girdInfoList.map((e) => {
               this.treeObj.checkedKeys.push(e.id);
             });
           }
+          this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
+          this.treeObj.treeList.map(p => this.addChild(p, res.data.map(v => {
+
+            return {
+              ...v
+            }
+          }), {
+            parent: 'parentGirdId'
+          }))
         }
       });
     },