BUG 29477

src/saas/AppBackUserList/AppBackUserList.vue

@@ -3,7 +3,7 @@
     <AiTopFixed v-if="isAdmin">
       <div class="pad-t32"></div>
       <div class="select-gird">
-        <AiPagePicker type="custom" @select="confirmSelect" v-model="girdId"
+        <AiPagePicker type="custom" @select="confirmSelect" v-model="girdId" self
                       :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
           <div flex class="center">
             <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
@@ -142,14 +142,14 @@ export default {
         status = 0
       }
       this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}&arriveGirdId=${this.girdId}`)
-          .then((res) => {
+      .then((res) => {
-            if (res.code == 0) {
+        if (res.code == 0) {
-              res.data.records.map((item) => {
+          res.data.records.map((item) => {
-                item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/, "$1********$2")
+            item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/, "$1********$2")
-              })
-              this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-            }
           })
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
     },
     getTotal() {
       this.$http.post(`/app/appepidemicbackhomerecord/statistic?arriveGirdId=${this.girdId}`).then((res) => {
@@ -388,7 +388,8 @@ export default {
       vertical-align: middle;
       margin-right: 8px;
     }
-    .center{
+
+    .center {
       justify-content: center;
     }
 

src/saas/AppConflictMediation/add.vue

@@ -62,7 +62,7 @@
             <h2>上报网格</h2>
           </div>
           <div class="form-item__right">
-            <AiPagePicker type="custom" v-model="form.girdId" @select="handleSelectGrid"
+            <AiPagePicker type="custom" v-model="form.girdId" @select="handleSelectGrid" self
                           :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
               <AiMore v-model="form.girdName"/>
             </AiPagePicker>

src/saas/AppGridManagement/SelectGird.vue

@@ -46,6 +46,11 @@ export default {
       isFormMap: 0, //1为网格地图 一级不允许选中
     }
   },
+  computed: {
+    isMyGirds() {
+      return !!this.$route.query.self
+    }
+  },
   onLoad(option) {
     if (option.isFormMap) {
       this.isFormMap = option.isFormMap
@@ -67,10 +72,14 @@ export default {
     },
     getAllGrids() {
       this.slectList = []
-      let {girdMemberId} = this.userGird
+      let {girdMemberId} = this.userGird,
-      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel`, null, {
+          url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
-        params: {girdMemberId}
+          params = {girdMemberId}
-      }).then((res) => {
+      if (this.isMyGirds) {
+        url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`
+        params = {}
+      }
+      this.$http.post(url, null, {params}).then((res) => {
         if (res?.data) {
           let parents = res.data.map(e => e.parentGirdId)
           this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)}))
@@ -80,7 +89,7 @@ export default {
     },
 
     treeInit() {
-      this.treeList = this.allData.filter(e => !e.parentGirdId)
+      this.treeList = this.allData.filter(e => !e.parentGirdId || this.isMyGirds)
       this.treeList.map((item) => {
         item.isChecked = false
       })