diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index db71a38d..fd575b7c 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -456,6 +456,7 @@
         </van-popup>
         <field-select
           v-model="form.landPhms"
+          v-if="showXzyy"
           label="盘活利用模式"
           value-key="dictLabel"
           data-key="dictValue"
@@ -733,9 +734,12 @@
 <!--            <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="20" accept="image/*"></van-uploader>-->
 <!--          </template>-->
 <!--        </van-field>-->
-
-
-        <MapGisDrawing ref="zjdProductResh" :message="form.theGeomJson" :zjddm="form.zjddm"  ></MapGisDrawing>
+        <common-map ref="pointDarwMap" style="height:200px;"
+                    :allowDraw="true"
+                    @drawReseted="onMapDrawReseted"
+                    @drawFinished="onMapDrawFinished"
+        >
+        </common-map>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
         <van-button round color="#22B7F2" style="width:45%"  @click="submitzjd">保存</van-button>
@@ -750,7 +754,7 @@ import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homeste
 import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldRadio from "@/components/form/FieldRadio";
-import MapGisDrawing from "@/components/Map/MapGisDrawing";
+import CommonMap from "@/components/house/CommonMap";
 import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
 import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
 import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr";
@@ -764,7 +768,7 @@ import { Notify, Dialog, Toast } from 'vant';
 import axios from "axios";
 export default {
   name: "homesteadAdd",
-  components: { MapGisDrawing,FieldSelect, FieldRadio},
+  components: { CommonMap,FieldSelect, FieldRadio},
   data() {
     return {
       active:1,
@@ -776,6 +780,11 @@ export default {
           nhdm :'777888999',
         }
       ],
+      // 地图绘制
+      drawInsert: null,
+      // 当前位置信息
+      tGeoOrganizationLat: null,
+      tGeoOrganizationLng: null,
       showZjdqdsj:false,
       showCzmj:false,
       showFzxx:false,
@@ -802,22 +811,23 @@ export default {
     if(this.form.zjdlyzk !== "1"){
       this.showXzyy = true;
     }
-    this.onSubmitzjd();
+    this.$nextTick(() => {
+
+      this.pointDarw(null);
+      // this.pointDarwNature(null);
+      this.$refs.pointDarwMap && this.$refs.pointDarwMap.update();
+    })
   },
   mounted(){
 
   },
   methods: {
-    onSubmitzjd(){
-      setTimeout(() => {
-        this.$refs.zjdProductResh.drawingPaceCountryDarw();
-      }, 500);
-    },
     submitzjd(){
       this.$refs.form.validate().then(() => {
         if(this.form.id == null){
           addZjdzd(this.form).then(response => {
-            let _this =this
+            let _this =this;
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.form));
             this.$toast({
               icon: 'success', // 找到自己需要的图标
               message: '保存成功',
@@ -829,7 +839,8 @@ export default {
           });
         }else{
           updateZjdzd(this.form).then(response => {
-            let _this =this
+            let _this =this;
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.form));
             this.$toast({
               icon: 'success', // 找到自己需要的图标
               message: '保存成功',
@@ -885,12 +896,53 @@ export default {
     },
     /**宅基地利用状态处理*/
     onZjdlyzkChanged(val){
-      if(val === '1'){
+      console.info(val);
+      if(val.dictValue === '1'){
         this.showXzyy = false;
       }else{
         this.showXzyy = true;
       }
     },
+    // 绘制申请地图
+    pointDarw(data) {
+      this.$nextTick(() => {
+        let map = this.$refs.pointDarwMap;
+        if(data == null)
+          data = this.form.theGeomJson;
+        this.setMapData(map, data);
+
+      });
+    },
+    // 通用设置地图数据函数
+    setMapData(map, data) {
+      //console.log(map, data ? true : false);
+      if(!map) return;
+      if(data)
+      {
+        map.setLayer('pointDarwLayer', data);
+      }
+      else {
+        this.getLandCoord((lng, lat) => {
+          map.setCoord(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        });
+      }
+    },
+    // 当地图绘制完成时
+    onMapDrawFinished(data) {
+      console.info(data);
+      this.drawInsert = data;
+      this.form.theGeomJson = JSON.stringify(this.drawInsert);
+    },
+    // 当申请地图被重置时
+    onMapDrawReseted() {
+      this.drawInsert = null;
+      if(this.form.theGeomJson)
+      {
+        let lastData = JSON.parse(this.form.theGeomJson);
+        if(lastData.hasOwnProperty('coordinates')) // 从后台获取的
+          this.drawInsert = lastData.coordinates;
+      }
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){
diff --git a/src/views/homesteadSurvey/add3.vue b/src/views/homesteadSurvey/add3.vue
index b00f1313..7b0a6735 100644
--- a/src/views/homesteadSurvey/add3.vue
+++ b/src/views/homesteadSurvey/add3.vue
@@ -143,8 +143,7 @@ export default {
       this.$router.push({name:'zrzAdd',query:val});
     },
     showPopupAddzrz(){
-      console.info(this.zrzlist[0].zjddm);
-      this.$router.push({name:'zrzAdd',query:{zjddm:this.zrzlist[0].zjddm}});
+      this.$router.push({name:'zrzAdd',query:{zjddm:this.zjdzdxx.zjddm}});
     },
     shownmfwlist(val){
       this.$router.push({name:'nmfwList',query:val});
diff --git a/src/views/homesteadSurvey/hncyDetails.vue b/src/views/homesteadSurvey/hncyDetails.vue
index bce7bc35..4d48c402 100644
--- a/src/views/homesteadSurvey/hncyDetails.vue
+++ b/src/views/homesteadSurvey/hncyDetails.vue
@@ -233,7 +233,7 @@
     import {ref} from "vue";
     import axios from "axios";
     export default {
-      name: "hncyList2",
+      name: "hncyDetails",
       components: {FieldSelect, FieldRadio},
       data() {
         return {
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index fedea2b0..85f8eb2c 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -115,6 +115,7 @@
           :finished="finished3"
           finished-text="没有更多了"
           :immediate-check="false"
+          @load="onRefreshzjd"
         >
 <!--            @load="onRefreshzjd"-->
         <van-cell  v-for="(item,index) in list2" :key="index" size="small"  :clickable="true"  style="border-radius: 16px;
@@ -417,14 +418,19 @@
       },
       methods: {
         getList(){
-          rhhcList({surveyStatus:"2,3,4,5"}).then(res => {
+          let params = {
+            "surveyStatus":"2,3,4,5",
+            "pageNum": 1,
+            "pageSize":10,
+          }
+          rhhcList(params).then(res => {
             this.list1 = res.data.zjdzdxxList;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
-            this.yhcNums = res.data.shyqrs;
+            this.yhcNums = res.data.zjdzs;
           });
           rhhcList({surveyStatus:"1"}).then(res => {
-            this.whcNums = res.data.shyqrs;
+            this.whcNums = res.data.zjdzs;
           });
         },
         showUploadList(){
@@ -779,61 +785,43 @@
           return label
         },
         onRefreshzjd(){
-          console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
           this.isLoadingzjd = false;
           let _this = this
-          if(this.active==1&&this.loading2){
-              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.push(res)
-                  })
-                  this.countyhc++
-                  this.loading2 = false
-                }else{
-                  this.loading2 = false
-                  this.finished2 = true
-                }
-              });
-          }else if(this.active==2&&this.loading3){
+          if(this.active==1&&this.loading3){
             let params = {
-              "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "UNCONFIRMED",
-              "pageNum": this.countwhc+1,
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"1",
+              "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            listZjdzd(params).then((response) => {
-                if(response.rows.length>0&&this.list2.length<response.total){
-                  response.rows.map(res => {
+             rhhcList(params).then((response) => {
+                if(response.data.zjdzdxxList.length>0&&this.list2.length<response.data.zjdzs){
+                  response.data.zjdzdxxList.map(res => {
                     this.list2.push(res)
                   })
-                  this.countwhc++
+                  this.countyhc++
                   this.loading3 = false
                 }else{
+                  this.loading3 = false
                   this.finished3 = true
                 }
-            });
-          }else if(this.active==0&&this.loading1){
+              });
+          }else if(this.active==0&&this.loading2){
             let params = {
-              "deptId" : this.item.deptId,
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"2,3,4,5",
               "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.push(res)
+            rhhcList(params).then((response) => {
+                if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
+                  response.data.zjdzdxxList.map(res => {
+                    _this.list1.push(res)
                   })
                   this.countqb++
-                  this.loading1 = false
+                  this.loading2 = false
                 }else{
-                  this.finished1 = true
+                  this.finished2 = true
                 }
             });
           }
@@ -1217,24 +1205,45 @@
             let params = {
               "shyqrdbxm" : this.zjdvalue,
               "surveyStatus":"1",
+              "pageNum": 1,
+              "pageSize":10,
             }
             rhhcList(params).then((response) => {
+              console.info(this.list2.length);
               if (response.code == 200) {
-                this.list2 = response.data.zjdzdxxList;
-                this.totalH = response.data.zjdzs;
-                this.totalR = response.data.shyqrs;
+                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                  this.list2 =  response.data.zjdzdxxList;
+                  this.totalH = response.data.zjdzs;
+                  this.totalR = response.data.shyqrs;
+                  this.countyhc++
+                  this.loading3 = false
+                  this.finished3 = false;
+                }else{
+                  this.loading3 = false
+                  this.finished3 = true
+                }
               }
             });
           }else{
             let params = {
               "shyqrdbxm" : this.zjdvalue,
               "surveyStatus":"2,3,4,5",
+              "pageNum": 1,
+              "pageSize":10,
             }
             rhhcList(params).then((response) => {
               if (response.code == 200) {
-                this.list1 = response.data.zjdzdxxList;
-                this.totalH = response.data.zjdzs;
-                this.totalR = response.data.shyqrs;
+                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                  this.list1 =  response.data.zjdzdxxList;
+                  this.totalH = response.data.zjdzs;
+                  this.totalR = response.data.shyqrs;
+                  this.countyhc++
+                  this.loading2 = false
+                  this.finished2 = false;
+                }else{
+                  this.loading2 = false
+                  this.finished2 = true
+                }
               }
             });
           }
@@ -1416,6 +1425,8 @@
            let params = {
              "shyqrdbxm" : this.zjdvalue,
              "surveyStatus":"2,3,4,5",
+             "pageNum": 1,
+             "pageSize":10,
            }
            rhhcList(params).then((response) => {
              if (response.code == 200) {
@@ -1429,6 +1440,8 @@
            let params = {
              "shyqrdbxm" : this.zjdvalue,
              "surveyStatus":"1",
+             "pageNum": 1,
+             "pageSize":10,
            }
            rhhcList(params).then((response) => {
              if (response.code == 200) {
diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue
index 805df442..eaed607f 100644
--- a/src/views/homesteadSurvey/list2.vue
+++ b/src/views/homesteadSurvey/list2.vue
@@ -806,37 +806,8 @@
         },
         // 农户信息搜索框新增。
         onClicknh(){
-          this.shownh = true;
-          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
-              this.nhform.txdz = response.rows[0].suyqrmc
-            }
-          });
+          this.$cookies.remove("search");
+          this.$router.push({name:'hncyDetails',query:{item:{}}});
         },
         // 返回
         onClickLeft(){
diff --git a/src/views/homesteadSurvey/nmfwAdd.vue b/src/views/homesteadSurvey/nmfwAdd.vue
index 11079ea3..20214593 100644
--- a/src/views/homesteadSurvey/nmfwAdd.vue
+++ b/src/views/homesteadSurvey/nmfwAdd.vue
@@ -65,17 +65,12 @@
           :rules="[{ required: true }]"
           required
         />
-        <van-field
-          input-align="right"
-          v-model="form.nhdm"
-          name="农户代码"
-          label="农户代码"
-          maxlength="50"
-          autocomplete="off"
-          :rules="[{ required: true }]"
-          required
-          disabled
-        />
+        <van-field v-model="form.nhdm" label="农户姓名" placeholder="农户" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
+          <van-cell id="vanCell"  v-for="(item, index) in nhdmDictionaries" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
+            {{item.hzxm}}-{{item.nhdm}}
+          </van-cell>
+        </div>
         <van-field
           input-align="right"
           v-model="form.sjcs"
@@ -363,6 +358,8 @@ export default {
       ],
       // 地图绘制
       drawInsert: null,
+      showDropList:false,
+      nhdmDictionaries:[],
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
@@ -429,6 +426,51 @@ export default {
         Dialog({ type: 'danger', message: '请填写完整的表单项' });
       });
     },
+    /** 模糊查询人员信息 */
+    remoteTransfereeMethod(query) {
+      if (query !== "") {
+        listNh({hzxm:query}).then((response) => {
+          if (response.code == 200) {
+            this.nhdmDictionaries = response.rows.map(function (item) {
+              return {
+                hzxm:item.hzxm,
+                sqrxb:item.xb,
+                hzzjhm:item.hzzjhm,
+                nhdm:item.nhdm,
+                hzzjlx:item.hzzjlx,
+                lxdh:item.lxdh,
+                deptId:item.deptId,
+                deptName:item.deptName,
+              }
+            })
+            //设置模糊查询的下拉框和滚动条
+            if (this.nhdmDictionaries.length > 0) {
+              this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+              //设置模糊查询的和滚动条
+              this.$nextTick(() => {
+                if (this.nhdmDictionaries.length > 4) {
+                  let height = document.getElementById("vanCell").offsetHeight * 4;
+                  document.getElementById("dropList").style.height = height + "px";
+                  document.getElementById("dropList").style.overflow = "scroll";
+                } else {
+                  document.getElementById("dropList").style.height = "";
+                  document.getElementById("dropList").style.overflow = "visible";
+                }
+              });
+            } else {
+              this.showDropList = false;
+            }
+          }
+        });
+      } else {
+        this.nhdmDictionaries = [];
+        this.showDropList = false;
+      }
+    },
+    shyqrdmxmChange(val){
+      this.$set(this.form, "nhdm", val.nhdm);
+      this.showDropList = false;
+    },
     // 绘制申请地图
     pointDarw(data) {
       this.$nextTick(() => {
diff --git a/src/views/homesteadSurvey/nmfwList.vue b/src/views/homesteadSurvey/nmfwList.vue
index a58ecd15..e8317f9e 100644
--- a/src/views/homesteadSurvey/nmfwList.vue
+++ b/src/views/homesteadSurvey/nmfwList.vue
@@ -141,7 +141,7 @@ export default {
       this.$router.push({name:'nmfwAdd',query:val});
     },
     showPopupAddnmfw(){
-      this.$router.push({name:'nmfwAdd',query:{nhdm:this.nmfwlist[0].nhdm,nmfwzh:this.nmfwlist[0].nmfwzh}});
+      this.$router.push({name:'nmfwAdd',query:{nmfwzh:this.zrzData.nmfwzh}});
     },
     showPopuphncy(val){
       this.$router.push({name:'nhcyAdd',query:val});
diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index 2d3512e9..07f871d7 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -54,27 +54,13 @@
           placeholder="行政区划名称"
           :rules="[{ required: true, message: '' }]"
         />-->
-        <van-field
-          readonly
-          clickable
-          label="农户代码"
-          placeholder="请选择"
-          v-model="form.nhdm"
-          @click="shownhdm = true"
-          input-align="right"
-          right-icon="arrow-down"
-          :rules="[{ required: true }]"
-          required
-        />
-        <van-popup v-model="shownhdm" position="bottom">
-          <van-picker
-            show-toolbar
-            :columns="nhdmDictionaries"
-            value-key="hzxm"
-            @confirm="onConfirmnhdm"
-            @cancel="shownhdm = false"
-          />
-        </van-popup>
+
+        <van-field v-model="form.nhdm" label="农户姓名" placeholder="农户" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
+          <van-cell id="vanCell"  v-for="(item, index) in nhdmDictionaries" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
+            {{item.hzxm}}-{{item.nhdm}}
+          </van-cell>
+        </div>
         <van-field
           v-model="form.zjddm"
           label="宅基地代码"
@@ -351,6 +337,7 @@ export default {
         }
       ],
       shownhdm:false,
+      showDropList:false,
       shownmfwdm:false,
       hzxm:null,
       landStatus:"1",
@@ -386,7 +373,7 @@ export default {
     listNmfw({zjddm:this.zjdzdxx.zjddm}).then(response => {
       this.nmfwDictionaries = response.rows;
     });
-    this.getList();
+    // this.getList();
   },
   mounted(){
 
@@ -397,6 +384,51 @@ export default {
         this.nhdmDictionaries = response.rows;
       });
     },
+    /** 模糊查询人员信息 */
+    remoteTransfereeMethod(query) {
+      if (query !== "") {
+        listNh({hzxm:query}).then((response) => {
+          if (response.code == 200) {
+            this.nhdmDictionaries = response.rows.map(function (item) {
+              return {
+                hzxm:item.hzxm,
+                sqrxb:item.xb,
+                hzzjhm:item.hzzjhm,
+                nhdm:item.nhdm,
+                hzzjlx:item.hzzjlx,
+                lxdh:item.lxdh,
+                deptId:item.deptId,
+                deptName:item.deptName,
+              }
+            })
+            //设置模糊查询的下拉框和滚动条
+            if (this.nhdmDictionaries.length > 0) {
+              this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+              //设置模糊查询的和滚动条
+              this.$nextTick(() => {
+                if (this.nhdmDictionaries.length > 4) {
+                  let height = document.getElementById("vanCell").offsetHeight * 4;
+                  document.getElementById("dropList").style.height = height + "px";
+                  document.getElementById("dropList").style.overflow = "scroll";
+                } else {
+                  document.getElementById("dropList").style.height = "";
+                  document.getElementById("dropList").style.overflow = "visible";
+                }
+              });
+            } else {
+              this.showDropList = false;
+            }
+          }
+        });
+      } else {
+        this.nhdmDictionaries = [];
+        this.showDropList = false;
+      }
+    },
+    shyqrdmxmChange(val){
+      this.$set(this.form, "nhdm", val.nhdm);
+      this.showDropList = false;
+    },
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){