diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index c6d28643..521d0f41 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <van-sticky>
+    <van-sticky style="position:relative;">
     <div class="bannerBg">
       <van-nav-bar
-        style="background:transparent;border-bottom-width:0;height:150px"
+        style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
         @click-left="goBack()"
       >
         <template #left>
@@ -17,33 +17,40 @@
         </template>
       </van-nav-bar>
     </div>
-    <div style="background:#fff;border-radius:15px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 20px;
-    margin: 20px;margin-top:-70px;">
+    <div style=" width:90%; left:5%;position:absolute;background:#fff;border-radius:15px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: .3rem;
+    top:1.2rem">
       <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="1rem" @click="mapClickLoading" style="margin-top:0px;"/>
-          <p :style="{color:(active==1?'rgb(34, 183, 242)':'#000')}">宅基地</p>
+        <van-col span="4" :offset="1" style="text-align:center;" >
+          <div @click="active=1,mapClickLoading">
+            <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>
+          </div>
         </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="1rem" style="margin-top:0px;"/>
-          <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户信息</p>
-        </van-col>
+        <div @click="active=2,getSyqrList()">
+          <van-col span="4"  style="text-align:center;" >
+            <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>
+        </div>
+
         <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="1rem" style="margin-top:0px;"/>
-          <p  :style="{color:(active==3?'rgb(34, 183, 242)':'#000')}">房屋信息</p>
-        </van-col>
+        <div @click="active=3,getZrzList()">
+          <van-col span="4" style="text-align:center;" >
+            <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>
+        </div>
         <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="1rem" style="margin-top:0px;"/>
-          <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属设施</p>
+          <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属物</p>
         </van-col>
       </van-row>
     </div>
@@ -115,24 +122,26 @@
           <van-field
             input-align="right"
             v-model="form.zjdpzmj"
-            name="宅基地批准面积"
-            label="宅基地批准面积"
-            placeholder="宅基地批准面积"
+            name="宅基地批准面积(㎡)"
+            label="宅基地批准面积(㎡)"
+            placeholder="单位：平方米"
+            type="number"
           />
           <van-field
             input-align="right"
             v-model="form.zdmj"
-            type="form.zdmj"
-            name="宗地面积"
-            label="宗地面积"
-            placeholder="宗地面积"
+            type="number"
+            name="宗地面积(㎡)"
+            label="宗地面积(㎡)"
+            placeholder="宗地面积(㎡)"
           />
           <van-field
             input-align="right"
             v-model="form.zdbh"
             name="宗地代码"
             label="宗地代码"
-            placeholder="宗地代码"
+            placeholder="单位：平方米"
+            type="number"
             required
             :rules="[{ required: true, message: '宗地代码不能为空' }]"
           />
@@ -288,6 +297,7 @@
             name="价格（万元）"
             label="价格（万元）"
             placeholder="价格（万元）"
+            type="number"
           />
           <van-field
             input-align="right"
@@ -340,7 +350,7 @@
             v-model="form.jzmd"
             name="validator"
             label="建筑密度"
-            placeholder="建筑密度"
+            placeholder="填写0~1小数"
             :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"
             type="number"
           />
@@ -348,8 +358,8 @@
             input-align="right"
             v-model="form.jzxg"
             name="建筑限高"
-            label="建筑限高"
-            placeholder="建筑限高(米)"
+            label="建筑限高(m)"
+            placeholder="建筑限高"
             type="number"
           />
           <van-field
@@ -422,7 +432,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" @click="deletesyqr(item)"/>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
         </template>
       </van-swipe-cell>
 
@@ -457,7 +467,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item)"/>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item.id,index)"/>
         </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;">
@@ -476,7 +486,7 @@
             <p  style="flex:1;text-align:right;">{{item.nmfwzh}}</p>
           </div>
           <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">农民房屋面积</p>
+            <p style="flex:1;text-align:left;">农民房屋面积(㎡)</p>
             <p style="flex:1;text-align:right;">{{item.nmfwmj}}</p>
           </div>
           <div style="text-align:center;overflow:auto;">
@@ -484,10 +494,10 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" @click="deletefw(item)"/>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletefw(item.id,index)"/>
         </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;">
+      <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;margin-bottom:50px">
         <div style="text-align:center;" >
           <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfw('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加房屋信息</p>
         </div>
@@ -505,7 +515,7 @@
         <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;"/>{{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:left;">建筑面积(㎡)</p>
             <p  style="flex:1;text-align:right;">{{item.jzmj}}</p>
           </div>
           <div style="display:flex;line-height:20px">
@@ -517,7 +527,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletefsss(item.id,index)"/>
         </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;">
@@ -655,7 +665,7 @@
             v-model="form1.qlbl"
             name="权利比例"
             label="权利比例"
-            placeholder="权利比例"
+            placeholder="单独为1，共有时2位小数"
           />
           <van-field
             input-align="right"
@@ -700,8 +710,8 @@
             v-if="form1.sfsyqrzjgy=='Y'"
             input-align="right"
             v-model="form1.ftzdmj"
-            name="分摊宗地面积"
-            label="分摊宗地面积"
+            name="分摊宗地面积(㎡)"
+            label="分摊宗地面积(㎡)"
             placeholder="单位：平方米"
           />
           <van-field
@@ -821,6 +831,8 @@
             name="竣工日期"
             label="竣工日期"
             placeholder="竣工日期"
+            @click="showPickerjgrq=true"
+            readonly
           />
           <van-field
             input-align="right"
@@ -832,27 +844,27 @@
           <van-field
             input-align="right"
             v-model="form3.zzdmj"
-            name="幢占地面积"
-            label="幢占地面积"
-            placeholder="幢占地面积"
+            name="幢占地面积(㎡)"
+            label="幢占地面积(㎡)"
+            placeholder="幢占地面积(㎡)"
             required
-            :rules="[{ required: true, message: '幢占地面积不能为空' }]"
+            :rules="[{ required: true, message: '幢占地面积(㎡)不能为空' }]"
           />
           <van-field
             input-align="right"
             v-model="form3.zydmj"
-            name="幢用地面积"
-            label="幢用地面积"
-            placeholder="幢用地面积"
+            name="幢用地面积(㎡)"
+            label="幢用地面积(㎡)"
+            placeholder="幢用地面积(㎡)"
             required
-            :rules="[{ required: true, message: '幢用地面积不能为空' }]"
+            :rules="[{ required: true, message: '幢用地面积(㎡)不能为空' }]"
           />
           <van-field
             input-align="right"
             v-model="form3.scjzmj"
-            name="实测建筑面积"
-            label="实测建筑面积"
-            placeholder="实测建筑面积"
+            name="实测建筑面积(㎡)"
+            label="实测建筑面积(㎡)"
+            placeholder="实测建筑面积(㎡)"
           />
           <van-field
             input-align="right"
@@ -969,8 +981,6 @@
             label="农民房屋代码"
             placeholder="自动生成"
             disabled
-            required
-            :rules="[{ required: true, message: '农民房屋代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -982,11 +992,11 @@
           <van-field
             input-align="right"
             v-model="nmfwform.nmfwmj"
-            name="农民房屋面积"
-            label="农民房屋面积"
-            placeholder="农民房屋面积"
+            name="农民房屋面积(㎡)"
+            label="农民房屋面积(㎡)"
+            placeholder="农民房屋面积(㎡)"
             required
-            :rules="[{ required: true, message: '农民房屋面积不能为空' }]"
+            :rules="[{ required: true, message: '农民房屋面积(㎡)不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1112,16 +1122,16 @@
           <van-field
             input-align="right"
             v-model="nmfwform.fwzdmj"
-            name="房屋占地面积"
-            label="房屋占地面积"
-            placeholder="房屋占地面积"
+            name="房屋占地面积(㎡)"
+            label="房屋占地面积(㎡)"
+            placeholder="房屋占地面积(㎡)"
           />
           <van-field
             input-align="right"
             v-model="nmfwform.jzmj"
-            name="建筑面积"
-            label="建筑面积"
-            placeholder="建筑面积"
+            name="建筑面积(㎡)"
+            label="建筑面积(㎡)"
+            placeholder="建筑面积(㎡)"
           />
           <van-field
             input-align="right"
@@ -1302,8 +1312,9 @@
             input-align="right"
             v-model="nmfwform.mortgageMoney"
             name="抵押金额"
-            label="抵押金额"
+            label="抵押金额(元)"
             placeholder="抵押金额"
+            type="number"
           />
           <van-field
             input-align="right"
@@ -1336,13 +1347,14 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field
-            input-align="right"
-            v-model="nmfwform.yctcyx"
-            name="有偿退出意向"
-            label="有偿退出意向"
-            placeholder="有偿退出意向"
-          />
+          <van-field name="radio" label="有偿退出意向" input-align="right">
+            <template #input>
+              <van-radio-group v-model="nmfwform.yctcyx" direction="horizontal">
+                <van-radio name="1">有</van-radio>
+                <van-radio name="0">无</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
           <van-field
             input-align="right"
             v-model="nmfwform.bccjl"
@@ -1392,8 +1404,8 @@
           <van-field name="radio" label="批准单位" input-align="right">
             <template #input>
               <van-radio-group v-model="nmfwform.pzdw" direction="horizontal">
-                <van-radio name="1">县政府</van-radio>
-                <van-radio name="2">乡政府</van-radio>
+                <van-radio :name="'1'">县政府</van-radio>
+                <van-radio :name="'2'">乡政府</van-radio>
               </van-radio-group>
             </template>
           </van-field>
@@ -1553,6 +1565,13 @@
       />
     </van-popup>
     <div class="nmfw">
+      <van-popup v-model:show="showPickerdjsj" position="bottom">
+        <van-datetime-picker
+          type="date"
+          @confirm="onConfirmdjsj"
+          @cancel="showPickerdjsj = false"
+        />
+      </van-popup>
       <van-popup v-model:show="showPickerdjsj" position="bottom">
         <van-datetime-picker
           type="date"
@@ -1696,12 +1715,14 @@
           @cancel="shownmfwqsly = false"
         />
       </van-popup>
-      <van-popup v-model="showPickerpzsj" position="bottom">
-  <!--      <van-datetime-picker
+      <van-popup v-model="showPickerjgrq" position="bottom">
+        <van-datetime-picker
           type="date"
-          @confirm="onConfirmpzsj"
-          @cancel="showPickerpzsj = false"
-        />-->
+          @confirm="onConfirmzrzjgrq"
+          @cancel="showPickerjgrq = false"
+        />
+      </van-popup>
+      <van-popup v-model="showPickerpzsj" position="bottom">
         <van-picker
           show-toolbar
           :columns="pzsjOptions"
@@ -1760,7 +1781,7 @@
       <van-picker
         show-toolbar
         :columns="syqrnhdmlist"
-        value-key="nhdm"
+        value-key="hzxm"
         @confirm="onConfirmsyqrnhdmlist"
         @cancel="showsyqrnhdmlist = false"
       />
@@ -1838,11 +1859,11 @@
           <van-field
             input-align="right"
             v-model="form4.jzmj"
-            name="建筑面积"
-            label="建筑面积"
-            placeholder="建筑面积"
+            name="建筑面积(㎡)"
+            label="建筑面积(㎡)"
+            placeholder="建筑面积(㎡)"
             required
-            :rules="[{ required: true, message: '建筑面积不能为空' }]"
+            :rules="[{ required: true, message: '建筑面积(㎡)不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1982,7 +2003,7 @@
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
-            readonly
+            disabled
             required
             :rules="[{ required: true, message: '农户代码不能为空' }]"
           />
@@ -2017,8 +2038,9 @@
             label="与户主关系"
             placeholder="与户主关系"
             required
+            readonly
             :rules="[{ required: true, message: '与户主关系不能为空' }]"
-            @click="showhncyyhzgx = true"
+            @click="showyhzgx = true"
           />
           <van-field
             v-model="form5.yhzgx"
@@ -2184,7 +2206,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)" />
         </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;">
@@ -2198,7 +2220,7 @@
       <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">
+      <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF">
         <vue-esign
           ref="esign"
           class="mySign"
@@ -2270,15 +2292,15 @@
 </template>
 
 <script>
-  import {listShyqr,addShyqr,updateShyqr} from "@/api/homesteadSurvey/shyqr";
+  import {listShyqr,addShyqr,updateShyqr,delShyqr} 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 {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz} from "@/api/homesteadSurvey/zrz";
+  import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
   import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr";
-  import {listNhhncy,addNhhncy,updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
+  import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} 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 {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
   import { Notify, Dialog, Toast } from 'vant';
@@ -2316,6 +2338,7 @@
         showqlrlx:false,
         showshyqrdbzjlx:false,
         showgyfs:false,
+        showPickerjgrq:false,
         showPickerdjsj:false,
         showPickerpzsj:false,
         showPickercfqssj:false,
@@ -2588,39 +2611,72 @@
           this.syqrnhdmlist = response.rows
         });
       },
+      //删除户内成员
+      deletehncy(id,index){
+        Dialog.confirm({
+          title: '警告',
+          message: '删除后无法恢复，确认删除么？',
+        })
+          .then(() => {
+            // on confirm
+            delNhhncy(id).then(res => {
+              if(res.code=="200"){
+                this.hncylist.splice(index,1);
+              }
+            })
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
       // 删除附属设施
-      deletefsss(){
+      deletefsss(id,index){
         Dialog.confirm({
-          title: '标题',
-          message: '弹窗内容',
+          title: '警告',
+          message: '删除后无法恢复，确认删除么？',
         })
           .then(() => {
             // on confirm
+            delFsss(id).then(res => {
+              if(res.code=="200"){
+                this.fssslist.splice(index,1);
+              }
+            })
           })
           .catch(() => {
             // on cancel
           });
       },// 删除自然幢
-      deletezrz(){
+      deletezrz(id,index){
         Dialog.confirm({
-          title: '标题',
-          message: '弹窗内容',
+          title: '警告',
+          message: '删除后无法恢复，确认删除么？',
         })
           .then(() => {
             // on confirm
+            delZrz(id).then(res => {
+              if(res.code=="200"){
+                this.zrzlist.splice(index,1);
+              }
+            })
           })
           .catch(() => {
             // on cancel
           });
       },
       // 删除使用权人
-      deletesyqr(){
+      deletesyqr(id,index){
         Dialog.confirm({
-          title: '标题',
-          message: '弹窗内容',
+          title: '警告',
+          message: '删除后无法恢复，确认删除么？',
         })
           .then(() => {
             // on confirm
+            delShyqr(id).then(res => {
+              if(res.code=="200"){
+                this.syqrlist.splice(index,1);
+              }
+            })
           })
           .catch(() => {
             // on cancel
@@ -2982,6 +3038,16 @@
         this.nmfwform.zwlxsj1 = year+"-"+month+"-"+day
         this.showPickerzwlxsj1= false
       },
+      // 自然幢竣工日期弹出框
+      onConfirmzrzjgrq(val){
+        let year = val.getFullYear()
+        let month = val.getMonth() + 1
+        let day = val.getDate()
+        if (month >= 1 && month <= 9) { month = `0${month}` }
+        if (day >= 1 && day <= 9) { day = `0${day}` }
+        this.form3.jgrq = year+"-"+month+"-"+day
+        this.showPickerjgrq= false
+      },
       // 农民房屋债务履行结束时间弹出框
       onConfirmzwlxsj2(val){
         let year = val.getFullYear()
@@ -3106,20 +3172,43 @@
                 this.form.qlsdfsName = res.dictLabel
               }
             })
-            console.log(this.form)
             this.ytOptions.map(res => {
               if(res.dictValue == this.form.yt){
                 this.form.ytName = res.dictLabel
               }
             })
+            this.tddjOptions.map(res => {
+              if(res.dictValue == this.form.dj){
+                this.form.djName = res.dictLabel
+              }
+            })
           });
         }else{
           let params = {
             "deptId" : this.item.deptId
           }
           listSuyqr(params).then((response) => {
-            this.form = {}
-            this.form.deptId = this.item.deptId
+            this.form = {
+              deptId :this.item.deptId,
+              sffz:"Y",
+              yt:"072",
+              ytName:"农村宅基地",
+              lyzk:"1",
+              lzyx:'0',
+              yctcyx:'0',
+              bccjl:'0',
+              zjdqdfs:'01',
+              dj:'1',
+              djName:'一类',
+              qllx:'1',
+              qllxName:'集体土地所有权',
+              qlxz:'200',
+              qlxzName:'集体土地',
+              qlsdfs:'1',
+              qlsdfsName:'地上',
+              sjly:'04',
+              sjlyName:'农村宅基地使用权确权登记发证'
+            }
             if(response.rows.length>0){
               console.log(response.rows[0].suyqrdm)
               this.form.suyqrdm = response.rows[0].suyqrdm
@@ -3363,15 +3452,21 @@
           Notify({ type: 'danger', message: '请先保存宅基地信息' });
         }else{
           if(item==""){
-            this.form1={}
-            this.form1.zjddm = this.form.zjddm
-            this.form1.suyqrdm = this.form.suyqrdm
-            // 使用权人默认值
-            this.form1.deptId = this.form.deptId
-            this.form1.gj = '1'
-            this.form1.hklx = '1'
-            this.form1.sfbncjtjjzzcy = 'Y'
-            this.form1.sfsyqrzjgy = 'Y'
+            this.form1={
+              zjddm:this.form.zjddm,
+              suyqrdm:this.form.suyqrdm,
+              deptId:this.form.deptId,
+              gj:'1',
+              hklx:'1',
+              xb:'1',
+              sfbncjtjjzzcy:'Y',
+              sfsyqrzjgy:'Y',
+              qlrlx:'10',
+              qlrlxName:'个人',
+              gyfs:'1',
+              gyfsName:'单独所有',
+              qlbl:'1',
+            }
           }else{
             this.form1 = item
             this.sjlyOptions.map(res => {
@@ -3400,10 +3495,27 @@
       },
       showPopuphncy(item){
         if(item==""){
-          this.form5={}
-          this.form5.nhdm = this.form1.nhdm
-          this.form5.hklx = '1'
-          this.form5.sfbncjtjjzzcy = 'Y'
+          this.form5 = {
+            "nhdm":this.form1.nhdm,
+            "deptId":this.form1.deptId,
+            "zjlx":'01',
+            "zjlxName":"身份证",
+            "yhzgx":"14",
+            "yhzgxName":"妻",
+            "hyzk":'02',
+            "hklx":'1',
+            "occupation":'1',
+            "occupationName":'务农',
+            "jzqk":'3',
+            "jzqkName":'常年居住',
+            "sfbjtjjzzcy":'Y',
+            "xb":'0',
+            "sfbccm":'Y',
+            "sfpkh":'N',
+            "sfwbh":'N',
+            "sjly":'07',
+            "sjlyName":'农村集体产权制度改革',
+          }
         }else{
           this.form5 = item
           this.jzhcssfyzfOptions.map(res => {
@@ -3449,9 +3561,17 @@
           Notify({ type: 'danger', message: '请先保存宅基地信息' });
         }else{
           if(item==""){
-            this.form3={}
-            this.form3.zjddm = this.item.zjddm
-            this.form3.deptId = this.item.deptId
+            this.form3={
+              zjddm:this.item.zjddm,
+              deptId:this.item.deptId,
+              zcs:1,
+              dscs:1,
+              dxcs:0,
+              fwjg:'02',
+              fwjgName:'钢和钢筋混凝土结构',
+              sjly:'04',
+              sjlyName:'农村宅基地使用权确权登记发证'
+            }
           }else{
             this.form3 = item
             this.sjlyOptions.map(res => {
@@ -3475,15 +3595,48 @@
         }else{
         this.showfw = true;
         if(item==""){
-          this.nmfwform={}
-          this.nmfwform.zrzh = this.item.zrzh
-          this.nmfwform.deptId = this.item.deptId
-          this.nmfwform.zjddm = this.item.zjddm
-          this.nmfwform.nmfwzh = this.item.nmfwzh
-          this.nmfwform.pzdw = '1'
+
+          this.nmfwform={
+            pzdw : '1',
+            sfkjgj : 'Y',
+            zrzh: this.item.zrzh,
+            deptId : this.item.deptId,
+            zjddm : this.item.zjddm,
+            nmfwzh : this.item.nmfwzh,
+            ch:1,
+            sjc:1,
+            myc:1,
+            sjcs:1,
+            hx:'03',
+            hxName:'三居室',
+            hxjg:'01',
+            hxjgName:'平层',
+            fwjg:'02',
+            fwjgName:'钢和钢筋混凝土结构',
+            fwyt:'10',
+            fwytName:'住宅',
+            sfjf:'N',
+            sfcf:'N',
+            sffz:'Y',
+            isCommon:'N',
+            fwzt:'1',
+            fwztName:'正常',
+            isMortgage:'Y',
+            sjly:'04',
+            sjlyName:'农村宅基地使用权确权登记发证',
+            fwlx:'01',
+            fwlxName:'住宅',
+            lyzk:'1',
+            lyzkName:'正常使用',
+            lzyx:'0',
+            yctcyx:'0',
+            qsly:'01',
+            qslyName:'申请',
+            sfkjgj:'N',
+            pzdw:'1',
+          }
         }else{
           this.nmfwform = item
-          console.log(item)
           this.sjlyOptions.map(res => {
             if(res.dictValue == item.sjly){
               this.nmfwform.sjlyName = res.dictLabel
@@ -3564,9 +3717,26 @@
         Notify({ type: 'danger', message: '请先保存宅基地信息' });
       }else{
         if(item==""){
-          this.form4={}
-          this.form4.deptId = this.item.deptId
-          this.form4.zjddm = this.item.zjddm
+          this.form4={
+            deptId:this.item.deptId,
+            zjddm:this.item.zjddm,
+            fssslx:'11',
+            fssslxName:'畜厩',
+            qsly:'',
+            qslyName:'其他',
+            fwzt:'',
+            fwztName:'',
+            sfsp:'N',
+            sffz:'N',
+            jglx:'2',
+            jglxName:'砖混',
+            sfzzsy:'Y',
+            jzwqk:'01',
+            jzwqkName:'正常',
+            tdzk:'3',
+            tdzkName:'其他',
+            sfsgcf:'N'
+          }
         }else{
           this.form4=item
           this.fssslxOptions.map(res => {
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index aa24bda6..fe1f3d38 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -10,7 +10,7 @@
               width="60"
               height="60"
               round
-              src="https://img01.yzcdn.cn/vant/cat.jpeg"
+              src="https://img.yzcdn.cn/vant/leaf.jpg"
             />
           </van-col>
           <van-col span="14">
@@ -143,6 +143,7 @@
           queryParams: {
             taskStatus: null,
             taskPublishStatus:"PUBLISHED",
+            taskExecutor:null
           },
           nickName:"",
           text:0,
@@ -165,9 +166,12 @@
           false
         );
         getInfo().then(response => {
+          console.log(response)
           this.nickName = response.user.nickName
+          this.queryParams.taskExecutor = response.user.userName
+          this.getList();
         });
-        this.getList();
+
       },
       methods: {
         onRefreshtask(){
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index fa5b907f..31401ac5 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -15,13 +15,16 @@
       </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=".3rem" 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=".3rem" 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=".3rem" 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()">
@@ -31,6 +34,18 @@
         </div>
       </div>
     </div>
+      <div style="background:#fff;padding:10px 0;">
+        <div style="border:1px solid rgb(122, 201, 67);width:90%;margin:0 auto;border-radius:15px;height:.8rem;display:flex;font-size:.3rem;">
+          <div style="flex:1;text-align:center;">
+            <span style="color:rgb(122, 201, 67);line-height:.8rem;">总户数：</span>
+            <span style="color:rgb(250, 83, 83);line-height:.8rem;">{{totalH}} <span style="font-size:12px;">户</span></span>
+          </div>
+          <div style="flex:1;text-align:center;">
+            <span style="color:rgb(122, 201, 67);line-height:.8rem">总人数：</span>
+            <span style="color:rgb(250, 83, 83);line-height:.8rem">{{totalR}} <span style="font-size:12px;">人</span></span>
+          </div>
+        </div>
+      </div>
     </van-sticky>
     <div v-if="activeBtn==1">
       <van-search v-model="zjdvalue" placeholder="请输入搜索关键词" show-action @search="onSearchzjd">
@@ -38,14 +53,15 @@
           <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" title-active-color="#7AC943" color="#7AC943" swipeable @click="getZjdList">
-        <van-tab title="全部" >
+      <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" swipeable animated @click="getZjdList">
+        <van-tab >
+          <template #title>全部<van-badge v-if="qbNums>0" :content="qbNums" /></template>
           <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
           <van-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 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>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(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>
@@ -61,13 +77,14 @@
           </van-cell>
           </van-pull-refresh>
         </van-tab>
-        <van-tab title="已核查" >
+        <van-tab >
+          <template #title>已核查<van-badge v-if="yhcNums>0" :content="yhcNums" /></template>
           <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 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>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(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>
@@ -83,13 +100,14 @@
           </van-cell>
           </van-pull-refresh>
         </van-tab>
-        <van-tab title="未核查">
+        <van-tab >
+          <template #title>未核查<van-badge v-if="whcNums>0" :content="whcNums" /></template>
           <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 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>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(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>
@@ -110,7 +128,7 @@
     <div v-if="activeBtn==2" >
       <van-search v-model="nhvalue" placeholder="请输入农户姓名或证件号" show-action @search="onSearchnh">
         <template #action>
-          <van-icon name="add" color="rgba(122,201,67,1)" size="55" @click="onClicknh" style="vertical-align:middle;"/>
+          <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClicknh" style="vertical-align:middle;"/>
         </template>
       </van-search>
       <van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">
@@ -122,8 +140,8 @@
           <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>证件号码:{{item.hzzjhm}}</p>
+          <p>农户代码:{{item.nhdm}}</p>
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
@@ -229,6 +247,7 @@
             name="代表人联系电话"
             label="代表人联系电话"
             placeholder="代表人联系电话"
+            type="number"
             input-align="right"
             :rules="[{ required: true, message: '代表人联系电话不能为空' }]"
           />
@@ -524,6 +543,7 @@
             label="所有权人代码"
             placeholder="所有权人代码"
             required
+            disabled
             :rules="[{ required: true, message: '所有权人代码不能为空' }]"
           />
           <van-field
@@ -847,7 +867,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
+          <van-button square text="删除" type="danger" style="height:100%" class="delete-button" @click="deletehncy(item.id,index)" />
         </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;">
@@ -878,6 +898,7 @@
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
+            disabled
             required
             :rules="[{ required: true, message: '农户代码不能为空' }]"
           />
@@ -1093,10 +1114,21 @@
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import $ from "jquery";
+    import {Dialog} from "vant";
     export default {
       name: "homesteadList",
       data() {
         return {
+          //全部
+          qbNums:0,
+          //已调查数量
+          yhcNums:0,
+          //未核查数量
+          whcNums:0,
+          // 总户数
+          totalH:0,
+          // 总人数
+          totalR:0,
           showhncysjly:false,
           showhzsjly:false,
           showhncycybz:false,
@@ -1256,8 +1288,34 @@
         });
         this.item = this.$cookies.get("item");
         this.getZjdList();
+        this.getTotalHR();
       },
       methods: {
+        //删除户内成员
+        deletehncy(id,index){
+          Dialog.confirm({
+            title: '警告',
+            message: '删除后无法恢复，确认删除么？',
+          })
+            .then(() => {
+              // on confirm
+              delNhhncy(id).then(res => {
+                if(res.code=="200"){
+                  this.hncylist.splice(index,1);
+                }
+              })
+            })
+            .catch(() => {
+              // on cancel
+            });
+        },
+        // 字数限制
+        limitWords(val){
+          if(val.length>11){
+            val = val.slice(0,10) +"..."
+          }
+          return val
+        },
         // 与户主关系翻译
         yhzgxfy(value){
           let label
@@ -1317,6 +1375,24 @@
             });
           }
         },
+        getTotalHR(){
+          let params = {
+            "deptId" : this.item.deptId,
+            "pageNum": 1,
+            "pageSize":10,
+          }
+          listNh(params).then((response) => {
+            if(response.rows.length>=0){
+              this.totalH = response.total
+            }
+            listNhhncy(params).then((res) => {
+              if(res.rows.length>=0){
+                this.totalR = res.total + this.totalH
+              }
+            });
+          });
+
+        },
         onRefreshnh(){
           this.isLoadingnh = false
           let params = {
@@ -1344,7 +1420,36 @@
         // 农户信息搜索框新增。
         onClicknh(){
           this.shownh = true;
-          this.nhform = {};
+          let params = {
+            "deptId" : this.item.deptId
+          }
+          this.qlrform={}
+          this.nhform={
+            "suyqrdm":null,
+            "deptId":this.item.deptId,
+            "hzzjlx":'01',
+            "hzzjlxName":"身份证",
+            "hyzk":'02',
+            "occupation":'1',
+            "occupationName":'务农',
+            "jzqk":'3',
+            "jzqkName":'常年居住',
+            "jzhcssfyzf":'1',
+            "jzhcssfyzfName":'无住房',
+            "zqtczsfyzf":'Y',
+            "sfbccm":'Y',
+            "sfpkh":'N',
+            "sfwbh":'N',
+            "sjly":'07',
+            "sjlyName":'农村集体产权制度改革',
+          }
+          listSuyqr(params).then((response) => {
+            if(response.rows.length>0){
+              this.qlrform = response.rows[0]
+              this.nhform.suyqrdm = this.qlrform.suyqrdm
+            }
+          });
+
         },
         // 返回
         onClickLeft(){
@@ -1444,20 +1549,34 @@
             );
           }else{
             this.nhform.deptId = this.item.deptId
-            addNh(this.nhform).then(
-              response => {
-                let _this =this
+            let params = {
+              deptId:this.item.deptId,
+              nhdm:this.nhform.nhdm
+            }
+            listNh(params).then(res => {
+              if(res.total>0){
                 this.$toast({
-                  icon: 'success', // 找到自己需要的图标
-                  message: '保存成功',
-                  duration:"1000",
-                  onClose:function(){
-                    _this.shownh = false
-                    _this.getNh()
-                  }
+                  icon: 'error', // 找到自己需要的图标
+                  message: '保存失败，系统中已存在此农户代码！',
+                  duration:"1000"
                 })
+              }else{
+                addNh(this.nhform).then(
+                  response => {
+                    let _this =this
+                    this.$toast({
+                      icon: 'success', // 找到自己需要的图标
+                      message: '保存成功',
+                      duration:"1000",
+                      onClose:function(){
+                        _this.shownh = false
+                        _this.getNh()
+                      }
+                    })
+                  }
+                );
               }
-            );
+            })
           }
         },
         // 所有权人保存
@@ -1491,7 +1610,14 @@
           let params = {
             "deptId" : this.item.deptId
           }
-          this.qlrform={}
+          this.qlrform={
+            "suyqxz":'40',
+            "suyqxzName":'集体土地所有权',
+            "dbrzjlx":'01',
+            "dbrzjlxName":'代表人证件类型',
+            "sfclncjtjjzz":'农村宅基地使用权确权登记发证',
+            "sjly":'04',
+          }
           listSuyqr(params).then((response) => {
             if(response.rows.length>0){
               this.qlrform = response.rows[0]
@@ -1523,6 +1649,7 @@
           }
           listNh(params).then((response) => {
             this.nhlist = response.rows
+            this.totalN = response.total
           });
         },
         // 农户信息搜索框
@@ -1576,12 +1703,30 @@
         showPopuphncy(item){
           this.showhncy = true
           if(item.id==null||item.id==""){
-            this.form5 = {}
-            this.form5.nhdm = this.nhform.nhdm
+            this.form5 = {
+              "nhdm":this.nhform.nhdm,
+              "deptId":this.nhform.deptId,
+              "zjlx":'01',
+              "zjlxName":"身份证",
+              "yhzgx":"14",
+              "yhzgxName":"妻",
+              "hyzk":'02',
+              "hklx":'1',
+              "occupation":'1',
+              "occupationName":'务农',
+              "jzqk":'3',
+              "jzqkName":'常年居住',
+              "sfbjtjjzzcy":'Y',
+              "xb":'0',
+              "sfbccm":'Y',
+              "sfpkh":'N',
+              "sfwbh":'N',
+              "sjly":'07',
+              "sjlyName":'农村集体产权制度改革',
+            }
           }else{
             let _this = this
             this.form5 = item
-            console.log(item.sjly)
             this.jzhcssfyzfOptions.map(res => {
               if(res.dictValue == item.jzhcssfyzf){
                 this.form5.jzhcssfyzfName = res.dictLabel
@@ -1671,6 +1816,7 @@
             }
             listZjdzd(params).then((response) => {
               if (response.code == 200) {
+                this.yhcNums = response.total
                 this.list1 = response.rows
               }
             });
@@ -1683,6 +1829,7 @@
             }
             listZjdzd(params).then((response) => {
               if (response.code == 200) {
+                this.whcNums = response.total
                 this.list2 = response.rows
               }
             });
@@ -1693,7 +1840,9 @@
                  "pageSize":10,
                }
                listZjdzd(params).then((response) => {
+                 console.log(response)
                  if (response.code == 200) {
+                   this.qbNums = response.total
                    this.list = response.rows
                  }
                });
@@ -4126,8 +4275,8 @@
 
 <style scoped lang="scss">
 
-  .closeIcon{
-
+  .van-cell__title{
+    flex:2
   }
   .bannerBg{
     width: 100%;
@@ -4146,7 +4295,7 @@
     line-height:50px;
     text-align:center;
     font-size:20px;
-    width: 24%;
+    width: 26%;
     margin:0 10px;
     box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
   }
@@ -4158,7 +4307,7 @@
     line-height:50px;
     text-align:center;
     font-size:20px;
-    width: 24%;
+    width: 26%;
     margin:0 10px;
     box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
   }