From cfab51d759bd6c96f7c326ca7bb6edd4a02998f2 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Wed, 23 Feb 2022 11:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         |    4 +-
 src/components/circleProccess.vue   |  122 +++
 src/utils/request.js                |   13 +-
 src/views/homesteadLogin.vue        |   18 +-
 src/views/homesteadSurvey/add.vue   | 1265 +++++++++++++++++++++------
 src/views/homesteadSurvey/index.vue |   95 +-
 src/views/homesteadSurvey/list.vue  |  649 ++++++++++++--
 7 files changed, 1773 insertions(+), 393 deletions(-)
 create mode 100644 src/components/circleProccess.vue

diff --git a/src/App.vue b/src/App.vue
index 920f8c81..d42af001 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -47,10 +47,10 @@
 </template>
 
 <script>
-import navFooter from "@/components/common/nav_footer";
+/*import navFooter from "@/components/common/nav_footer";*/
 export default {
   name: "App",
-  components: { navFooter },
+  /*components: { navFooter },*/
   data: () => {
     return {
       // direction: "",
diff --git a/src/components/circleProccess.vue b/src/components/circleProccess.vue
new file mode 100644
index 00000000..f620ec77
--- /dev/null
+++ b/src/components/circleProccess.vue
@@ -0,0 +1,122 @@
+<template>
+  <div class="time-graph">
+    <canvas :id="id" :width="120" :height="120"></canvas>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "circleProccess",
+  props:{
+    ids:{
+      type:Number
+    },
+    counts:{
+      type:Number,
+      default:0,
+    }
+  },
+  data() {
+    return {
+      context:null,
+      center_x:null,
+      center_y:null,
+      rad:null,
+      speed:0,
+      context:null,
+      id:this.ids,
+
+    };
+  },
+  watch: {
+  },
+  mounted() {
+    let cc = this.counts
+     if(this.counts>0&&this.counts<99){
+       cc+=1
+    }
+    let time_canvas = document.getElementById(this.ids);
+    time_canvas.width = document.documentElement.clientWidth/6;
+    time_canvas.height = document.documentElement.clientWidth/6;
+    this.drawMain(time_canvas, cc, "#85d824", "#eef7e4");
+  },
+  methods: {
+    drawMain(drawing_elem, percent, forecolor, bgcolor){
+      this.context = drawing_elem.getContext("2d");
+      this.center_x = drawing_elem.width / 2;
+      this.center_y = drawing_elem.height / 2;
+      this.rad = 3.1415926 * 2 / 100;
+      this.speed = 0;
+      if (this.speed <= percent) {
+        this.run(drawing_elem, percent, forecolor, bgcolor,this.speed,percent)
+      }
+    },
+    run(drawing_elem, percent, forecolor, bgcolor){
+      while(this.speed <= percent){
+        window.requestAnimationFrame(this.run);
+        this.context.clearRect(0, 0, drawing_elem.width, drawing_elem.height);
+        this.backgroundCircle(bgcolor);
+        this.text(this.speed,forecolor);
+        this.foregroundCircle(this.speed,forecolor);
+        this.speed += 1;
+      }
+    },
+    backgroundCircle(bgcolor) {
+      this.context.save();
+      this.context.translate(0, 0)
+      this.context.setLineDash([5, 5])
+      this.context.lineWidth = 5; //设置线宽
+      this.context.textAlign = 'center'
+      this.context.textBaseline = 'middle'
+      this.context.font = '18px arial'
+      this.context.strokeStyle = bgcolor;
+      this.context.beginPath();
+      var radius = this.center_x - this.context.lineWidth;
+      // context.lineCap = "round";
+      this.context.arc(this.center_x, this.center_y, radius, 0, 3.1415926 * 2, false);
+      this.context.stroke();
+      this.context.closePath();
+      this.context.restore();
+
+    },
+    foregroundCircle(n,forecolor) {
+      this.context.save();
+      this.context.strokeStyle = forecolor;
+      this.context.lineWidth = 5;
+      this.context.setLineDash([5, 5])
+      // context.lineCap = "round";
+      var radius = this.center_x - this.context.lineWidth;
+      this.context.beginPath();
+      this.context.arc(this.center_x, this.center_y, radius, -3.1415926 / 2, -3.1415926 / 2 + n * this.rad, false); //用于绘制圆弧context.arc(x坐标，y坐标，半径，起始角度，终止角度，顺时针/逆时针)
+      this.context.stroke();
+      this.context.closePath();
+      this.context.restore();
+    },
+    text(n,forecolor) {
+      this.context.save(); //save和restore可以保证样式属性只运用于该段canvas元素
+      this.context.fillStyle = forecolor;
+      var font_size = document.documentElement.clientWidth/35;
+      this.context.font = font_size + "px arial";
+      var text_width = this.context.measureText(n.toFixed(0) + "%").width;
+      this.context.fillText(n.toFixed(0) + "%", this.center_x - text_width / 2, this.center_y + font_size / 2.5);
+      this.context.restore();
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .time-graph {
+  padding-top: 20px;
+  display: flex;
+  display: -webkit-flex;
+  justify-content: center;
+  align-items: center;
+}
+
+::v-deep #time-graph-canvas {
+  width: 60px;
+  height: 60px;
+}
+</style>
+
diff --git a/src/utils/request.js b/src/utils/request.js
index e5b4c5ff..8af01cc0 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -69,14 +69,15 @@ service.interceptors.response.use(res => {
     })
       .then(() => {
         store.dispatch('LogOut').then(() => {
+          console.log(window.location.href);
           if(window.location.href.indexOf('lawEnforcement') != -1){
-            location.href = '/lawEnforcement/login';
-          } else if ('/authenticRight/index'.indexOf(to.path) !== -1) {
-            location.href = '/authenticRight/login';
-          } else if ('/homestead/index'.indexOf(to.path) !== -1) {
-            location.href = '/homestead/login';
+            window.location.href = '/lawEnforcement/login';
+          } else if (window.location.href.indexOf('authenticRight') != -1) {
+            window.location.href = '/authenticRight/login';
+          } else if (window.location.href.indexOf('homesteadSurvey')!= -1) {
+            window.location.href = '/homesteadLogin';
           } else {
-            location.href = '/index';
+            window.location.href = '/index';
           }
         })
       })
diff --git a/src/views/homesteadLogin.vue b/src/views/homesteadLogin.vue
index 2f97b277..dec02679 100644
--- a/src/views/homesteadLogin.vue
+++ b/src/views/homesteadLogin.vue
@@ -3,11 +3,11 @@
     <div style="width:100%;max-width:500px;margin:0 auto;">
       <div class="title">
         <img  width="150" height="150" style="display: block;margin-right: 10px;margin: 20px auto;" src="../assets/images/housesteadSurvey/logo.png" alt="">
-        <p style="text-align:center;font-size:40px;">农村宅基地测量</p>
+        <p style="text-align:center;font-size:40px;">农村宅基地调查</p>
       </div>
           <van-form>
-            <div style="width: 462px;
-            height: 110px;
+            <div style="width: 90%;
+            max-widht:462px;
             border-radius: 45px;
             box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);padding: 10px 30px; margin:40px 20px; ">
             <van-field
@@ -19,8 +19,8 @@
               :rules="[{ required: true, message:''  }]"
             />
             </div>
-            <div style="width: 462px;
-              height: 110px;
+            <div style="width: 90%;
+            max-widht:462px;
               border-radius: 45px;
               box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);padding: 10px 30px; margin:40px 20px;  ">
             <van-field
@@ -33,8 +33,8 @@
               :rules="[{ required: true, message:''  }]"
             />
             </div>
-            <div style="width: 462px;
-              height: 110px;
+            <div style="width: 90%;
+            max-widht:462px;
               border-radius: 45px;
               box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);padding: 10px 30px; margin:40px 20px; " class="codeDiv">
             <van-field
@@ -45,7 +45,7 @@
               placeholder="图形验证码"
             >
               <template #label>
-                <img style="width: 100px" :src="codeUrl" @click="getCode"  />
+                <img style="width: 90px" :src="codeUrl" @click="getCode"  />
               </template>
             </van-field>
             </div>
@@ -340,6 +340,6 @@ export default {
 </script>
 <style scoped lang="scss">
   /deep/  .codeDiv .van-field .van-cell__title{
-    width: 3.2em!important;
+    width: 3.0em!important;
   }
 </style>
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 927a21fe..8da7f7a0 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -8,9 +8,9 @@
         <template #left>
           <van-icon name="arrow-left" size="18" color="#fff" />
         </template>
-        <template #right>
+       <!-- <template #right>
           <van-icon name="map-marked" size="18" color="#fff" />
-        </template>
+        </template>-->
         <template #title>
           <p style="color:#fff">{{item.zjddm?"":"新增"}}入户调查</p>
         </template>
@@ -20,28 +20,28 @@
     margin: 20px;margin-top:-70px;">
       <van-row>
         <van-col span="4" :offset="1" style="text-align:center;" @click="active=1">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="80px"  @click="mapClickLoading" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p :style="{color:(active==1?'rgb(34, 183, 242)':'#000')}">宅基地</p>
         </van-col>
         <van-col span="2">
           <div style="height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
         <van-col span="4"  style="text-align:center;" @click="active=2,getSyqrList()">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="80px" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户信息</p>
         </van-col>
         <van-col span="2">
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
         <van-col span="4" style="text-align:center;" @click="active=3,getZrzList()">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/fwxx'+(active==3?'A':'D')+'.png')" size="80px" @click="mapClickLoading" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/fwxx'+(active==3?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p  :style="{color:(active==3?'rgb(34, 183, 242)':'#000')}">房屋信息</p>
         </van-col>
         <van-col span="2">
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
         <van-col span="4" style="text-align:center;" @click="active=4,getFsssList()">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="80px" @click="mapClickLoading" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属设施</p>
         </van-col>
       </van-row>
@@ -58,10 +58,12 @@
             :rules="[{ required: true, message: '' }]"
           />-->
           <van-field
-            v-model="form.suyqrdm"
+            v-model="form.suyqrdm?form.suyqrdm:item.suyqrdm"
             name="所有权人代码"
             label="所有权人代码"
             placeholder="所有权人代码"
+            input-align="right"
+            required
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
@@ -69,9 +71,10 @@
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
+            input-align="right"
             :rules="[{ required: true, message: '' }]"
           />
-          <van-field name="radio" label="是否发证">
+          <van-field name="radio" label="是否发证" input-align="right">
             <template #input>
               <van-radio-group v-model="form.sffz" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -80,24 +83,34 @@
             </template>
           </van-field>
           <van-field
-            v-model="form.yt"
+            input-align="right"
+            v-model="form.ytName"
             name="用途"
             label="用途"
             placeholder="用途"
+            readonly
+            @click="showyt = true"
+          />
+          <van-field
+            v-model="form.yt"
+            style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form.zjdzsh"
             name="宅基地证书号"
             label="宅基地证书号"
             placeholder="宅基地证书号"
           />
           <van-field
+            input-align="right"
             v-model="form.zjdpzmj"
             name="宅基地批准面积"
             label="宅基地批准面积"
             placeholder="宅基地批准面积"
           />
           <van-field
+            input-align="right"
             v-model="form.zdmj"
             type="form.zdmj"
             name="宗地面积"
@@ -105,12 +118,14 @@
             placeholder="宗地面积"
           />
           <van-field
+            input-align="right"
             v-model="form.zdbh"
             name="宗地代码"
             label="宗地代码"
             placeholder="宗地代码"
           />
           <van-field
+            input-align="right"
             v-model="form.zl"
             name="坐落"
             label="坐落"
@@ -121,8 +136,10 @@
             name="坐落单位代码"
             label="坐落单位代码"
             placeholder="坐落单位代码"
+            input-align="right"
           />
           <van-field
+            input-align="right"
             v-model="form.zdszd"
             name="宗地四至-东"
             label="宗地四至-东"
@@ -130,6 +147,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form.zdszn"
             name="宗地四至-南"
             label="宗地四至-南"
@@ -137,6 +155,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form.zdszx"
             name="宗地四至-西"
             label="宗地四至-西"
@@ -144,6 +163,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form.zdszb"
             name="宗地四至-北"
             label="宗地四至-北"
@@ -151,36 +171,32 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form.lyzkName"
             name="当前利用状况"
             label="当前利用状况"
             placeholder="当前利用状况"
+            readonly
             @click="showlyzk = true"
           />
           <van-field
             v-model="form.lyzk"
             style="display:none"
           />
-          <van-popup v-model="showlyzk" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="lyzkOptions"
-              value-key="dictLabel"
-              @confirm="onConfirmlyzk"
-              @cancel="showlyzk = false"
-            />
-          </van-popup>
           <van-field
+            input-align="right"
             v-model="form.zjdxzyy"
             name="宅基地闲置原因"
             label="宅基地闲置原因"
             placeholder="宅基地闲置原因"
           />
           <van-field
+            input-align="right"
             v-model="form.xzkssj"
             name="闲置开始时间"
             label="闲置开始时间"
             placeholder="闲置开始时间"
+            readonly
             @click="showPickerxzkssj = true"
           />
           <van-popup v-model:show="showPickerxzkssj" position="bottom">
@@ -190,7 +206,7 @@
               @cancel="showPickerxzkssj = false"
             />
           </van-popup>
-          <van-field name="radio" label="流转意向">
+          <van-field name="radio" label="流转意向" input-align="right">
             <template #input>
               <van-radio-group v-model="form.lzyx" direction="horizontal">
                 <van-radio name="1">有</van-radio>
@@ -198,7 +214,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="有偿退出意向">
+          <van-field name="radio" label="有偿退出意向" input-align="right">
             <template #input>
               <van-radio-group v-model="form.yctcyx" direction="horizontal">
                 <van-radio name="1">有</van-radio>
@@ -206,7 +222,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="被惩处经历">
+          <van-field name="radio" label="被惩处经历" input-align="right">
             <template #input>
               <van-radio-group v-model="form.bccjl" direction="horizontal">
                 <van-radio name="1">有</van-radio>
@@ -215,6 +231,7 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form.bccbz"
             name="被惩处备注"
             label="被惩处备注"
@@ -227,7 +244,7 @@
                       placeholder="宅基地取得方式"
                       :rules="[{ required: true, message: '' }]"
                     />-->
-          <van-field name="radio" label="宅基地取得方式">
+          <van-field name="radio" label="宅基地取得方式" input-align="right">
             <template #input>
               <van-radio-group v-model="form.zjdqdfs" direction="horizontal">
                 <van-radio v-for="dict in zjdqdfsOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
@@ -247,66 +264,110 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form.ytmc"
             name="用途名称"
             label="用途名称"
             placeholder="用途名称"
           />
           <van-field
-            v-model="form.dj"
+            input-align="right"
+            v-model="form.djName"
             name="等级"
             label="等级"
             placeholder="等级"
+            @click="showdj = true"
+          />
+          <van-field
+            v-model="form.dj"
+            style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form.jg"
             name="价格（万元）"
             label="价格（万元）"
             placeholder="价格（万元）"
           />
           <van-field
-            v-model="form.qllx"
+            input-align="right"
+            v-model="form.qllxName"
             name="权利类型"
             label="权利类型"
             placeholder="权利类型"
+            readonly
+            @click="showqllx = true"
           />
           <van-field
-            v-model="form.qlxz"
+            v-model="form.qllx"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
+            v-model="form.qlxzName"
             name="权利性质"
             label="权利性质"
             placeholder="权利性质"
+            readonly
+            @click="showqlxz = true"
           />
           <van-field
-            v-model="form.qlsdfs"
+            v-model="form.qlxz"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
+            v-model="form.qlsdfsName"
             name="权利设定方式"
             label="权利设定方式"
             placeholder="权利设定方式"
+            readonly
+            @click="showqlsdfs = true"
           />
           <van-field
+            v-model="form.qlsdfs"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
             v-model="form.rjl"
             name="容积率"
             label="容积率"
             placeholder="容积率"
           />
           <van-field
+            input-align="right"
             v-model="form.jzmd"
-            name="建筑密度"
+            name="validator"
             label="建筑密度"
             placeholder="建筑密度"
+            :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"
+            type="number"
+          />
+          <van-field
+            input-align="right"
+            v-model="form.jzxg"
+            name="建筑限高"
+            label="建筑限高"
+            placeholder="建筑限高"
+            type="number"
           />
           <van-field
+            input-align="right"
             v-model="form.zdt"
             name="宗地图"
             label="宗地图"
             placeholder="宗地图"
           />
           <van-field
+            input-align="right"
             v-model="form.tfh"
             name="图幅号"
             label="图幅号"
             placeholder="图幅号"
           />
           <van-field
+            input-align="right"
             v-model="form.djh"
             name="地籍号"
             label="地籍号"
@@ -318,22 +379,16 @@
             label="数据来源"
             placeholder="数据来源"
             input-align="right"
+            readonly
             @click="showsjly = true"
           />
           <van-field
             v-model="form.sjly"
             style="display:none"
           />
-          <van-popup v-model="showsjly" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="sjlyOptions"
-              value-key="dictLabel"
-              @confirm="onConfirmsjly"
-              @cancel="showsjly = false"
-            />
-          </van-popup>
+
           <van-field
+            input-align="right"
             v-model="form.bz"
             name="备注"
             label="备注"
@@ -367,7 +422,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletesyqr(item)"/>
         </template>
       </van-swipe-cell>
 
@@ -402,7 +457,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item)"/>
         </template>
       </van-swipe-cell>
       <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
@@ -429,7 +484,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletefw(item)"/>
         </template>
       </van-swipe-cell>
       <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
@@ -448,21 +503,21 @@
       </div>
       <van-swipe-cell v-for="(item,index) in fssslist" :key="'fsss'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
         <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>{{item.fssslx}}</p>
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>{{fssslxfy(item.fssslx)}}</p>
           <div style="display:flex;line-height:20px">
             <p style="flex:1;text-align:left;">建筑面积</p>
             <p  style="flex:1;text-align:right;">{{item.jzmj}}</p>
           </div>
           <div style="display:flex;line-height:20px">
             <p style="flex:1;text-align:left;">建筑物情况</p>
-            <p style="flex:1;text-align:right;">{{item.jzwqk}}</p>
+            <p style="flex:1;text-align:right;">{{jzwqkfy(item.jzwqk)}}</p>
           </div>
           <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" @click="showPopupfsss(item)" style="margin:0 auto;">查看附属设施信息</van-button>
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
         </template>
       </van-swipe-cell>
       <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
@@ -493,36 +548,43 @@
         <van-form @submit="onSubmitsyqr">
           <p class="title" style="position:relative;padding-left:20px;line-height:32px;">使用权人</p>
           <van-field
+            input-align="right"
             v-model="form1.suyqrdm"
             name="所有权人代码"
             label="所有权人代码"
             placeholder="所有权人代码"
           />
           <van-field
+            input-align="right"
             v-model="form1.nhdm"
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
+            @click="showsyqrnhdmlist = true"
           />
           <van-field
+            input-align="right"
             v-model="form1.zjddm"
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
           />
-          <van-field
+          <!--<van-field
+            input-align="right"
             v-model="form1.nmfwdm"
             name="农民房屋代码"
             label="农民房屋代码"
             placeholder="农民房屋代码"
-          />
+          />-->
           <van-field
+            input-align="right"
             v-model="form1.shyqrdbxm"
             name="使用权人代表姓名"
             label="使用权人代表姓名"
             placeholder="使用权人代表姓名"
           />
           <van-field
+            input-align="right"
             v-model="form1.shyqrdbzjlxName"
             name="使用权人代表证件类型"
             label="使用权人代表证件类型"
@@ -534,42 +596,48 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form1.shyqrdbzjhm"
             name="使用权人代表证件号码"
             label="使用权人代表证件号码"
             placeholder="使用权人代表证件号码"
           />
           <van-field
+            input-align="right"
             v-model="form1.bdcdyh"
             name="不动产单元号"
             label="不动产单元号"
             placeholder="不动产单元号"
           />
           <van-field
+            input-align="right"
             v-model="form1.bdcqzh"
             name="不动产权证号"
             label="不动产权证号"
             placeholder="不动产权证号"
           />
           <van-field
+            input-align="right"
             v-model="form1.qzysxlh"
             name="权证印刷序列号"
             label="权证印刷序列号"
             placeholder="权证印刷序列号"
           />
           <van-field
+            input-align="right"
             v-model="form1.fzjg"
             name="发证机关"
             label="发证机关"
             placeholder="发证机关"
           />
           <van-field
+            input-align="right"
             v-model="form1.sshy"
             name="所属行业"
             label="所属行业"
             placeholder="所属行业"
           />
-          <van-field name="radio" label="国家/地区">
+          <van-field name="radio" label="国家/地区" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.gj" direction="horizontal">
                 <van-radio name="1">中国</van-radio>
@@ -578,18 +646,20 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form1.qlbl"
             name="权利比例"
             label="权利比例"
             placeholder="权利比例"
           />
           <van-field
+            input-align="right"
             v-model="form1.hjszss"
             name="户籍所在省市"
             label="户籍所在省市"
             placeholder="户籍所在省市"
           />
-          <van-field name="radio" label="性别">
+          <van-field name="radio" label="性别" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.xb" direction="horizontal">
                 <van-radio name="1">男</van-radio>
@@ -598,24 +668,27 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form1.dh"
             name="电话"
             label="电话"
             placeholder="电话"
           />
           <van-field
+            input-align="right"
             v-model="form1.dz"
             name="地址"
             label="地址"
             placeholder="地址"
           />
           <van-field
+            input-align="right"
             v-model="form1.ftzdmj"
             name="分摊宗地面积"
             label="分摊宗地面积"
             placeholder="分摊宗地面积"
           />
-          <van-field name="radio" label="是否使用权人之间共有">
+          <van-field name="radio" label="是否使用权人之间共有" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.sfsyqrzjgy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -624,6 +697,7 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form1.qlrlxName"
             name="权利人类型"
             label="权利人类型"
@@ -635,6 +709,7 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form1.gyfsName"
             name="共有方式"
             label="共有方式"
@@ -645,7 +720,7 @@
             v-model="form1.gyfs"
             style="display:none"
           />
-          <van-field name="radio" label="是否本农村集体经济组织成员">
+          <van-field name="radio" label="是否本农村集体经济组织成员" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.sfbncjtjjzzcy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -653,7 +728,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="户口类型">
+          <van-field name="radio" label="户口类型" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.hklx" direction="horizontal">
                 <van-radio name="1">农业</van-radio>
@@ -662,13 +737,14 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form1.bz"
             name="备注"
             label="备注"
             placeholder="备注"
           />
           <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" native-type="button" @click="showPopuphncylist(item)">查看户内成员列表</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" native-type="button" @click="showPopuphncylist(form1)">查看户内成员列表</van-button>
           </div>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
@@ -693,6 +769,7 @@
       <div style="margin:20px;">
         <van-form @submit="onSubmitzrz">
           <van-field
+            input-align="right"
             v-model="form3.zjddm"
             name="宅基地代码"
             label="宅基地代码"
@@ -700,6 +777,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form3.nmfwzh"
             name="农民房屋幢号"
             label="农民房屋幢号"
@@ -707,6 +785,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form3.zrzh"
             name="自然幢号"
             label="自然幢号"
@@ -714,64 +793,81 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form3.jgrq"
             name="竣工日期"
             label="竣工日期"
             placeholder="竣工日期"
           />
           <van-field
+            input-align="right"
             v-model="form3.jzwgd"
             name="建筑物高度"
             label="建筑物高度"
             placeholder="建筑物高度"
           />
           <van-field
+            input-align="right"
             v-model="form3.zzdmj"
             name="幢占地面积"
             label="幢占地面积"
             placeholder="幢占地面积"
           />
           <van-field
+            input-align="right"
             v-model="form3.zydmj"
             name="幢用地面积"
             label="幢用地面积"
             placeholder="幢用地面积"
           />
           <van-field
+            input-align="right"
             v-model="form3.scjzmj"
             name="实测建筑面积"
             label="实测建筑面积"
             placeholder="实测建筑面积"
           />
           <van-field
+            input-align="right"
             v-model="form3.zcs"
             name="总层数"
             label="总层数"
             placeholder="总层数"
           />
           <van-field
+            input-align="right"
             v-model="form3.dscs"
             name="地上层数"
             label="地上层数"
             placeholder="地上层数"
           />
           <van-field
+            input-align="right"
             v-model="form3.dxcs"
             name="地下层数"
             label="地下层数"
             placeholder="地下层数"
           />
           <van-field
-            v-model="form3.fwjg"
+            input-align="right"
+            v-model="form3.fwjgName"
             name="房屋结构"
             label="房屋结构"
             placeholder="房屋结构"
+            @click="showzrzfwjg = true"
+            readonly
           />
           <van-field
+          v-model="form3.fwjg"
+          style="display:none"
+          />
+          <van-field
+            input-align="right"
             v-model="form3.sjlyName"
             name="数据来源"
             label="数据来源"
             placeholder="数据来源"
+            readonly
             :rules="[{ required: true, message: '' }]"
             @click="showzrzsjly=true"
           />
@@ -780,12 +876,13 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form3.bz"
             name="备注"
             label="备注"
             placeholder="备注"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form3.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
+          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -814,168 +911,199 @@
             label="要素代码"
             placeholder="要素代码"
             :rules="[{ required: true, message: '' }]"
-          />
+          />-->
           <van-field
-            v-model="nmfwform.deptId"
+            v-model="nmfwform.deptId?nmfwform.deptId:item.deptId"
             name="组织机构代码"
             label="组织机构代码"
             placeholder="组织机构代码"
             :rules="[{ required: true, message: '' }]"
-          />-->
+            style="display:none"
+          />
           <van-field
-            v-model="nmfwform.zjddm"
+            input-align="right"
+            v-model="nmfwform.zjddm?nmfwform.zjddm:item.zjddm"
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
+            readonly
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.nmfwdm"
             name="农民房屋代码"
             label="农民房屋代码"
             placeholder="农民房屋代码"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.bdcdyh"
             name="不动产单元号"
             label="不动产单元号"
             placeholder="不动产单元号"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.nmfwmj"
             name="农民房屋面积"
             label="农民房屋面积"
             placeholder="农民房屋面积"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.fwbm"
             name="房屋代码"
             label="房屋代码"
             placeholder="房屋代码"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.zrzh"
             name="自然幢号"
             label="自然幢号"
             placeholder="自然幢号"
+            readonly
+            @click="showzrzh = true"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.nmfwzh"
             name="农民房屋幢号"
             label="农民房屋幢号"
             placeholder="农民房屋幢号"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.ch"
             name="层号"
             label="层号"
             placeholder="层号"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.sjc"
             name="实际层"
             label="实际层"
             placeholder="实际层"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.myc"
             name="名义层"
             label="名义层"
             placeholder="名义层"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.zl"
             name="坐落"
             label="坐落"
             placeholder="坐落"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.sjcs"
             name="实际层数"
             label="实际层数"
             placeholder="实际层数"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.hh"
             name="户号"
             label="户号"
             placeholder="户号"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.hxName"
             name="户型"
             label="户型"
             placeholder="户型"
             @click="showhx=true"
+            readonly
           />
           <van-field
             v-model="nmfwform.hx"
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.hxjgName"
             name="户型结构"
             label="户型结构"
             placeholder="户型结构"
             @click="showhxjg=true"
+            readonly
           />
           <van-field
             v-model="nmfwform.hxjg"
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.fwjgName"
             name="房屋结构"
             label="房屋结构"
             placeholder="房屋结构"
             @click="showfwjg=true"
+            readonly
           />
           <van-field
             v-model="nmfwform.fwjg"
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.fwytName"
             name="房屋用途"
             label="房屋用途"
             placeholder="房屋用途"
             @click="showfwyt=true"
+            readonly
           />
           <van-field
             v-model="nmfwform.fwyt"
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.fwzdmj"
             name="房屋占地面积"
             label="房屋占地面积"
             placeholder="房屋占地面积"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.jzmj"
             name="建筑面积"
             label="建筑面积"
             placeholder="建筑面积"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.zsh"
             name="证书号"
             label="证书号"
             placeholder="证书号"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.djjg"
             name="登记机构"
             label="登记机构"
             placeholder="登记机构"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.djsj"
             name="登记时间"
             label="登记时间"
             placeholder="登记时间"
             @click="showPickerdjsj=true"
+            readonly
           />
-          <van-field name="radio" label="是否纠纷">
+          <van-field name="radio" label="是否纠纷" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.sfjf" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -983,7 +1111,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="是否查封">
+          <van-field name="radio" label="是否查封" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.sfcf" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -992,24 +1120,30 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="nmfwform.cfqssj"
             name="查封起始时间"
             label="查封起始时间"
             placeholder="查封起始时间"
+            readonly
             @click="showPickercfqssj=true"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.cfjssj"
             name="查封结束时间"
             label="查封结束时间"
             placeholder="查封结束时间"
+            readonly
             @click="showPickercfjssj=true"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.fwlxName"
             name="房屋类型"
             label="房屋类型"
             placeholder="房屋类型"
+            readonly
             @click="showfwlx=true"
           />
           <van-field
@@ -1017,10 +1151,12 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.sjlyName"
             name="数据来源"
             label="数据来源"
             placeholder="数据来源"
+            readonly
             @click="shownmfwsjly=true"
           />
           <van-field
@@ -1028,16 +1164,19 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.qxdm"
             name="区县代码"
             label="区县代码"
             placeholder="区县代码"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.lyzkName"
             name="利用状况"
             label="利用状况"
             placeholder="利用状况"
+            readonly
             @click="shownmfwlyzk=true"
           />
           <van-field
@@ -1045,16 +1184,19 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.xzyy"
             name="闲置原因"
             label="闲置原因"
             placeholder="闲置原因"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.phlymsName"
             name="盘活利用模式"
             label="盘活利用模式"
             placeholder="盘活利用模式"
+            readonly
             @click="showphlyms=true"
           />
           <van-field
@@ -1062,12 +1204,13 @@
             style="display:none"
           />
           <van-field
-            v-model="nmfwform.jzndName"
+            input-align="right"
+            v-model="nmfwform.jznd"
             name="建筑年代"
             label="建筑年代"
             placeholder="建筑年代"
           />
-          <van-field name="radio" label="是否发证">
+          <van-field name="radio" label="是否发证" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.sffz" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1075,7 +1218,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="是否与其他人共有">
+          <van-field name="radio" label="是否与其他人共有" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.isCommon" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1084,12 +1227,13 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="nmfwform.fwzt"
             name="房屋状态"
             label="房屋状态"
             placeholder="房屋状态"
           />
-          <van-field name="radio" label="是否抵押">
+          <van-field name="radio" label="是否抵押" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.sfdy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1098,18 +1242,21 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="nmfwform.isMortgage"
             name="抵押权利人"
             label="抵押权利人"
             placeholder="抵押权利人"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.mortgageMoney"
             name="抵押金额"
             label="抵押金额"
             placeholder="抵押金额"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.zwlxsj1"
             name="债务履行开始时间"
             label="债务履行开始时间"
@@ -1117,6 +1264,7 @@
             @click="showPickerzwlxsj1=true"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.zwlxsj2"
             name="债务履行结束时间"
             label="债务履行结束时间"
@@ -1124,12 +1272,13 @@
             @click="showPickerzwlxsj2=true"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.eay"
             name="年收益"
             label="年收益"
             placeholder="年收益"
           />
-          <van-field name="radio" label="流转意向">
+          <van-field name="radio" label="流转意向" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.lzyx" direction="horizontal">
                 <van-radio name="1">有</van-radio>
@@ -1138,24 +1287,28 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="nmfwform.yctcyx"
             name="有偿退出意向"
             label="有偿退出意向"
             placeholder="有偿退出意向"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.bccjl"
             name="被惩处经历"
             label="被惩处经历"
             placeholder="被惩处经历"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.bccbz"
             name="被惩处备注"
             label="被惩处备注"
             placeholder="被惩处备注"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.qslyName"
             name="权属来源"
             label="权属来源"
@@ -1166,7 +1319,7 @@
             v-model="nmfwform.qsly"
             style="display:none"
           />
-          <van-field name="radio" label="是否扩建改建">
+          <van-field name="radio" label="是否扩建改建" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.sfkjgj" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1175,6 +1328,7 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="nmfwform.pzsj"
             name="批准时间"
             label="批准时间"
@@ -1182,6 +1336,7 @@
             @click="showPickerpzsj=true"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.tdzkName"
             name="审批或建设前土地状况"
             label="审批或建设前土地状况"
@@ -1193,12 +1348,14 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.bz"
             name="备注"
             label="备注"
             placeholder="备注"
           />
           <van-field
+            input-align="right"
             v-model="nmfwform.zjdxctp"
             name="宅基地现场照片"
             label="宅基地现场照片"
@@ -1215,6 +1372,78 @@
         </van-form>
       </div>
     </van-popup>
+    <van-popup v-model="showsjly" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="sjlyOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmsjly"
+        @cancel="showsjly = false"
+      />
+    </van-popup>
+    <van-popup v-model="showzrzh" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="zrzlist"
+        value-key="zrzh"
+        @confirm="onConfirmzrzh"
+        @cancel="showzrzh = false"
+      />
+    </van-popup>
+    <van-popup v-model="showyt" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="ytOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmyt"
+        @cancel="showyt = false"
+      />
+    </van-popup>
+    <van-popup v-model="showdj" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="tddjOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmdj"
+        @cancel="showdj = false"
+      />
+    </van-popup>
+    <van-popup v-model="showlyzk" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="lyzkOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmlyzk"
+        @cancel="showlyzk = false"
+      />
+    </van-popup>
+    <van-popup v-model="showqllx" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="qllxOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmqllx"
+        @cancel="showqllx = false"
+      />
+    </van-popup>
+    <van-popup v-model="showqlxz" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="qlxzOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmqlxz"
+        @cancel="showqlxz = false"
+      />
+    </van-popup>
+    <van-popup v-model="showqlsdfs" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="qlsdfsOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmqlsdfs"
+        @cancel="showqlsdfs = false"
+      />
+    </van-popup>
     <van-popup v-model="showshyqrdbzjlx" position="bottom">
       <van-picker
         show-toolbar
@@ -1251,15 +1480,6 @@
         @cancel="showyhzgx = false"
       />
     </van-popup>
-    <van-popup v-model="showhyzk" position="bottom">
-      <van-picker
-        show-toolbar
-        :columns="yhzgxOptions"
-        value-key="dictLabel"
-        @confirm="onConfirmyhzgx"
-        @cancel="showyhzgx = false"
-      />
-    </van-popup>
     <van-popup v-model="showqlrlx" position="bottom">
       <van-picker
         show-toolbar
@@ -1323,6 +1543,15 @@
           @cancel="showhxjg = false"
         />
       </van-popup>
+      <van-popup v-model="showzrzfwjg" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="fwjgOptions"
+          value-key="dictLabel"
+          @confirm="onConfirmzrzfwjg"
+          @cancel="showzrzfwjg = false"
+        />
+      </van-popup>
       <van-popup v-model="showfwjg" position="bottom">
         <van-picker
           show-toolbar
@@ -1457,6 +1686,15 @@
         @cancel="showfwzt = false"
       />
     </van-popup>
+    <van-popup v-model="showsyqrnhdmlist" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="syqrnhdmlist"
+        value-key="nhdm"
+        @confirm="onConfirmsyqrnhdmlist"
+        @cancel="showsyqrnhdmlist = false"
+      />
+    </van-popup>
     <van-popup v-model="showjzwqk" position="bottom">
       <van-picker
         show-toolbar
@@ -1501,6 +1739,7 @@
       <div style="margin:20px;">
         <van-form @submit="onSubmitfsss">
           <van-field
+            input-align="right"
             v-model="form4.zjddm?form4.zjddm:form4.zjddm=item.zjddm"
             name="宅基地代码"
             label="宅基地代码"
@@ -1508,6 +1747,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form4.fssslxName"
             name="附属设施类型"
             label="附属设施类型"
@@ -1520,6 +1760,7 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form4.jzmj"
             name="建筑面积"
             label="建筑面积"
@@ -1527,6 +1768,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form4.qslyName"
             name="权属来源"
             label="权属来源"
@@ -1539,6 +1781,7 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form4.fwztName"
             name="房屋状态"
             label="房屋状态"
@@ -1550,7 +1793,7 @@
             v-model="form4.fwzt"
             style="display:none"
           />
-          <van-field name="radio" label="是否审批">
+          <van-field name="radio" label="是否审批" input-align="right">
             <template #input>
               <van-radio-group v-model="form4.sfsp" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1558,7 +1801,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="是否发证">
+          <van-field name="radio" label="是否发证" input-align="right">
             <template #input>
               <van-radio-group v-model="form4.sffz" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1567,6 +1810,7 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form4.jglxName"
             name="结构类型"
             label="结构类型"
@@ -1578,7 +1822,7 @@
             v-model="form4.jglx"
             style="display:none"
           />
-          <van-field name="radio" label="是否正在使用">
+          <van-field name="radio" label="是否正在使用" input-align="right">
             <template #input>
               <van-radio-group v-model="form4.sfzzsy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1587,6 +1831,7 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form4.jzwqkName"
             name="建筑物情况"
             label="建筑物情况"
@@ -1599,6 +1844,7 @@
             style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form4.tdzkName"
             name="审批或建设前土地状况"
             label="审批或建设前土地状况"
@@ -1610,7 +1856,7 @@
             v-model="form4.tdzk"
             style="display:none"
           />
-          <van-field name="radio" label="是否受过处罚">
+          <van-field name="radio" label="是否受过处罚" input-align="right">
             <template #input>
               <van-radio-group v-model="form4.sfsgcf" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1619,12 +1865,13 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form4.remark"
             name="备注"
             label="备注"
             placeholder="备注"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form4.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
+          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -1648,6 +1895,7 @@
       <div style="margin:20px;">
         <van-form @submit="onSubmithncy">
           <van-field
+            input-align="right"
             v-model="form5.nhdm"
             name="农户代码"
             label="农户代码"
@@ -1655,6 +1903,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form5.xm"
             name="姓名"
             label="姓名"
@@ -1662,31 +1911,41 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form5.zjlxName"
             name="证件类型"
             label="证件类型"
             placeholder="证件类型"
-            @click="hncyzjlx = true"
+            readonly
+            @click="showhncyzjlx = true"
           />
           <van-field
+            input-align="right"
             v-model="form5.zjlx"
             style="display:none"
           />
           <van-field
-            v-model="form5.yhzgx"
+            input-align="right"
+            v-model="form5.yhzgxName"
             name="与户主关系"
             label="与户主关系"
             placeholder="与户主关系"
+            readonly
             @click="showyhzgx = true"
           />
           <van-field
+            v-model="form5.yhzgx"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
             v-model="form5.zjhm"
             name="证件号码"
             label="证件号码"
             placeholder="证件号码"
             :rules="[{ required: true, message: '' }]"
           />
-          <van-field name="radio" label="性别">
+          <van-field name="radio" label="性别" input-align="right">
             <template #input>
               <van-radio-group v-model="form5.xb" direction="horizontal">
                 <van-radio name="1">男</van-radio>
@@ -1696,13 +1955,14 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="form5.lxdh"
             name="联系电话"
             label="联系电话"
             placeholder="联系电话"
             :rules="[{ required: true, message: '' }]"
           />
-          <van-field name="radio" label="户口类型">
+          <van-field name="radio" label="户口类型" input-align="right">
             <template #input>
               <van-radio-group v-model="form5.hklx" direction="horizontal">
                 <van-radio name="1">农业</van-radio>
@@ -1710,14 +1970,14 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field
-            v-model="form5.hyzk"
-            name="婚姻状况"
-            label="婚姻状况"
-            placeholder="婚姻状况"
-            @click="showhyzk = true"
-          />
-          <van-field name="radio" label="是否本集体经济组织成员">
+          <van-field name="radio" label="婚姻状况" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.hyzk" direction="horizontal">
+                <van-radio v-for="dict in hyzkOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否本集体经济组织成员" input-align="right">
             <template #input>
               <van-radio-group v-model="form5.sfbjtjjzzcy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -1726,23 +1986,76 @@
             </template>
           </van-field>
           <van-field
-            v-model="form5.cybz"
+            input-align="right"
+            v-model="form5.cybzName"
             name="成员备注"
             label="成员备注"
             placeholder="成员备注"
+            readonly
             :rules="[{ required: true, message: '' }]"
+            @click="showhncycybz = true"
+          />
+          <van-field
+            v-model="form5.cybz"
+            style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form5.cybzsm"
             name="成员备注说明"
             label="成员备注说明"
             placeholder="成员备注说明"
             :rules="[{ required: true, message: '' }]"
           />
-          <div style="margin: 16px;">
-            <van-button round block color="#7AC943" native-type="submit">保存</van-button>
-          </div>
-        </van-form>
+          <van-field
+            input-align="right"
+            v-model="form5.occupationName"
+            name="职业"
+            label="职业"
+            placeholder="职业"
+            required
+            readonly
+            :rules="[{ required: true, message: '' }]"
+            @click="showhncyoccupation = true"
+          />
+          <van-field
+            v-model="form5.occupation"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
+            v-model="form5.jzqkName"
+            name="居住情况"
+            label="居住情况"
+            placeholder="居住情况"
+            required
+            :rules="[{ required: true, message: '' }]"
+            @click="showhncyjzqk = true"
+          />
+          <van-field
+            v-model="form5.jzqk"
+            style="display:none"
+          />
+          <van-field name="radio" label="是否贫困户" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.sfpkh" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否五保户" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.sfwbh" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <div style="margin: 16px;">
+            <van-button round block color="#7AC943" native-type="submit">保存</van-button>
+          </div>
+        </van-form>
       </div>
     </van-popup>
     <van-popup v-model="showhncylist" style="height:100%;width:100%;">
@@ -1782,126 +2095,104 @@
         </div>
       </div>
     </van-popup>
-    <van-popup v-model="show3" style="height:100%;width:100%;">
-      <div class="bannerBg">
-        <van-nav-bar
-          style="background:transparent;border-bottom-width:0;"
-          @click-left="show1=!show1"
-        >
-          <template #left>
-            <van-icon name="arrow-left" size="18" color="#fff" />
-          </template>
-          <template #title>
-            <p style="color:#fff">农户信息</p>
-          </template>
-        </van-nav-bar>
-      </div>
-      <div style="margin:20px;">
-        <van-form @submit="onSubmit">
-          <p class="title" style="position:relative;padding-left:20px;line-height:32px;">户主信息</p>
-          <van-field
-            v-model="username"
-            name="户主名称"
-            label="户主名称"
-            placeholder="户主名称"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="password"
-            type="password"
-            name="证件类型"
-            label="证件类型"
-            placeholder="证件类型"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="password"
-            type="password"
-            name="证件号"
-            label="证件号"
-            placeholder="证件号"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field name="radio" label="性别">
-            <template #input>
-              <van-radio-group v-model="password" direction="horizontal">
-                <van-radio name="1">男</van-radio>
-                <van-radio name="2">女</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            v-model="password"
-            type="password"
-            name="电话"
-            label="电话"
-            placeholder="电话"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="password"
-            type="password"
-            name="户口类型"
-            label="户口类型"
-            placeholder="户口类型"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="password"
-            type="password"
-            name="权利人类型"
-            label="权利人类型"
-            placeholder="权利人类型"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="password"
-            type="password"
-            name="共有方式"
-            label="共有方式"
-            placeholder="共有方式"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="password"
-            type="password"
-            name="户主分摊宗地面积（㎡）"
-            label="户主分摊宗地面积"
-            placeholder="户主分摊宗地面积"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;">查看户主信息</van-button>
-          </div>
-          <div style="margin: 16px;">
-            <van-button round block color="#7AC943" native-type="submit">保存</van-button>
-          </div>
-        </van-form>
-      </div>
+    <van-popup v-model="showesign" position="bottom" closeable
+               close-icon="close">
+      <van-row style="margin:0 10%">
+        <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+      </van-row>
+      <van-row style="margin: 0 10% 10% 10%;border:1px solid #BFBFBF">
+        <vue-esign
+          ref="esign"
+          class="mySign"
+          :width="800"
+          :height="500"
+          :isCrop="isCrop"
+          :lineWidth="lineWidth"
+          :lineColor="lineColor"
+          :bgColor.sync="bgColor"
+        />
+      </van-row>
+      <img :src="resultImg" alt="" width="800" height="500" style="display:none"/>
+      <van-row type="flex" justify="center" style="margin-bottom:20px;">
+        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleReset">清空画板</van-button></van-col>
+        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存签名</van-button></van-col>
+      </van-row>
+    </van-popup>
+    <!--户内成员职业-->
+    <van-popup v-model="showhncyoccupation" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="occupationOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncyoccupation"
+        @cancel="showhncyoccupation = false"
+      />
+    </van-popup>
+    <!--户内成员成员备注-->
+    <van-popup v-model="showhncycybz" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="cybzOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncycybz"
+        @cancel="showhncycybz = false"
+      />
+    </van-popup>
+    <!--户内成员居住情况-->
+    <van-popup v-model="showhncyjzqk" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="jzqkOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncyjzqk"
+        @cancel="showhncyjzqk = false"
+      />
     </van-popup>
   </div>
 </template>
 
 <script>
-  import {listShyqr} from "@/api/homesteadSurvey/shyqr";
+  import {listShyqr,addShyqr,updateShyqr} from "@/api/homesteadSurvey/shyqr";
   import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
   import MapGisDrawing from "@/components/Map/MapGisDrawing";
   import {listZrz,addZrz,updateZrz,getZrzZjdDmList} from "@/api/homesteadSurvey/zrz";
   import {listNmfw,addNmfw,updateNmfw} from "@/api/homesteadSurvey/nmfw";
   import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr";
   import {listNhhncy,addNhhncy,updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
+  import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
   import {listFsss,addFsss,updateFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
+  import { Notify, Dialog, Toast } from 'vant';
   export default {
     name: "homesteadAdd",
     components: { MapGisDrawing,},
     data() {
       return {
         active:1,
+        // 电子签名
+        lineWidth: 6, // 画笔的线条粗细
+        lineColor: "#000000", // 画笔的颜色
+        bgColor: "", // 画布的背景颜色
+        resultImg: "", // 最终画布生成的base64图片
+        isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        showdj:false,
+        showesign:false,
+        showsyqrnhdmlist:false,
+        showzrzfwjg:false,
+        showzrzh:false,
+        showyt:false,
+        showqllx:false,
+        showqlxz:false,
+        showqlsdfs:false,
+        showhzjzhcssfyzf:false,
+        showhncycybz:false,
+        showhncyoccupation:false,
+        showhncyjzqk:false,
+        showhzoccupation:false,
+        showhzjzqk:false,
         showhncyzjlx:false,
         showyhzgx:false,
-        showhyzk:false,
         showqlrlx:false,
         showshyqrdbzjlx:false,
         showgyfs:false,
@@ -1959,6 +2250,8 @@
         form5:{},
         // 使用权人列表
         syqrlist:[],
+        // 使用权人农户代码列表
+        syqrnhdmlist:[],
         // 户内成员列表
         hncylist:[],
         // 自然幢列表
@@ -2021,6 +2314,26 @@
         zjlxOptions:[],
         // 与户主关系字典
         yhzgxOptions:[],
+        // 权利类型字典
+        qllxOptions:[],
+        // 权利性质字典
+        qlxzOptions:[],
+        // 权利设定方式字典
+        qlsdfsOptions:[],
+        // 用途字典
+        ytOptions:[],
+        // 职业字典
+        occupationOptions:[],
+        // 集镇或城市是否有住房
+        jzhcssfyzfOptions:[],
+        // 婚姻状况
+        hyzkOptions:[],
+        // 成员备注字典
+        cybzOptions:[],
+        // 居住情况字典
+        jzqkOptions:[],
+        // 土地等级字典
+        tddjOptions:[],
       };
     },
     created(){
@@ -2092,22 +2405,138 @@
       this.getDicts("family_status").then(response => {
         this.yhzgxOptions = response.data;
       });
+      this.getDicts("rights_nature").then(response => {
+        this.qlxzOptions = response.data;
+      });
+      this.getDicts("rights_type").then(response => {
+        this.qllxOptions = response.data;
+      });
+      this.getDicts("right_setting_mode").then(response => {
+        this.qlsdfsOptions = response.data;
+      });
+      this.getDicts("land_use").then(response => {
+        this.ytOptions = response.data;
+      });
+      this.getDicts("jzhcssfyzf").then(response => {
+        this.jzhcssfyzfOptions = response.data;
+      });
+      this.getDicts("occupation").then(response => {
+        this.occupationOptions = response.data;
+      });
+      this.getDicts("hyzk").then(response => {
+        this.hyzkOptions = response.data;
+      });
+      this.getDicts("cybz").then(response => {
+        this.cybzOptions = response.data;
+      });
+      this.getDicts("living_condition").then(response => {
+        this.jzqkOptions = response.data;
+      });
+      this.getDicts("tddj").then(response => {
+        this.tddjOptions = response.data;
+      });
+      this.getnhdmlist()
       this.getZjd()
     },
     mounted(){
       this.mapClickLoading();
     },
     methods: {
+      // 验证
+      validator(val){
+        console.log(val.length)
+        if(val>1||val<0||val.length>4){
+          return false
+        }else{
+          return true
+        }
+      },
+      validator1(val){
+        console.log(val.length)
+        if(val>1||val<0||val.length>4){
+          return false
+        }else{
+          return true
+        }
+      },
+      // 所有权人农户代码列表
+      getnhdmlist(){
+        let params = {
+          "deptId" : this.item.deptId
+        }
+        listNh(params).then((response) => {
+          this.syqrnhdmlist = response.rows
+        });
+      },
+      // 删除附属设施
+      deletefsss(){
+        Dialog.confirm({
+          title: '标题',
+          message: '弹窗内容',
+        })
+          .then(() => {
+            // on confirm
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },// 删除自然幢
+      deletezrz(){
+        Dialog.confirm({
+          title: '标题',
+          message: '弹窗内容',
+        })
+          .then(() => {
+            // on confirm
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
+      // 删除使用权人
+      deletesyqr(){
+        Dialog.confirm({
+          title: '标题',
+          message: '弹窗内容',
+        })
+          .then(() => {
+            // on confirm
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
+
       // 与户主关系翻译
       yhzgxfy(value){
         let label
         this.yhzgxOptions.map(res => {
-          if(res.dictValue = value){
+          if(res.dictValue ==value){
              label = res.dictLabel
           }
         })
         return label
       },
+      // 附属设施类型翻译
+      fssslxfy(value){
+        let label
+        this.fssslxOptions.map(res => {
+          if(res.dictValue ==value){
+            label = res.dictLabel
+          }
+        })
+        return label
+      },
+      // 建筑物情况翻译
+      jzwqkfy(value){
+        let label
+        this.jzwqkOptions.map(res => {
+          if(res.dictValue ==value){
+            label = res.dictLabel
+          }
+        })
+        return label
+      },
       // 图片上传前
       beforeReadzjd(file){
         // 创建Canvas对象(画布)
@@ -2141,7 +2570,6 @@
           const data2 = new FormData();
           data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
           uploadFile(data2).then(res => {
-            console.log(res);
             if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){
               this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName
             }else{
@@ -2149,7 +2577,6 @@
             }
           })
         }
-
       },
       // 图片删除
       deleteFilezjd(file){
@@ -2208,24 +2635,91 @@
         this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url,"")
         this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url1,"")
       },
+      // 使用权人农户代码弹出框
+      onConfirmsyqrnhdmlist(value){
+        this.form1.nhdm = value.nhdm
+        this.form1.shyqrdbxm = value.hzxm
+        this.form1.shyqrdbzjhm = value.hzzjhm
+        this.form1.shyqrdbzjlx = value.hzzjlx
+        this.zjlxOptions.map(res => {
+          if(res.dictValue == this.form1.shyqrdbzjlx){
+            this.form1.shyqrdbzjlxName = res.dictLabel
+          }
+        })
+        this.showsyqrnhdmlist = false
+      },
+      // 宅基地等级弹出框
+      onConfirmdj(value){
+        this.form.djName = value.dictLabel
+        this.form.dj = value.dictValue
+        this.showdj= false
+      },
+      // 户内成员职业弹出框
+      onConfirmhncyoccupation(value){
+        this.form5.occupationName = value.dictLabel
+        this.form5.occupation = value.dictValue
+        this.showhncyoccupation = false
+      },
+      // 户内成员成员备注弹出框
+      onConfirmhncycybz(value){
+        this.form5.cybzName = value.dictLabel
+        this.form5.cybz = value.dictValue
+        this.showhncycybz= false
+      },
+      // 户内成员居住情况弹出框
+      onConfirmhncyjzqk(value){
+        this.form5.jzqkName = value.dictLabel
+        this.form5.jzqk = value.dictValue
+        this.showhncyjzqk = false
+      },
+      // 自然幢房屋结构弹出框
+      onConfirmzrzfwjg(value){
+        this.form3.fwjgName = value.dictLabel
+        this.form3.fwjg = value.dictValue
+        this.showzrzfwjg = false
+      },
+      // 户内成员自然幢号弹出框
+      onConfirmzrzh(value){
+        this.nmfwform.zrzh = value.zrzh
+        this.showzrzh = false
+      },
       // 户内成员证件类型弹出框
-      onConfirmhncyzjlx(){
+      onConfirmhncyzjlx(value){
         this.form5.zjlxName = value.dictLabel
         this.form5.zjlx = value.dictValue
         this.showhncyzjlx = false
       },
+      // 宅基地用途弹出框
+      onConfirmyt(value){
+        this.form.ytName = value.dictLabel
+        this.form.yt = value.dictValue
+        this.showyt = false
+      },
+      // 宅基地权利类型弹出框
+      onConfirmqllx(value){
+        this.form.qllxName = value.dictLabel
+        this.form.qllx = value.dictValue
+        this.showqllx = false
+      },
+      // 宅基地权利性质弹出框
+      onConfirmqlxz(value){
+        this.form.qlxzName = value.dictLabel
+        this.form.qlxz = value.dictValue
+        this.showqlxz = false
+      },
+      // 宅基地权利设定方式弹出框
+      onConfirmqlsdfs(value){
+        this.form.qlsdfsName = value.dictLabel
+        this.form.qlsdfs = value.dictValue
+        this.showqlsdfs = false
+      },
       // 户内成员与户主关系弹出框
-      onConfirmyhzgx(){
+      onConfirmyhzgx(value){
+        console.log(value)
         this.form5.yhzgxName = value.dictLabel
         this.form5.yhzgx = value.dictValue
         this.showyhzgx = false
       },
-      // 户内成员婚姻状态弹出框
-      onConfirmhyzk(){
-        this.form5.hyzkName = value.dictLabel
-        this.form5.hyzk = value.dictValue
-        this.showhyzk = false
-      },
       // 使用权人权利人类型弹出框
       onConfirmqlrlx(value){
         this.form1.qlrlxName = value.dictLabel
@@ -2449,7 +2943,6 @@
           let params = {
             "zjddm":this.item.zjddm
           }
-          console.log(this.item.zjddm)
           listZjdzd(params).then(response => {
             this.form = response.rows[0];
             this.fileListzjd = []
@@ -2462,6 +2955,43 @@
                 this.form.sjlyName = res.dictLabel
               }
             })
+            this.lyzkOptions.map(res => {
+              if(res.dictValue == this.form.lyzk){
+                this.form.lyzkName = res.dictLabel
+              }
+            })
+            this.qllxOptions.map(res => {
+              if(res.dictValue == this.form.qllx){
+                this.form.qllxName = res.dictLabel
+              }
+            })
+            this.qlxzOptions.map(res => {
+              if(res.dictValue == this.form.qlxz){
+                this.form.qlxzName = res.dictLabel
+              }
+            })
+            this.qlsdfsOptions.map(res => {
+              if(res.dictValue == this.form.qlsdfs){
+                this.form.qlsdfsName = res.dictLabel
+              }
+            })
+            this.ytOptions.map(res => {
+              if(res.dictValue == this.form.yt){
+                this.form.ytName = res.dictLabel
+              }
+            })
+          });
+        }else{
+          let params = {
+            "deptId" : this.item.deptId
+          }
+          listSuyqr(params).then((response) => {
+            this.form = {}
+            this.form.deptId = this.item.deptId
+            if(response.rows.length>0){
+              console.log(response.rows[0].suyqrdm)
+              this.form.suyqrdm = response.rows[0].suyqrdm
+            }
           });
         }
       },
@@ -2509,7 +3039,7 @@
       },
       onSubmithncy(){
         if (this.form5.id != null) {
-          updateHncy(this.form5).then(response => {
+          updateNhhncy(this.form5).then(response => {
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标
@@ -2518,16 +3048,16 @@
               onClose:function(){
                 _this.showhncy = false
                 let params = {
-                  "nhdm":this.form5.nhdm
+                  "nhdm":_this.form5.nhdm
                 }
                 listNhhncy(params).then((response) => {
-                  this.hncylist = response.rows
+                  _this.hncylist = response.rows
                 })
               }
             })
           });
         } else {
-          addHncy(this.form5).then(response => {
+          addNhhncy(this.form5).then(response => {
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标
@@ -2536,10 +3066,10 @@
               onClose:function(){
                 _this.showhncy = false
                 let params = {
-                  "nhdm":this.form5.nhdm
+                  "nhdm":_this.form5.nhdm
                 }
                 listNhhncy(params).then((response) => {
-                  this.hncylist = response.rows
+                  _this.hncylist = response.rows
                 })
               }
             })
@@ -2547,34 +3077,38 @@
         }
       },
       onSubmitsyqr(){
-        if (this.form1.id != null) {
-          updateSuyqr(this.form1).then(response => {
-            let _this =this
-            this.$toast({
-              icon: 'success', // 找到自己需要的图标
-              message: '修改成功',
-              duration:"1000",
-              onClose:function(){
-                _this.showsyqr = false
-                _this.active = 2
-                _this.getSyqrList()
-              }
-            })
-          });
-        } else {
-          addSuyqr(this.nmfwform).then(response => {
-            let _this =this
-            this.$toast({
-              icon: 'success', // 找到自己需要的图标
-              message: '保存成功',
-              duration:"1000",
-              onClose:function(){
-                _this.showsyqr = false
-                _this.active = 2
-                _this.getSyqrList()
-              }
-            })
-          });
+        if(this.form.id==null||this.form.id==""){
+          Notify({ type: 'danger', message: '请先保存宅基地信息' });
+        }else{
+          if (this.form1.id != null) {
+            updateShyqr(this.form1).then(response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '修改成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.showsyqr = false
+                  _this.active = 2
+                  _this.getSyqrList()
+                }
+              })
+            });
+          } else {
+            addShyqr(this.form1).then(response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.showsyqr = false
+                  _this.active = 2
+                  _this.getSyqrList()
+                }
+              })
+            });
+          }
         }
       },
       onSubmitnmfw(){
@@ -2650,7 +3184,8 @@
               message: '修改成功',
               duration:"1000",
               onClose:function(){
-                _this.active = 2
+                _this.showfsss = false;
+                _this.getFsssList()
               }
             })
           });
@@ -2662,7 +3197,9 @@
               message: '保存成功',
               duration:"1000",
               onClose:function(){
-                _this.active = 2
+                _this.showfsss = false;
+                _this.getFsssList()
+
               }
             })
           });
@@ -2696,18 +3233,38 @@
         }
       },
       showPopupsyqr(item) {
-        if(item==""){
-          this.form1={}
-          this.form1.zjddm = this.item.zjjdm
+        if(this.form.id==null||this.form.id==""){
+          Notify({ type: 'danger', message: '请先保存宅基地信息' });
         }else{
-          this.form1 = item
-          this.sjlyOptions.map(res => {
-            if(res.dictValue == this.form1.sjly){
-              this.form1.sjlyName = res.dictLabel
-            }
-          })
+          if(item==""){
+            this.form1={}
+            this.form1.zjddm = this.item.zjddm
+            this.form1.suyqrdm = this.form.suyqrdm
+          }else{
+            this.form1 = item
+            this.sjlyOptions.map(res => {
+              if(res.dictValue == this.form1.sjly){
+                this.form1.sjlyName = res.dictLabel
+              }
+            })
+            this.zjlxOptions.map(res => {
+              if(res.dictValue == this.form1.shyqrdbzjlx){
+                this.form1.shyqrdbzjlxName = res.dictLabel
+              }
+            })
+            this.qlrlxOptions.map(res => {
+              if(res.dictValue == this.form1.qlrlx){
+                this.form1.qlrlxName = res.dictLabel
+              }
+            })
+            this.gyfsOptions.map(res => {
+              if(res.dictValue == this.form1.gyfs){
+                this.form1.gyfsName = res.dictLabel
+              }
+            })
+          }
+          this.showsyqr = true;
         }
-        this.showsyqr = true;
       },
       showPopuphncy(item){
         if(item==""){
@@ -2715,25 +3272,68 @@
           this.form5.nhdm = item.nhdm
         }else{
           this.form5 = item
+          this.jzhcssfyzfOptions.map(res => {
+            if(res.dictValue == item.jzhcssfyzf){
+              this.form5.jzhcssfyzfName = res.dictLabel
+            }
+          })
+          this.zjlxOptions.map(res => {
+            if(res.dictValue == item.zjlx){
+              this.form5.zjlxName = res.dictLabel
+            }
+          })
+          this.occupationOptions.map(res => {
+            if(res.dictValue == item.occupation){
+              this.form5.occupationName = res.dictLabel
+            }
+          })
+          this.jzqkOptions.map(res => {
+            if(res.dictValue == item.jzqk){
+              this.form5.jzqkName = res.dictLabel
+            }
+          })
+          this.yhzgxOptions.map(res => {
+            if(res.dictValue == item.yhzgx){
+              this.form5.yhzgxName = res.dictLabel
+            }
+          })
+          this.cybzOptions.map(res => {
+            if(res.dictValue == item.cybz){
+              this.form5.cybzName = res.dictLabel
+            }
+          })
         }
         this.showhncy = true
       },
       showPopupzrz(item) {
-        if(item==""){
-          this.form3={}
-          this.form3.zjddm = this.item.zjjdm
+        if(this.form.id==null||this.form.id==""){
+          Notify({ type: 'danger', message: '请先保存宅基地信息' });
         }else{
-          this.form3 = item
-          this.sjlyOptions.map(res => {
-            if(res.dictValue == this.form3.sjly){
-              this.form3.sjlyName = res.dictLabel
-            }
-          })
+          if(item==""){
+            this.form3={}
+            this.form3.zjddm = this.item.zjddm
+            this.form3.deptId = this.item.deptId
+          }else{
+            this.form3 = item
+            this.sjlyOptions.map(res => {
+              if(res.dictValue == this.form3.sjly){
+                this.form3.sjlyName = res.dictLabel
+              }
+            })
+            this.fwjgOptions.map(res => {
+              if(res.dictValue == this.form3.fwjg){
+                this.form3.fwjgName = res.dictLabel
+              }
+            })
+          }
+          this.showzrz = true;
+          this.mapClickLoading();
         }
-        this.showzrz = true;
-        this.mapClickLoading();
       },
       showPopupfw(item) {
+        if(this.zrzlist.length==0){
+          Notify({ type: 'danger', message: '请先添加自然幢信息' });
+        }else{
         this.showfw = true;
         if(item==""){
           this.nmfwform={}
@@ -2745,23 +3345,31 @@
               this.nmfwform.sjlyName = res.dictLabel
             }
           })*/
-        }
+        }}
       },
       showPopuphncylist(item){
-        this.showhncylist = true;
-        if(item==""){
-          this.hncylist=[]
+        console.log(item)
+        if(item.nhdm==null||item.nhdm==""){
+          Notify({ type: 'danger', message: '使用权人农户代码不能为空' });
         }else{
-          this.hncylist=[]
-          let params = {
-            "nhdm":item.nhdm
+          this.showhncylist = true;
+          if(item==""){
+            this.hncylist=[]
+          }else{
+            this.hncylist=[]
+            let params = {
+              "nhdm":item.nhdm
+            }
+            listNhhncy(params).then((response) => {
+              this.hncylist = response.rows
+            })
           }
-          listNhhncy(params).then((response) => {
-            this.hncylist = response.rows
-          })
         }
+
       },
-      showPopupfsss(item) {
+      showPopupfsss(item) {if(this.form.id==null||this.form.id==""){
+        Notify({ type: 'danger', message: '请先保存宅基地信息' });
+      }else{
         if(item==""){
           this.form4={}
         }else{
@@ -2798,7 +3406,7 @@
           })
         }
         this.showfsss = true;
-        this.mapClickLoading();
+        this.mapClickLoading();}
       },
       showPopup3() {
         this.show3 = true;
@@ -2817,13 +3425,118 @@
       changeActiveBack(){
         if(this.active>1){
           this.active-=1
-          this.mapClickLoading();
         }else{
           this.active=1
-          this.mapClickLoading();
         }
       },
+      // 清空画板
+      handleReset() {
+        this.$refs.esign.reset();
+      },
+      // 图片上传前
+      beforeRead(file){
+        // 创建Canvas对象(画布)
+        let canvas =  document.createElement('canvas')
+        // 获取对应的CanvasRenderingContext2D对象(画笔)
+        let context = canvas.getContext('2d')
+        // 创建新的图片对象
+        let img = new Image()
+        // 指定图片的DataURL(图片的base64编码数据)
+        img.src = file.content
+        // 监听浏览器加载图片完成，然后进行进行绘制
+        const height = 166
+        const width = 316
+        img.onload = () => {
+          const h = img.height
+          const w = img.width
+          let ch = img.height/2
+          let cw = img.width/2
+          let canvas = document.createElement('canvas')
+          let ctx = canvas.getContext('2d')
+          canvas.height = ch
+          canvas.width = cw
+          ctx.clearRect(0,0,cw,ch)
+          ctx.drawImage(img,0,0,cw,ch)
+          let base_img = canvas.toDataURL('image/jpeg')
+          const blobBin = atob(base_img.split(',')[1])
+          let d = []
+          for (let i=0;i<blobBin.length;i++){
+            d.push(blobBin.charCodeAt(i))
+          }
+          const data2 = new FormData();
+          data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
+          uploadFile(data2).then(res => {
+            if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){
+              this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName
+            }else{
+              this.form.zjdxctp =  res.fileName
+            }
+          })
+        }
+      },
+      // 生成签字图
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.resultImg = res;
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$message({
+              type: "warning",
+              message: "请签名后再生成签字图片",
+            });
+          });
+
+        // 在这里向后端发请求把转换后的base64文件传给后端，后端接收以后再转换成图片做静态图片存储
+        // 当然也可以把base64转成流文件blob格式的，类似上传给后端这样，具体哪种方式看后端要求
+        setTimeout(() => {
+          // 这里要使用定时器稍微延后以后就能取到base64数据了，当然也可以再加一个确认按钮，如：确认使用这张base64签名图片
+          // 点击确认以后，在其回调函数中，再把base64的签名图片传给后端用于存储
+          const blobBin = atob(this.resultImg.split(',')[1])
+          let d = []
+          for (let i=0;i<blobBin.length;i++){
+            d.push(blobBin.charCodeAt(i))
+          }
+          const data2 = new FormData();
+          data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
+          uploadFile(data2).then(res => {
+            this.form.dzqm = res.fileName
+            this.form.houseDataConfirmStatus = "CONFIRMED"
+            if (this.form.id != null) {
+              updateZjdzd(this.form).then(response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '修改成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.goBack();
+                  }
+                })
+              });
+            } else {
+              addZjdzd(this.form).then(response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.goBack();
+                  }
+                })
+              });
+            }
+          })
+        }, 200);
+        /*this.showesign = false;*/
+      },
       searchCommit(){
+        this.showesign = true
+      },
+      searchCommit1(){
         this.form.houseDataConfirmStatus = "CONFIRMED"
         if (this.form.id != null) {
           updateZjdzd(this.form).then(response => {
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index eec42d7f..aa24bda6 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -33,7 +33,7 @@
               @click="active=1"
             />
           </van-badge>
-          <p>全部任务</p>
+          <p id="basetext">全部任务</p>
         </van-col>
         <van-col span="8">
           <van-badge :content="done">
@@ -64,56 +64,64 @@
       </div>
 
     <div v-if="active==1" style="height:calc( 100vh - 350px);overflow-y:auto;">
-      <van-cell  v-for="(item,index) in totalList" :key="index" :title="item.deptName" size="small" @click.native="setCookies(item)" :to="{name:'homesteadList'}"style="border-radius: 16px;
+      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
+      <van-cell  v-for="(item,index) in totalList" :key="item.id" :title="item.deptName" size="small" @click.native="setCookies(item)" :to="{name:'homesteadList'}"style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #default>
+          <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
         </template>
         <template #label>
-          开始时间:{{item.planBeginTime}} 结束时间：{{item.planEndTime}}
+          开始时间:{{item.planBeginTime}}<br/> 结束时间:{{item.planEndTime}}
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
         </template>
       </van-cell>
+      </van-pull-refresh>
     </div>
     <div v-if="active==2" style="height:calc( 100vh - 350px);overflow-y:auto;">
-      <van-cell  v-for=" (item,index) in doneList" :key="index" :title="item.deptName" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
+      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
+      <van-cell  v-for=" (item,index) in doneList" :key="item.id" :title="item.deptName" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #default>
+          <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
         </template>
         <template #label>
-          开始时间:{{item.planBeginTime}}
+          开始时间:{{item.planBeginTime}}<br/> 结束时间:{{item.planEndTime}}
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
         </template>
       </van-cell>
+      </van-pull-refresh>
     </div>
     <div v-if="active==3" style="height:calc( 100vh - 350px);overflow-y:auto;">
-      <van-cell  v-for=" (item,index) in todoList" :key="index" :title="item.deptName" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
+      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
+      <van-cell  v-for=" (item,index) in todoList" :key="item.id" :title="item.deptName" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #default>
-        </template>
+          <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
+          </template>
         <template #label>
-          开始时间:{{item.planBeginTime}}
+          开始时间:{{item.planBeginTime}}<br/> 结束时间:{{item.planEndTime}}
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
         </template>
       </van-cell>
+      </van-pull-refresh>
     </div>
-
   </div>
 </template>
 
 <script>
   import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask} from "@/api/homesteadSurvey/index";
   import {getInfo} from "../../api/login";
-  // import circleProccess from "@/components/circleProccess.vue";
+   import CircleProccess from "@/components/circleProccess.vue";
     export default {
       name: "homesteadIndex",
       components: {
-        // circleProccess
+        CircleProccess
       },
       data() {
         return {
@@ -133,23 +141,15 @@
           todoList:[],
           // 查询参数
           queryParams: {
-            // 分页
-            pageNum: 1,
-            pageSize: 10,
-            // 查询排序
-            orderByColumn: "id",
-            isAsc: "desc",
-            deptId: null,
-            deptName: null,
-            title: null,
-            createUserId: null,
-            updateUserId: null,
             taskStatus: null,
             taskPublishStatus:"PUBLISHED",
-
           },
           nickName:"",
           text:0,
+          isLoadingtask:false,
+          countqb:0,
+          countyhc:0,
+          countwhc:0,
         };
       },
       mounted(){
@@ -170,6 +170,55 @@
         this.getList();
       },
       methods: {
+        onRefreshtask(){
+          this.isLoadingtask = false;
+          let _this = this
+          if(this.active==1){
+            let params = {
+              "taskStatus": "FINISHED",
+              "taskPublishStatus":"PUBLISHED",
+              "pageNum": this.countyhc+1,
+              "pageSize":10,
+            }
+            listTask(params).then((response) => {
+              if(response.rows.length>0&&this.doneList.length<response.total){
+                response.rows.map(res => {
+                  this.doneList.unshift(res)
+                })
+                this.countyhc++
+              }
+            });
+          }else if(this.active==2){
+            let params = {
+              "taskStatus": "UNFINISHED",
+              "taskPublishStatus":"PUBLISHED",
+              "pageNum": this.countwhc+1,
+              "pageSize":10,
+            }
+            listTask(params).then((response) => {
+              if(response.rows.lenght>0&&this.todoList.length<response.total){
+                response.rows.map(res => {
+                  this.todoList.unshift(res)
+                })
+                this.countwhc++
+              }
+            });
+          }else{
+            let params = {
+              "taskPublishStatus":"PUBLISHED",
+              "pageNum": this.countqb+1,
+              "pageSize":10,
+            }
+            listTask(params).then((response) => {
+              if(response.rows.length>0&&this.totalList.length<response.total){
+                response.rows.map(res => {
+                  this.totalList.unshift(res)
+                })
+                this.countqb++
+              }
+            });
+          }
+        },
         setCookies(item){
           this.$cookies.set("item",JSON.stringify(item));
         },
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 09b711d3..47eac7c8 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="app-container">
+    <van-sticky>
     <div class="bannerBg" style="">
       <van-nav-bar
         style="background:transparent;border-bottom-width:0;"
         @click-left="onClickLeft"
       >
         <template #left>
-          <van-icon name="arrow-left" size="18" color="#fff" />
+          <van-icon name="arrow-left" size=".5rem" color="#fff" />
         </template>
         <template #title>
           <p style="color:#fff">{{item.deptName}}</p>
@@ -14,85 +15,95 @@
       </van-nav-bar>
       <div style="display:flex;width:94%;margin:0 auto;justify-content:space-between;padding: 10px 0">
         <div style="display:flex;width:90%;margin:0 auto;">
-          <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="activeBtn=1"><van-icon size="20" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn1'+(activeBtn!=1?'1':'')+'.png')" />
+          <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="activeBtn=1"><van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn1'+(activeBtn!=1?'1':'')+'.png')" />
             入户核查
           </div>
-          <div :class="{activeBtn : activeBtn==2,disactiveBtn :activeBtn!=2 }" @click="activeBtn=2,getNh()"><van-icon size="20" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn2'+(activeBtn!=2?'2':'')+'.png')" />
+          <div :class="{activeBtn : activeBtn==2,disactiveBtn :activeBtn!=2 }" @click="activeBtn=2,getNh()"><van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn2'+(activeBtn!=2?'2':'')+'.png')" />
             农户信息
           </div>
-          <div :class="{activeBtn : activeBtn==3,disactiveBtn :activeBtn!=3 }" @click="activeBtn=3,getSyqr()"> <van-icon size="20" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn3'+(activeBtn!=3?'3':'')+'.png')" />
+          <div :class="{activeBtn : activeBtn==3,disactiveBtn :activeBtn!=3 }" @click="activeBtn=3,getSyqr()"> <van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn3'+(activeBtn!=3?'3':'')+'.png')" />
             所有权人
           </div>
           <div :class="{activeBtn : activeBtn==4,disactiveBtn :activeBtn!=4 }"  @click="activeBtn=4,mapShow()">
-            <van-icon size="20" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn4'+(activeBtn!=4?'4':'')+'.png')" />
+            <van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn4'+(activeBtn!=4?'4':'')+'.png')" />
             切换地图
           </div>
         </div>
       </div>
     </div>
+    </van-sticky>
     <div v-if="activeBtn==1">
       <van-search v-model="zjdvalue" placeholder="请输入搜索关键词" show-action @search="onSearchzjd">
         <template #action>
-          <van-icon name="add" color="rgba(122,201,67,1)" size="55" @click="onClickzjd" style="vertical-align:middle;"/>
+          <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickzjd" style="vertical-align:middle;"/>
         </template>
       </van-search>
-      <van-tabs v-model="active" sticky title-active-color="#7AC943" color="#7AC943" swipeable @click="getZjdList">
+      <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" swipeable @click="getZjdList">
         <van-tab title="全部" >
+          <van-pull-refresh v-model="isLoadingzjd" @refresh="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>
-              <p style="color:#22B7F2">{{item.syqr}}</p>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{item.syqr}}</p>
+              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">暂无使用权人</p>
             </template>
             <template #default>
               <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
               <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
             </template>
             <template #label>
-              <p>宅基地代码  {{item.zjddm}} </p>
-              <p>宗地面积 {{item.zdmj}}㎡ </p>
+              <p>宅基地代码:  {{item.zjddm}} </p>
+              <p>宗地面积: {{item.zdmj}}㎡ </p>
             </template>
             <template #icon>
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
+          </van-pull-refresh>
         </van-tab>
         <van-tab title="已核查" >
+          <van-pull-refresh v-model="isLoadingzjd" @refresh="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>
-              <p style="color:#22B7F2">{{item.syqr}}</p>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{item.syqr}}</p>
+              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">暂无使用权人</p>
             </template>
             <template #default>
               <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
               <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
             </template>
             <template #label>
-              <p>宅基地代码  {{item.zjddm}} </p>
-              <p>宗地面积 {{item.zdmj}}㎡ </p>
+              <p>宅基地代码:  {{item.zjddm}} </p>
+              <p>宗地面积: {{item.zdmj}}㎡ </p>
             </template>
             <template #icon>
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
+          </van-pull-refresh>
         </van-tab>
         <van-tab title="未核查">
+          <van-pull-refresh v-model="isLoadingzjd" @refresh="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>
-              <p style="color:#22B7F2">{{item.syqr}}</p>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{item.syqr}}</p>
+              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">暂无使用权人</p>
             </template>
             <template #default>
               <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
               <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
             </template>
             <template #label>
-              <p>宅基地代码  {{item.zjddm}} </p>
-              <p>宗地面积 {{item.zdmj}}㎡ </p>
+              <p>宅基地代码:  {{item.zjddm}} </p>
+              <p>宗地面积: {{item.zdmj}}㎡ </p>
             </template>
             <template #icon>
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
+          </van-pull-refresh>
         </van-tab>
       </van-tabs>
     </div>
@@ -102,6 +113,7 @@
           <van-icon name="add" color="rgba(122,201,67,1)" size="55" @click="onClicknh" style="vertical-align:middle;"/>
         </template>
       </van-search>
+      <van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">
       <van-cell  v-for="(item,index) in nhlist" :key="index" size="small"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #title>
           <p style="color:#22B7F2">{{item.hzxm}}</p>
@@ -110,13 +122,14 @@
           <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;" @click="showPopupnh(item)">查看详情</van-button>
         </template>
         <template #label>
-          <p>证件号码&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{item.hzzjhm}} </p>
-          <p>农户代码&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{item.nhdm}}</p>
+          <p>证件号码:&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{item.hzzjhm}} </p>
+          <p>农户代码:&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{item.nhdm}}</p>
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
         </template>
       </van-cell>
+      </van-pull-refresh>
     </div>
     <div v-if="activeBtn==3">
       <van-form @submit="onSubmitsyqr">
@@ -163,7 +176,7 @@
             v-model="qlrform.suyqxz"
             style="display:none"
           />
-          <van-popup v-model="showsuyqxz" position="bottom">
+          <van-popup v-model="showsuyqxz" position="bottom" input-align="right">
             <van-picker
               show-toolbar
               :columns="suyqxzOptions"
@@ -195,7 +208,7 @@
             :rules="[{ required: true, message: '' }]"
             @click="showdbrzjlx = true"
           />
-          <van-popup v-model="showdbrzjlx" position="bottom">
+          <van-popup v-model="showdbrzjlx" position="bottom" input-align="right">
             <van-picker
               show-toolbar
               :columns="zjlxOptions"
@@ -266,7 +279,7 @@
             input-align="right"
             @click="showdlrzjlx = true"
           />
-          <van-popup v-model="showdlrzjlx" position="bottom">
+          <van-popup v-model="showdlrzjlx" position="bottom" input-align="right">
             <van-picker
               show-toolbar
               :columns="zjlxOptions"
@@ -346,7 +359,7 @@
           v-model="qlrform.sjly"
           style="display:none"
         />
-        <van-popup v-model="showsjly" position="bottom">
+        <van-popup v-model="showsjly" position="bottom" input-align="right">
           <van-picker
             show-toolbar
             :columns="sjlyOptions"
@@ -477,6 +490,7 @@
       <div style="margin:20px;">
         <van-form @submit="onSubmitnh">
           <van-field
+            input-align="right"
             v-model="nhform.suyqrdm"
             name="所有权人代码"
             label="所有权人代码"
@@ -484,6 +498,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="nhform.nhdm"
             name="农户代码"
             label="农户代码"
@@ -491,6 +506,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="nhform.hzxm"
             name="户主姓名"
             label="户主姓名"
@@ -498,6 +514,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="nhform.hzzjlxName"
             name="户主证件类型"
             label="户主证件类型"
@@ -512,24 +529,27 @@
           />
           <van-field
             v-model="nhform.hzzjhm"
+            input-align="right"
             name="户主证件号码"
             label="户主证件号码"
             placeholder="户主证件号码"
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="nhform.txdz"
             name="通讯地址"
             label="通讯地址"
             placeholder="通讯地址"
           />
           <van-field
+            input-align="right"
             v-model="nhform.hncysl"
             name="户内成员数量"
             label="户内成员数量"
             placeholder="户内成员数量"
           />
-          <van-field name="radio" label="婚姻状况">
+          <van-field name="radio" label="婚姻状况" input-align="right">
             <template #input>
               <van-radio-group v-model="nhform.hyzk" direction="horizontal">
                 <van-radio v-for="dict in hyzkOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
@@ -538,12 +558,71 @@
           </van-field>
 
           <van-field
+            input-align="right"
             v-model="nhform.phone"
             name="电话号码"
             label="电话号码"
             placeholder="电话号码"
           />
-          <van-field name="radio" label="是否贫困户">
+          <van-field
+            input-align="right"
+            v-model="nhform.occupationName"
+            name="职业"
+            label="职业"
+            placeholder="职业"
+            required
+            :rules="[{ required: true, message: '' }]"
+            @click="showhzoccupation = true"
+          />
+          <van-field
+            v-model="nhform.occupation"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
+            v-model="nhform.jzqkName"
+            name="居住情况"
+            label="居住情况"
+            placeholder="居住情况"
+            required
+            :rules="[{ required: true, message: '' }]"
+            @click="showhzjzqk = true"
+          />
+          <van-field
+            v-model="nhform.jzqk"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
+            v-model="nhform.jzhcssfyzfName"
+            name="在集镇或城市是否有住房"
+            label="在集镇或城市是否有住房"
+            placeholder="在集镇或城市是否有住房"
+            required
+            :rules="[{ required: true, message: '' }]"
+            @click="showhzjzhcssfyzf = true"
+          />
+          <van-field
+            v-model="nhform.jzhcssfyzf"
+            style="display:none"
+          />
+          <van-field name="radio" label="在其他村庄是否有住房" input-align="right">
+            <template #input>
+              <van-radio-group v-model="nhform.zqtczsfyzf" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否本村村民" input-align="right">
+            <template #input>
+              <van-radio-group v-model="nhform.sfbccm" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否贫困户" input-align="right">
             <template #input>
               <van-radio-group v-model="nhform.sfpkh" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -551,7 +630,7 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field name="radio" label="是否五保户">
+          <van-field name="radio" label="是否五保户" input-align="right">
             <template #input>
               <van-radio-group v-model="nhform.sfwbh" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -560,13 +639,14 @@
             </template>
           </van-field>
           <van-field
+            input-align="right"
             v-model="nhform.bz"
             name="备注"
             label="备注"
             placeholder="备注"
           />
           <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" native-type="button" @click="showhncylist=true">查看户内成员列表</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" native-type="button" @click="showPopuphncylist(nhform)">查看户内成员列表</van-button>
           </div>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
@@ -574,6 +654,16 @@
         </van-form>
       </div>
     </van-popup>
+    <!--集市或城市是否有住房-->
+    <van-popup v-model="showhzjzhcssfyzf" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="jzhcssfyzfOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzjzhcssfyzf"
+        @cancel="showhzjzhcssfyzf = false"
+      />
+    </van-popup>
     <!--户主证件类型-->
     <van-popup v-model="showhzzjlx" position="bottom">
       <van-picker
@@ -584,11 +674,82 @@
         @cancel="showhzzjlx = false"
       />
     </van-popup>
+    <!--户内成员证件类型-->
+    <van-popup v-model="showhncyzjlx" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="zjlxOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncyzjlx"
+        @cancel="showhncyzjlx = false"
+      />
+    </van-popup>
+    <!--户内成员与户主关系-->
+    <van-popup v-model="showhncyyhzgx" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="yhzgxOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncyyhzgx"
+        @cancel="showhncyyhzgx = false"
+      />
+    </van-popup>
+    <!--户内成员职业-->
+    <van-popup v-model="showhncyoccupation" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="occupationOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncyoccupation"
+        @cancel="showhncyoccupation = false"
+      />
+    </van-popup>
+    <!--户内成员成员备注-->
+    <van-popup v-model="showhncycybz" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="cybzOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncycybz"
+        @cancel="showhncycybz = false"
+      />
+    </van-popup>
+    <!--户内成员居住情况-->
+    <van-popup v-model="showhncyjzqk" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="jzqkOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncyjzqk"
+        @cancel="showhncyjzqk = false"
+      />
+    </van-popup>
+    <!--户主职业-->
+    <van-popup v-model="showhzoccupation" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="occupationOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzoccupation"
+        @cancel="showhzoccupation = false"
+      />
+    </van-popup>
+    <!--户主居住情况-->
+    <van-popup v-model="showhzjzqk" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="jzqkOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzjzqk"
+        @cancel="showhzjzqk = false"
+      />
+    </van-popup>
+
     <van-popup v-model="showhncylist" style="height:100%;width:100%;">
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showhncylist=!showhncylist"
+          @click-left="showhncylist=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -598,16 +759,17 @@
           </template>
         </van-nav-bar>
       </div>
-      <van-swipe-cell v-for="(item,index) in hncylist" :key="index" @click.native="showPopuphncy" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+      <van-swipe-cell v-for="(item,index) in hncylist" :key="index" @click.native="showPopuphncy(item)" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
         <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>
+            {{item.xm}}</p>
           <div style="display:flex;line-height:20px">
             <p style="flex:1;text-align:left;">证件号码</p>
-            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
+            <p  style="flex:1;text-align:right;">{{item.zjhm}}</p>
           </div>
           <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">权利人类型</p>
-            <p style="flex:1;text-align:right;">个人</p>
+            <p style="flex:1;text-align:left;">与户主关系</p>
+            <p style="flex:1;text-align:right;">{{yhzgxfy(item.yhzgx)}}</p>
           </div>
         </div>
         <template #right>
@@ -616,7 +778,7 @@
       </van-swipe-cell>
       <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
         <div style="text-align:center;" >
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopuphncy"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加户内成员信息</p>
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopuphncy('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加户内成员信息</p>
         </div>
       </div>
     </van-popup>
@@ -635,8 +797,9 @@
         </van-nav-bar>
       </div>
       <div style="margin:20px;">
-        <van-form @submit="onSubmit">
+        <van-form @submit="onSubmithncy">
           <van-field
+            input-align="right"
             v-model="form5.nhdm"
             name="农户代码"
             label="农户代码"
@@ -644,6 +807,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
+            input-align="right"
             v-model="form5.xm"
             name="姓名"
             label="姓名"
@@ -651,82 +815,144 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
-            v-model="form5.zjlx"
+            input-align="right"
+            v-model="form5.zjlxName"
             name="证件类型"
             label="证件类型"
             placeholder="证件类型"
             :rules="[{ required: true, message: '' }]"
+            @click="showhncyzjlx = true"
           />
           <van-field
-            v-model="form5.yhzgx"
+            v-model="form5.zjlx"
+            style="display:none"
+          />
+          <van-field
+            input-align="right"
+            v-model="form5.yhzgxName"
             name="与户主关系"
             label="与户主关系"
             placeholder="与户主关系"
             :rules="[{ required: true, message: '' }]"
+            @click="showhncyyhzgx = true"
+          />
+          <van-field
+            v-model="form5.yhzgx"
+            style="display:none"
           />
           <van-field
+            input-align="right"
             v-model="form5.zjhm"
             name="证件号码"
             label="证件号码"
             placeholder="证件号码"
             :rules="[{ required: true, message: '' }]"
           />
+          <van-field name="radio" label="性别" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.xb" direction="horizontal">
+                <van-radio name="1">男</van-radio>
+                <van-radio name="0">女</van-radio>
+                <van-radio name="2">未知</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
           <van-field
-            v-model="form5.xb"
-            name="性别"
-            label="性别"
-            placeholder="性别"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
+            input-align="right"
             v-model="form5.lxdh"
             name="联系电话"
             label="联系电话"
             placeholder="联系电话"
             :rules="[{ required: true, message: '' }]"
           />
+          <van-field name="radio" label="户口类型" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.hklx" direction="horizontal">
+                <van-radio name="1">农业</van-radio>
+                <van-radio name="0">非农业</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="婚姻状况" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.hyzk" direction="horizontal">
+                <van-radio v-for="dict in hyzkOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否本集体经济组织成员" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.sfbjtjjzzcy" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
           <van-field
-            v-model="form5.hklx"
-            name="户口类型"
-            label="户口类型"
-            placeholder="户口类型"
+            input-align="right"
+            v-model="form5.cybzName"
+            name="成员备注"
+            label="成员备注"
+            placeholder="成员备注"
             :rules="[{ required: true, message: '' }]"
+            @click="showhncycybz = true"
           />
           <van-field
-            v-model="form5.hyzk"
-            name="婚姻状况"
-            label="婚姻状况"
-            placeholder="婚姻状况"
-            :rules="[{ required: true, message: '' }]"
+            v-model="form5.cybz"
+            style="display:none"
           />
           <van-field
-            v-model="form5.jzwqk"
-            name="建筑物情况"
-            label="建筑物情况"
-            placeholder="建筑物情况"
+            input-align="right"
+            v-model="form5.cybzsm"
+            name="成员备注说明"
+            label="成员备注说明"
+            placeholder="成员备注说明"
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
-            v-model="form5.sfbjtjjzzcy"
-            name="是否本集体经济组织成员"
-            label="是否本集体经济组织成员"
-            placeholder="是否本集体经济组织成员"
+            input-align="right"
+            v-model="form5.occupationName"
+            name="职业"
+            label="职业"
+            placeholder="职业"
+            required
             :rules="[{ required: true, message: '' }]"
+            @click="showhncyoccupation = true"
           />
           <van-field
-            v-model="form5.cybz"
-            name="成员备注"
-            label="成员备注"
-            placeholder="成员备注"
-            :rules="[{ required: true, message: '' }]"
+            v-model="form5.occupation"
+            style="display:none"
           />
           <van-field
-            v-model="form5.cybzsm"
-            name="成员备注说明"
-            label="成员备注说明"
-            placeholder="成员备注说明"
+            input-align="right"
+            v-model="form5.jzqkName"
+            name="居住情况"
+            label="居住情况"
+            placeholder="居住情况"
+            required
             :rules="[{ required: true, message: '' }]"
+            @click="showhncyjzqk = true"
+          />
+          <van-field
+            v-model="form5.jzqk"
+            style="display:none"
           />
+          <van-field name="radio" label="是否贫困户" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.sfpkh" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否五保户" input-align="right">
+            <template #input>
+              <van-radio-group v-model="form5.sfwbh" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -767,6 +993,7 @@
     import { currentLocation,} from "@/api/homestead/index";
     import {listZjdzd,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
+    import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr} from "@/api/homesteadSurvey/shyqr";
     import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
     import {listZrz,getZrzZjdDmList} from "@/api/homesteadSurvey/zrz";
@@ -778,6 +1005,21 @@
       name: "homesteadList",
       data() {
         return {
+          showhncycybz:false,
+          showhncyzjlx:false,
+          showhncyyhzgx:false,
+          showhzjzhcssfyzf:false,
+          showhncyoccupation:false,
+          showhncyjzqk:false,
+          showhzoccupation:false,
+          showhzjzqk:false,
+          // 下拉刷新
+          isLoadingnh:false,
+          countnh:0,
+          isLoadingzjd:false,
+          countqb:0,
+          countyhc:0,
+          countwhc:0,
           // 使用权人表单弹出
           shownh:false,
           showhzht:false,
@@ -802,7 +1044,7 @@
           // 户内成员表单
           form5: {},
           // 户内成员列表
-          hncylist:[11,1,1],
+          hncylist:[],
           currentRate:20,
           geoJson:null,
           // 使用权人
@@ -827,6 +1069,16 @@
           hyzkOptions:[],
           // 数据来源字典
           sjlyOptions:[],
+          // 居住情况字典
+          jzqkOptions:[],
+          // 与户主关系字典
+          yhzgxOptions:[],
+          // 职业字典
+          occupationOptions:[],
+          // 集镇或城市是否有住房字典
+          jzhcssfyzfOptions:[],
+          // 成员备注字典
+          cybzOptions:[],
           columns:[],
           show1:false,
           showhzzjlx: false,
@@ -880,10 +1132,100 @@
         this.getDicts("hyzk").then(response => {
           this.hyzkOptions = response.data;
         });
+        this.getDicts("occupation").then(response => {
+          this.occupationOptions = response.data;
+        });
+        this.getDicts("living_condition").then(response => {
+          this.jzqkOptions = response.data;
+        });
+        this.getDicts("jzhcssfyzf").then(response => {
+          this.jzhcssfyzfOptions = response.data;
+        });
+        this.getDicts("family_status").then(response => {
+          this.yhzgxOptions = response.data;
+        });
+        this.getDicts("cybz").then(response => {
+          this.cybzOptions = response.data;
+        });
         this.item = this.$cookies.get("item");
         this.getZjdList();
       },
       methods: {
+        // 与户主关系翻译
+        yhzgxfy(value){
+          let label
+          this.yhzgxOptions.map(res => {
+            if(res.dictValue == value){
+              label = res.dictLabel
+            }
+          })
+          return label
+        },
+        onRefreshzjd(){
+          this.isLoadingzjd = false;
+          let _this = this
+          if(this.active==1){
+            let params = {
+              "deptId" : this.item.deptId,
+              "houseDataConfirmStatus" : "CONFIRMED",
+              "pageNum": this.countyhc+1,
+              "pageSize":10,
+            }
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list1.length<response.total){
+                  response.rows.map(res => {
+                    this.list1.unshift(res)
+                  })
+                  this.countyhc++
+                }
+            });
+          }else if(this.active==2){
+            let params = {
+              "deptId" : this.item.deptId,
+              "houseDataConfirmStatus" : "UNCONFIRMED",
+              "pageNum": this.countywhc+1,
+              "pageSize":10,
+            }
+            listZjdzd(params).then((response) => {
+                if(response.rows.lenght>0&&this.list2.length<response.total){
+                  response.rows.map(res => {
+                    this.list2.unshift(res)
+                  })
+                  this.countwhc++
+                }
+            });
+          }else{
+            let params = {
+              "deptId" : this.item.deptId,
+              "pageNum": this.countqb+1,
+              "pageSize":10,
+            }
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list.length<response.total){
+                  response.rows.map(res => {
+                    _this.list.unshift(res)
+                  })
+                  this.countqb++
+                }
+            });
+          }
+        },
+        onRefreshnh(){
+          this.isLoadingnh = false
+          let params = {
+            "deptId" : this.item.deptId,
+            "pageNum": this.countnh+1,
+            "pageSize":10,
+          }
+          listNh(params).then((response) => {
+            if(response.rows.length>0&&this.nhlist.length<response.total){
+              response.rows.map(res => {
+                this.nhlist.unshift(res)
+              })
+              this.countnh++
+            }
+          });
+        },
         setCookies(item){
           this.$cookies.set("search",JSON.stringify(item));
         },
@@ -901,6 +1243,46 @@
         onClickLeft(){
           this.$router.push('/homesteadSurvey/index');
         },
+        onConfirmhncycybz(value){
+          this.form5.cybzName = value.dictLabel
+          this.form5.cybz = value.dictValue
+          this.showhncycybz= false
+        },
+        onConfirmhzjzhcssfyzf(value){
+          this.nhform.jzhcssfyzfName = value.dictLabel
+          this.nhform.jzhcssfyzf = value.dictValue
+          this.showhzjzhcssfyzf= false
+        },
+        onConfirmhncyyhzgx(value){
+          this.form5.yhzgxName = value.dictLabel
+          this.form5.yhzgx = value.dictValue
+          this.showhncyyhzgx = false
+        },
+        onConfirmhncyzjlx(value){
+          this.form5.zjlxName = value.dictLabel
+          this.form5.zjlx = value.dictValue
+          this.showhncyzjlx = false
+        },
+        onConfirmhncyjzqk(value){
+          this.form5.jzqkName = value.dictLabel
+          this.form5.jzqk = value.dictValue
+          this.showhncyjzqk = false
+        },
+        onConfirmhzjzqk(value){
+          this.nhform.jzqkName = value.dictLabel
+          this.nhform.jzqk = value.dictValue
+          this.showhzjzqk = false
+        },
+        onConfirmhncyoccupation(value){
+          this.form5.occupationName = value.dictLabel
+          this.form5.occupation = value.dictValue
+          this.showhncyoccupation = false
+        },
+        onConfirmhzoccupation(value){
+          this.nhform.occupationName = value.dictLabel
+          this.nhform.occupation = value.dictValue
+          this.showhzoccupation = false
+        },
         onConfirmhzzjlx(value){
           this.nhform.hzzjlxName = value.dictLabel
           this.nhform.hzzjlx = value.dictValue
@@ -940,6 +1322,7 @@
               }
             );
           }else{
+            this.nhform.deptId = this.item.deptId
             addNh(this.nhform).then(
               response => {
                 let _this =this
@@ -1015,15 +1398,15 @@
           }
           listNh(params).then((response) => {
             this.nhlist = response.rows
-
           });
         },
         // 农户信息搜索框
         onSearchnh(){
           let params = {
             "deptId" : this.item.deptId,
-            "syqrValue" : this.nhvalue
+            "nhValue" : this.nhvalue
           }
+          console.log(params)
           listNh(params).then((response) => {
             this.nhlist = response.rows
           });
@@ -1065,23 +1448,89 @@
           }
         },
         // 户内成员弹窗
-        showPopuphncy(){
+        showPopuphncy(item){
           this.showhncy = true
+          if(item.id==null||item.id==""){
+            this.form5 = {}
+            this.form5.nhdm = this.nhform.nhdm
+          }else{
+            this.form5 = item
+            this.jzhcssfyzfOptions.map(res => {
+              if(res.dictValue == item.jzhcssfyzf){
+                this.form5.jzhcssfyzfName = res.dictLabel
+              }
+            })
+            this.zjlxOptions.map(res => {
+              if(res.dictValue == item.zjlx){
+                this.form5.zjlxName = res.dictLabel
+              }
+            })
+            this.occupationOptions.map(res => {
+              if(res.dictValue == item.occupation){
+                this.form5.occupationName = res.dictLabel
+              }
+            })
+            this.jzqkOptions.map(res => {
+              if(res.dictValue == item.jzqk){
+                this.form5.jzqkName = res.dictLabel
+              }
+            })
+            this.yhzgxOptions.map(res => {
+              if(res.dictValue == item.yhzgx){
+                this.form5.yhzgxName = res.dictLabel
+              }
+            })
+            this.cybzOptions.map(res => {
+              if(res.dictValue == item.cybz){
+                this.form5.cybzName = res.dictLabel
+              }
+            })
+          }
+        },
+        // 户内成员列表
+        showPopuphncylist(item){
+          this.showhncylist =  true
+          let params = {
+            "nhdm":item.nhdm
+          }
+          listNhhncy(params).then((response) => {
+            if (response.code == 200) {
+              this.hncylist = response.rows
+              console.log(this.hncylist)
+            }
+          });
         },
         showPopupnh(item){
           this.shownh = true
           this.nhform = item
+          this.jzhcssfyzfOptions.map(res => {
+            if(res.dictValue == item.jzhcssfyzf){
+              this.nhform.jzhcssfyzfName = res.dictLabel
+            }
+          })
           this.zjlxOptions.map(res => {
             if(res.dictValue == item.hzzjlx){
               this.nhform.hzzjlxName = res.dictLabel
             }
           })
+          this.occupationOptions.map(res => {
+            if(res.dictValue == item.occupation){
+              this.nhform.occupationName = res.dictLabel
+            }
+          })
+          this.jzqkOptions.map(res => {
+            if(res.dictValue == item.jzqk){
+              this.nhform.jzqkName = res.dictLabel
+            }
+          })
         },
         getZjdList(){
            if(this.active==1){
             let params = {
               "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "CONFIRMED"
+              "houseDataConfirmStatus" : "CONFIRMED",
+              "pageNum": 1,
+              "pageSize":10,
             }
             listZjdzd(params).then((response) => {
               if (response.code == 200) {
@@ -1091,7 +1540,9 @@
           }else if(this.active==2){
             let params = {
               "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "UNCONFIRMED"
+              "houseDataConfirmStatus" : "UNCONFIRMED",
+              "pageNum": 1,
+              "pageSize":10,
             }
             listZjdzd(params).then((response) => {
               if (response.code == 200) {
@@ -1101,6 +1552,8 @@
           }else{
                let params = {
                  "deptId" : this.item.deptId,
+                 "pageNum": 1,
+                 "pageSize":10,
                }
                listZjdzd(params).then((response) => {
                  if (response.code == 200) {
@@ -1110,7 +1563,47 @@
            }
         },
         onConfirm(){},
-        onSubmit(){},
+        onSubmithncy(){
+          if (this.form5.id != null) {
+            updateNhhncy(this.form5).then(response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '修改成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.showhncy = false
+                  let params = {
+                    "nhdm":_this.form5.nhdm
+                  }
+                  listNhhncy(params).then((response) => {
+                    _this.hncylist = response.rows
+                  })
+                }
+              })
+            });
+          } else {
+            addNhhncy(this.form5).then(response => {
+              let _this = this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.showhncy = false
+                  console.log(_this.form5,this.form5)
+                  let params = {
+                    "nhdm":_this.form5.nhdm
+                  }
+                  listNhhncy(params).then((response) => {
+                    console.log(response.rows)
+                    _this.hncylist = response.rows
+                  })
+                }
+              })
+            });
+          }
+        },
         mapShow() {
           //通过数据直接查询方式--------加载较慢 start
           //镇边界获取
@@ -2637,6 +3130,7 @@
     text-align:center;
     font-size:20px;
     width: 24%;
+    margin:0 10px;
     box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
   }
   .disactiveBtn{
@@ -2648,6 +3142,7 @@
     text-align:center;
     font-size:20px;
     width: 24%;
+    margin:0 10px;
     box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
   }
   .van-cell__label{
@@ -2921,5 +3416,5 @@
   .item-checkbox {
     border: 1px solid darkgray;
   }
-
+  .van-sticky{position: fixed;top: 0;right: 0; left: 0;z-index: 9999;}
 </style>