BUG 28265

src/components/pages/selectGird.vue

@@ -21,9 +21,9 @@
             <div class="imges" v-if="isDisabledOneGird">
               <div v-if="item.girdLevel != 0">
                 <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
-                   @click.stop="girdClick(item, index)"/>
+                     @click.stop="girdClick(item, index)"/>
                 <img src="./img/xz.png" alt="" class="imgselect" v-else
-                    @click.stop="girdClick(item, index)"/>
+                     @click.stop="girdClick(item, index)"/>
               </div>
               <span v-else class="imgselect"></span>
               <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
@@ -46,6 +46,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
   name: 'selectGird',
   appName: "网格选择",
@@ -59,7 +61,6 @@ export default {
       allData: null,
       treeList: [],
       selectList: [],
-      userGird: {},
       userList: [],
       girdLevel: 0,
       parentGirdId: '',
@@ -68,8 +69,12 @@ export default {
     }
   },
   computed: {
+    ...mapState(['user']),
     options() {
       return this.treeList.filter(e => e.girdName?.indexOf(this.name) > -1 || !this.name) || []
+    },
+    isGirdUser() {
+      return this.user.girdCheckType != 0
     }
   },
   onLoad(params) {
@@ -80,29 +85,18 @@ export default {
       this.isMyGird = params.isMyGird
     }
 
-    if(params.isDisabledOneGird) {
+    if (params.isDisabledOneGird) {
       this.isDisabledOneGird = params.isDisabledOneGird
     }
-    this.isGirdUser()
-
+    if(this.isGirdUser){
+      if (this.isMyGird) {
+        this.getMyGird()
+      } else {
+        this.getTree()
+      }
+    }else  this.$u.toast('当前人员不是网格员或网格管理员')
   },
   methods: {
-    isGirdUser() {
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res?.data) {
-          if (res.data.checkType) {
-            this.userGird = res.data
-            if (this.isMyGird) {
-              this.getMyGird()
-            } else {
-              this.getTree()
-            }
-          } else {
-            this.$u.toast('当前人员不是网格员或网格管理员')
-          }
-        }
-      })
-    },
     getMyGird() {
       this.selectList = []
       this.$http.post('/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser').then((res) => {
@@ -114,7 +108,7 @@ export default {
     },
     getTree() {
       this.selectList = []
-      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${this.girdLevel}&girdMemberId=${this.userGird.girdMemberId}&parentGirdId=${this.parentGirdId}`).then((res) => {
+      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${this.girdLevel}&girdMemberId=${this.user.girdMemberId}&parentGirdId=${this.parentGirdId}`).then((res) => {
         if (res?.data) {
           this.allData = res.data
           this.treeInit()
@@ -149,7 +143,7 @@ export default {
     searckGird(row) {
       if (row.girdLevel == 2) return
       const girdLevel = Number(row.girdLevel) + 1;
-      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${girdLevel}&girdMemberId=${this.userGird.girdMemberId}&parentGirdId=${row.id}`).then((res) => {
+      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${girdLevel}&girdMemberId=${this.user.girdMemberId}&parentGirdId=${row.id}`).then((res) => {
         if (res?.data) {
           this.treeList = res.data
         }
@@ -235,6 +229,7 @@ export default {
           display: flex;
           align-items: center;
           width: 158px;
+
           .imgselect {
             width: 48px;
             height: 48px;