BUG 27200

package.json

@@ -66,6 +66,7 @@
     "miniprogram-api-typings": "^3.3.2",
     "node-sass": "npm:dart-sass@^1.25.0",
     "postcss-comment": "^2.0.0",
+    "query-string": "^7.1.1",
     "uview-ui": "^1.8.4",
     "vue-template-compiler": "^2.6.11"
   },

src/components/AiPagePicker.vue

@@ -8,6 +8,8 @@
 </template>
 
 <script>
+import qs from 'query-string'
+
 export default {
   name: "AiPagePicker",
   model: {
@@ -47,7 +49,14 @@ export default {
         this.$emit("select", data)
         this.$emit("change", data.map(e => e[nodeKey]))
       })
-      uni.navigateTo({url: `${config.url}?selected=${selected?.toString()}`})
+      let url = `${config.url}`,
+          qsstr = qs.stringify({
+            selected, ...this.$attrs
+          })
+      if (!!qsstr) {
+        url += `?${qsstr}`
+      }
+      uni.navigateTo({url})
     }
   }
 }

src/components/pages/selectGird.vue

@@ -59,13 +59,16 @@ export default {
       return this.treeList.filter(e => e.girdName?.indexOf(this.name) > -1 || !this.name) || []
     }
   },
-  onLoad() {
+  onLoad(params) {
+    if (params.girdLevel) {
+      this.girdLevel = params.girdLevel
+    }
     this.isGirdUser()
   },
   methods: {
     isGirdUser() {
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           if (res.data.checkType) {
             this.userGird = res.data
             this.getTree()

src/saas/AppBackUserList/AppBackUserList.vue

@@ -2,12 +2,12 @@
   <div class="BackUserList">
     <AiTopFixed v-if="isAdmin">
       <div class="pad-t32"></div>
-      <div class="select-gird" @click="showSelect=true">
+      <div class="select-gird">
-        <div class="gird-name-div">
+        <AiPagePicker type="gird" girdLevel="2" class="gird-name-div" @select="confirmSelect">
           <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
           <div class="gird-name">{{ girdName }}</div>
           <img src="./components/img/down-icon.png" alt="" class="down-icon">
-        </div>
+        </AiPagePicker>
       </div>
       <div class="header">
         <div class="tab-item">
@@ -37,7 +37,8 @@
         <h2 class="name">{{ item.name }}<span class="status" v-if="item.status == 0">有异常</span></h2>
         <p class="color-999">{{ item.idNumber }}</p>
         <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{ item.startAreaName }}</span></p>
-        <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{item.arriveAreaName}}</span></p>
+        <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{ item.arriveAreaName }}</span>
+        </p>
         <p><img src="./components/img/time-icon.png" alt="">{{ item.createTime }}</p>
       </div>
     </div>
@@ -73,14 +74,13 @@
       </div>
       <div class="btn" @click="show=false">取消</div>
     </u-popup>
-    <u-select v-model="showSelect" :list="girdList" label-name="girdName" value-name="id"  @confirm="confirmSelect"/>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapActions, mapState} from 'vuex'
 import qs from "query-string"
-import { mapActions } from 'vuex'
+
 export default {
   appName: '返乡登记',
   data() {
@@ -92,10 +92,8 @@ export default {
       totalInfo: {},
       isAdmin: true,
       show: false,
-      girdList: [],
       girdName: '',
       girdId: '',
-      showSelect: false
     }
   },
   computed: {
@@ -110,14 +108,9 @@ export default {
   },
   methods: {
     ...mapActions(['injectJWeixin', 'wxInvoke']),
-    confirmSelect(e) {
+    confirmSelect(v) {
-      console.log(e)
+      this.girdId = v?.[0].id
-      this.girdId = e[0].value
+      this.girdName = v?.[0].girdName
-      this.girdList.map((item) => {
-        if(item.id == this.girdId) {
-          this.girdName = item.girdName
-        }
-      })
       this.getListInit()
       this.getTotal()
     },
@@ -161,10 +154,9 @@ export default {
     isGirdUser() {
       this.isAdmin = false
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           if (res.data.checkType != '0') {
             this.isAdmin = true
-            this.params = res.data.appGirdInfo
             this.getGirdList()
           }
         }
@@ -173,7 +165,6 @@ export default {
     getGirdList() {
       this.$http.post('/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser').then((res) => {
         if (res.code == 0) {
-          this.girdList = res.data
           this.girdId = res.data[0].id
           this.girdName = res.data[0].girdName
           this.getList()
@@ -231,6 +222,7 @@ export default {
     display: flex;
     background-color: #fff;
     margin-bottom: 4px;
+
     .tab-item {
       flex: 1;
       text-align: center;
@@ -245,6 +237,7 @@ export default {
         border-right: 1px solid #ddd;
         line-height: 44px;
       }
+
       p {
         font-size: 28px;
         font-family: PingFangSC-Regular, PingFang SC;
@@ -253,10 +246,12 @@ export default {
         margin-top: -22px;
       }
     }
+
     .tab-item:nth-last-of-type(1) {
       border-right: 0;
     }
   }
+
   .search {
     width: 100%;
     height: 112px;
@@ -265,16 +260,19 @@ export default {
     background: #FFF;
     display: flex;
     margin-bottom: 8px;
+
     .left {
       width: calc(100% - 402px);
     }
   }
+
   .tab-select {
     width: 100%;
     height: 96px;
     background: #FFF;
     display: flex;
     margin-bottom: 4px;
+
     .item {
       flex: 1;
       font-size: 32px;
@@ -283,9 +281,11 @@ export default {
       color: #333;
       text-align: center;
     }
+
     .active {
       color: #135AB8;
       position: relative;
+
       span {
         position: absolute;
         bottom: 0;
@@ -296,11 +296,13 @@ export default {
       }
     }
   }
+
   .user-list {
     .item {
       padding: 32px 64px 24px;
       background-color: #fff;
       margin-bottom: 8px;
+
       .name {
         font-size: 36px;
         font-family: PingFangSC-Medium, PingFang SC;
@@ -308,6 +310,7 @@ export default {
         color: #333;
         line-height: 50px;
         margin-bottom: 8px;
+
         .status {
           float: right;
           font-size: 28px;
@@ -316,12 +319,14 @@ export default {
           line-height: 40px;
         }
       }
+
       p {
         font-size: 28px;
         font-family: PingFangSC-Regular, PingFang SC;
         color: #333;
         line-height: 40px;
         margin-bottom: 8px;
+
         img {
           width: 32px;
           height: 32px;
@@ -329,16 +334,19 @@ export default {
           vertical-align: top;
         }
       }
+
       .start-name {
         display: inline-block;
         width: calc(100% - 50px);
       }
+
       .color-999 {
         margin-bottom: 24px;
         color: #999;
       }
     }
   }
+
   ::v-deep .AiTopFixed {
     .placeholder {
       .content {
@@ -346,17 +354,21 @@ export default {
 
       }
     }
+
     .fixed {
       margin: 0 !important;
       background-color: #f5f5f5 !important;
+
       .content {
         padding: 0 !important;
       }
     }
   }
+
   .pad-t32 {
     padding-top: 32px;
   }
+
   .select-gird {
     width: calc(100% - 60px);
     padding: 24px 32px;
@@ -365,11 +377,13 @@ export default {
     margin: 0 30px 32px;
     box-sizing: border-box;
     text-align: center;
+
     img {
       width: 32px;
       height: 32px;
       vertical-align: middle;
     }
+
     div {
       display: inline-block;
       padding-left: 20px;
@@ -379,10 +393,12 @@ export default {
       font-weight: 500;
       color: #333;
       line-height: 48px;
+
       img {
         margin-left: 8px;
       }
     }
+
     span {
       display: inline-block;
       width: 112px;
@@ -393,11 +409,13 @@ export default {
       color: #3F8DF5;
       line-height: 48px;
     }
+
     .gird-name-div {
       display: inline-block;
       width: 100%;
       padding-left: 0;
     }
+
     .gird-name {
       display: inline-block;
       max-width: calc(100% - 80px);
@@ -407,13 +425,16 @@ export default {
       vertical-align: middle;
     }
   }
+
   .empty {
     text-align: center;
+
     img {
       width: 282px;
       height: 306px;
       margin: 136px auto 0;
     }
+
     p {
       font-size: 28px;
       font-family: PingFangSC-Regular, PingFang SC;
@@ -421,9 +442,11 @@ export default {
       line-height: 40px;
     }
   }
+
   .pad-b120 {
     padding-bottom: 120px;
   }
+
   .footer {
     position: fixed;
     bottom: 0;
@@ -436,17 +459,20 @@ export default {
     font-size: 36px;
     font-family: PingFangSC-Regular, PingFang SC;
     z-index: 99;
+
     .bg-fff {
       flex: 1;
       color: #333;
       background-color: #fff;
     }
+
     .bg-blue {
       flex: 2;
       color: #fff;
       background-color: #3975C6;
     }
   }
+
   .line-bg {
     width: 110px;
     height: 8px;
@@ -454,13 +480,16 @@ export default {
     border-radius: 4px;
     margin: 32px auto 82px;
   }
+
   .flex {
     width: 100%;
     display: flex;
     padding-bottom: 70px;
+
     .item {
       flex: 1;
       text-align: center;
+
       img {
         width: 100px;
         height: 100px;
@@ -468,6 +497,7 @@ export default {
         background-color: #fff;
         margin-bottom: 16px;
       }
+
       p {
         font-size: 26px;
         font-family: PingFangSC-Regular, PingFang SC;
@@ -476,6 +506,7 @@ export default {
       }
     }
   }
+
   .btn {
     width: 100%;
     height: 96px;
@@ -487,6 +518,7 @@ export default {
     font-weight: 500;
     color: #333;
   }
+
   ::v-deep .uni-scroll-view {
     background-color: #f7f7f7;
   }