宅基地调查

src/views/homesteadSurvey/add.vue

@@ -1925,7 +1925,17 @@
         @cancel="showfwzt = false"
       />
     </van-popup>
+    <!--<van-popup v-model="showsyqrnhdmlist" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="syqrnhdmlist"
+        value-key="hzxm"
+        @confirm="onConfirmsyqrnhdmlist"
+        @cancel="showsyqrnhdmlist = false"
+      />
+    </van-popup>-->
     <van-popup v-model="showsyqrnhdmlist" position="bottom">
+      <van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>
       <van-picker
         show-toolbar
         :columns="syqrnhdmlist"
@@ -2482,6 +2492,7 @@
     </van-popup>
     <!--农民房屋农户代码列表-->
     <van-popup v-model="shownmfwnhdm" position="bottom">
+      <van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>
       <van-picker
         show-toolbar
         :columns="syqrnhdmlist"
@@ -2522,6 +2533,7 @@
     components: { MapGisDrawing,},
     data() {
       return {
+        nhdmValue:null,
         active:1,
         // 电子签名
         lineWidth: 6, // 画笔的线条粗细
@@ -2707,6 +2719,9 @@
           this.item = this.$cookies.get("search").mapZjdAData
           let zrz = this.$cookies.get("search").mapZrzAData
           let fsss = this.$cookies.get("search").mapFsssAData
+          this.getnhdmlist();
+          this.getZjd();
+          this.getBaseUrl();
           if(this.$cookies.get("search").active=="3"){
             this.showzrz= true
             this.getZrzList()
@@ -2723,10 +2738,15 @@
           }
         }else{
           this.item = this.$cookies.get("search")
+          this.getnhdmlist();
+          this.getZjd();
+          this.getBaseUrl();
         }
-
       }else{
         this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
+        this.getnhdmlist();
+        this.getZjd();
+        this.getBaseUrl();
       }
       this.getDicts("zjdlyzk").then(response => {
         this.lyzkOptions = response.data;
@@ -2831,11 +2851,6 @@
       this.getDicts("Industry").then(response => {
         this.industryOptions = response.data;
       });
-      this.getnhdmlist();
-      this.getZjd();
-      this.getBaseUrl();
-
-
     },
     mounted(){
         if(this.active ==1){
@@ -2871,10 +2886,10 @@
       // 所有权人农户代码列表
       getnhdmlist(){
         let params = {
-          "deptId" : this.item.deptId
+          "deptId" : this.item.deptId,
+          "nhValue":this.nhdmValue
         }
         listNh(params).then((response) => {
-          console.log(response)
           this.syqrnhdmlist = response.rows
         });
       },

src/views/homesteadSurvey/list.vue

@@ -56,7 +56,13 @@
       <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" swipeable animated @click="getZjdList">
         <van-tab >
           <template #title>全部<van-badge v-if="qbNums>=0" :content="qbNums" /></template>
-          <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
+          <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
+            <van-list
+              v-model:loading="loading1"
+              :finished="finished1"
+              finished-text="没有更多了"
+              @load="onRefreshzjd"
+            >
           <van-cell  v-for="(item,index) in list" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
@@ -75,11 +81,18 @@
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
-          </van-pull-refresh>
+            </van-list>
+          <!--</van-pull-refresh>-->
         </van-tab>
         <van-tab >
           <template #title>已核查<van-badge v-if="yhcNums>=0" :content="yhcNums" /></template>
-          <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
+          <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
+          <van-list
+            v-model:loading="loading2"
+            :finished="finished2"
+            finished-text="没有更多了"
+            @load="onRefreshzjd"
+          >
           <van-cell  v-for="(item,index) in list1" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
@@ -98,11 +111,18 @@
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
-          </van-pull-refresh>
+          </van-list>
+          <!--</van-pull-refresh>-->
         </van-tab>
         <van-tab >
           <template #title>未核查<van-badge v-if="whcNums>=0" :content="whcNums" /></template>
-          <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
+          <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
+          <van-list
+            v-model:loading="loading3"
+            :finished="finished3"
+            finished-text="没有更多了"
+            @load="onRefreshzjd"
+          >
           <van-cell  v-for="(item,index) in list2" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
@@ -121,7 +141,8 @@
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
-          </van-pull-refresh>
+            </van-list>
+          <!--</van-pull-refresh>-->
         </van-tab>
       </van-tabs>
     </div>
@@ -1157,6 +1178,12 @@
       name: "homesteadList",
       data() {
         return {
+          loading1:false,
+          finished1:false,
+          loading2:false,
+          finished2:false,
+          loading3:false,
+          finished3:false,
           //全部
           qbNums:0,
           //已调查数量
@@ -1347,7 +1374,6 @@
         this.item = this.$cookies.get("item");
         this.getZjdList();
         this.getTotalHR();
-        console.log(this.mapZjdTeAll.mapZrzAData.length)
       },
       methods: {
         //删除户内成员
@@ -1398,9 +1424,12 @@
             listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list1.length<response.total){
                   response.rows.map(res => {
-                    this.list1.unshift(res)
+                    this.list1.push(res)
                   })
                   this.countyhc++
+                  this.loading2 = false
+                }else{
+                  this.finished2 = true
                 }
             });
           }else if(this.active==2){
@@ -1413,9 +1442,12 @@
             listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list2.length<response.total){
                   response.rows.map(res => {
-                    this.list2.unshift(res)
+                    this.list2.push(res)
                   })
                   this.countwhc++
+                  this.loading3 = false
+                }else{
+                  this.finished3 = true
                 }
             });
           }else{
@@ -1427,9 +1459,12 @@
             listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list.length<response.total){
                   response.rows.map(res => {
-                    _this.list.unshift(res)
+                    _this.list.push(res)
                   })
                   this.countqb++
+                  this.loading1 = false
+                }else{
+                  this.finished1 = true
                 }
             });
           }
@@ -2024,6 +2059,8 @@
                 message: '保存成功',
                 duration:"1000",
                 onClose:function(){
+                  _this.totalR+=1
+                  _this.totalH+=1
                   _this.showhncy = false
                   let params = {
                     "nhdm":_this.form5.nhdm,