From 5926f6abbe7133a56e2b3e1d8d2243ed6f413ce1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 6 Mar 2023 11:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96loading,=E8=B0=83=E6=95=B4=E4=B8=BA=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=80=8C=E4=B8=8D=E6=98=AF=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=B7=B3=E6=A0=87=E5=87=86=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pages/selectGird.vue             | 3 ++-
 src/project/qujing/AppConflictMediation/add.vue | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
index 1d3ed01f..48a45486 100644
--- a/src/components/pages/selectGird.vue
+++ b/src/components/pages/selectGird.vue
@@ -69,6 +69,7 @@ export default {
   },
   methods: {
     getAllGrids() {
+      uni.showLoading({title: "数据加载中...", mask: true})
       this.selectList = []
       let {girdMemberId} = this.user,
           url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`,
@@ -86,7 +87,7 @@ export default {
           this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)}))
           this.treeInit()
         }
-      })
+      }).finally(() => uni.hideLoading())
     },
     treeInit(isClick) {
       let last = uni.getStorageSync("lastSelectedGrid")
diff --git a/src/project/qujing/AppConflictMediation/add.vue b/src/project/qujing/AppConflictMediation/add.vue
index 3ea0e5eb..170605ed 100644
--- a/src/project/qujing/AppConflictMediation/add.vue
+++ b/src/project/qujing/AppConflictMediation/add.vue
@@ -19,8 +19,7 @@
         <AiMore placeholder="点击定位" v-model="form.address" @click="chooseAddress"/>
       </AiItem>
       <AiItem label="上报网格" required labelBold>
-        <AiPagePicker type="custom" @select="handleSelectGrid" self
-                      :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
+        <AiPagePicker type="gird" @select="handleSelectGrid" self>
           <AiMore v-model="form.girdName"/>
         </AiPagePicker>
       </AiItem>