Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/homesteadSurvey/fsss.js

@@ -21,7 +21,7 @@ export function exportFsss(query) {
 // 查询数据调查-附属设施详细
 export function getFsss(id) {
   return request({
-    url: '/houseSurvey/fsss/get/' + id,
+    url: '/home/homesteadfsss/get/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getFsss(id) {
 // 新增数据调查-附属设施
 export function addFsss(data) {
   return request({
-    url: '/houseSurvey/fsss/add',
+    url: '/home/homesteadfsss/add',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function addFsss(data) {
 // 修改数据调查-附属设施
 export function updateFsss(data) {
   return request({
-    url: '/houseSurvey/fsss/edit',
+    url: '/home/homesteadfsss/edit',
     method: 'post',
     data: data
   })

src/api/homesteadSurvey/nh.js

@@ -37,7 +37,7 @@ export function getNhByNhdm(nhdm) {
 // 新增数据调查-户主信息
 export function addNh(data) {
   return request({
-    url: '/home/homesteadnhhncy/add',
+    url: '/home/homesteadnh/add',
     method: 'post',
     data: data
   })
@@ -55,7 +55,7 @@ export function nhConnectTask(data) {
 // 修改数据调查-户主信息
 export function updateNh(data) {
   return request({
-    url: '/home/homesteadnhhncy/edit',
+    url: '/home/homesteadnh/edit',
     method: 'post',
     data: data
   })

src/api/homesteadSurvey/nmfw.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-农民房屋列表
 export function listNmfw(query) {
   return request({
-    url: '/houseSurvey/nmfw/list',
+    url: '/home/homesteadnmfw/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listNmfw(query) {
 // 导出数据调查-农民房屋
 export function exportNmfw(query) {
   return request({
-    url: '/houseSurvey/nmfw/export',
+    url: '/home/homesteadnmfw/export',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function exportNmfw(query) {
 // 查询数据调查-农民房屋详细
 export function getNmfw(id) {
   return request({
-    url: '/houseSurvey/nmfw/get/' + id,
+    url: '/home/homesteadnmfw/get/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getNmfw(id) {
 // 新增数据调查-农民房屋
 export function addNmfw(data) {
   return request({
-    url: '/houseSurvey/nmfw/add',
+    url: '/home/homesteadnmfw/add',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function addNmfw(data) {
 // 新增数据调查-户主信息
 export function nmfwConnectTask(data) {
   return request({
-    url: '/houseSurvey/nmfw/connectTask',
+    url: '/home/homesteadnmfw/connectTask',
     method: 'post',
     data: data
   })
@@ -47,7 +47,7 @@ export function nmfwConnectTask(data) {
 // 修改数据调查-农民房屋
 export function updateNmfw(data) {
   return request({
-    url: '/houseSurvey/nmfw/edit',
+    url: '/home/homesteadnmfw/edit',
     method: 'post',
     data: data
   })
@@ -56,7 +56,7 @@ export function updateNmfw(data) {
 // 删除数据调查-农民房屋
 export function delNmfw(id) {
   return request({
-    url: '/houseSurvey/nmfw/remove/' + id,
+    url: '/home/homesteadnmfw/remove/' + id,
     method: 'get'
   })
 }

src/api/homesteadSurvey/shyqr.js

@@ -49,7 +49,7 @@ export function getShyqr(id) {
 // 新增数据调查-使用权人
 export function addShyqr(data) {
   return request({
-    url: '/houseSurvey/shyqr/add',
+    url: '/home/homesteadshyqr/add',
     method: 'post',
     data: data
   })
@@ -58,7 +58,7 @@ export function addShyqr(data) {
 // 修改数据调查-使用权人
 export function updateShyqr(data) {
   return request({
-    url: '/houseSurvey/shyqr/edit',
+    url: '/home/homesteadshyqr/edit',
     method: 'post',
     data: data
   })

src/api/homesteadSurvey/suyqr.js

@@ -29,7 +29,7 @@ export function getSuyqr(id) {
 // 新增数据调查-所有权利人
 export function addSuyqr(data) {
   return request({
-    url: '/houseSurvey/suyqr/add',
+    url: '/home/homesteadsuyqr/add',
     method: 'post',
     data: data
   })
@@ -47,7 +47,7 @@ export function suyqrConnectTask(data) {
 // 修改数据调查-所有权利人
 export function updateSuyqr(data) {
   return request({
-    url: '/houseSurvey/suyqr/edit',
+    url: '/home/homesteadsuyqr/edit',
     method: 'post',
     data: data
   })

src/api/homesteadSurvey/zjdzd.js

@@ -22,6 +22,14 @@ export function listZjdzd(query) {
     params: query
   })
 }
+// 查询数据调查-签字确认
+export function zjddcSign(data,zjddm) {
+  return request({
+    url: '/home/homesteadzjdzdxx/zjddc/sign/'+zjddm,
+    method: 'post',
+    data: data
+  })
+}
 // 导出数据调查-宅基地宗地
 export function exportZjdzd(query) {
   return request({

src/api/homesteadSurvey/zrz.js

@@ -21,7 +21,7 @@ export function exportZrz(query) {
 // 查询数据调查-自然幢详细
 export function getZrz(id) {
   return request({
-    url: '/houseSurvey/zrz/get/' + id,
+    url: '/home/homespacezrz/get/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getZrz(id) {
 // 新增数据调查-自然幢
 export function addZrz(data) {
   return request({
-    url: '/houseSurvey/zrz/add',
+    url: '/home/homespacezrz/add',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function addZrz(data) {
 // 修改数据调查-自然幢
 export function updateZrz(data) {
   return request({
-    url: '/houseSurvey/zrz/edit',
+    url: '/home/homespacezrz/edit',
     method: 'post',
     data: data
   })

src/components/Map/MapGisObtainTj.vue

@@ -0,0 +1,264 @@
+<template>
+  <div>
+    <p class="fuTitle">地块位置</p>
+    <div id="full-screen-acceptance" style="width: 100%;height:45vh;position:relative;">
+        <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
+      </div>
+<!--    <div id="info" > <button type="button" @click="showHistoryDown">保 存</button></div>-->
+  </div>
+</template>
+
+<script>
+  import {selectHomesteadObligeeMapList,getQueryLand} from "@/api/sunVillage_info/homestead/paidExit";
+import $ from "jquery";
+
+export default {
+  components: {
+    getQueryLand
+  },
+  data() {
+    return {
+      uuidMap: this.guidProduct(),
+      map:this.guidProduct(),
+      showHistoryTable: false,
+      closeMoule: null,
+    };
+  },
+  props: ['theGeom','shqrxm',"landStatus","deptId"],
+  methods: {
+    //地图加载
+    guidProduct(){
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    //地图查看
+    drawingLyPaceCountryDarw() {
+      //加载地图编辑
+      var that = this;
+      selectHomesteadObligeeMapList({shyqrdbxm:this.shqrxm,landStatus:this.landStatus,deptId:this.deptId}).then((response) => {
+        if (response.code == 200) {
+
+          document.getElementById(that.uuidMap).innerHTML = '';
+          var hc_land;
+          var projection = new ol.proj.Projection({
+            //地图投影类型
+            code: "EPSG:3857",
+            units: "degrees",
+            //extent:extent
+          });
+
+          var aerial = new ol.layer.Tile({
+            source: new ol.source.XYZ({
+              url: "http://t{0-7}.tianditu.com/img_w/wmts?" +
+                "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+                "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+            }),
+            isGroup: true,
+            name: "卫星影像图",
+            resolution:Math.random() * 0.00000001
+          });
+
+          var yingxzi = new ol.layer.Tile({
+            source: new ol.source.XYZ({
+              url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
+            }),
+            isGroup: true,
+            name: "天地图文字标注--卫星影像图",
+            resolution:Math.random() * 0.00000001
+          });
+          //加载地图
+          that.map = new ol.Map({
+            controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
+            layers: [aerial, yingxzi],
+            projection: projection,
+            target: that.uuidMap,
+            view: new ol.View({
+              //center: ol.proj.fromLonLat([115.452752, 31.789033]),
+              zoom: 15,
+              minZoom: 5, //地图缩小限制
+              maxZoom: 18.3, //地图放大限制
+            }),
+            interactions: ol.interaction.defaults({
+              pinchRotate: false // 移动端禁止地图旋转
+            }),
+            //view: new ol.View({ol.view.getResolution() + Math.random() * 0.00000001)});//随机数缩放实现刷新
+          });
+          if (response.data.length > 0) {
+            //setTimeout(() => {
+            for (var i = 0; response.data.length > i; i++) {
+              //图层查询定位开始 ---------start
+              console.log( response.data[i].zjdzdxx.theGeom);
+              hc_land = new ol.layer.Vector({
+                title: "add Layer",
+                source: new ol.source.Vector({
+                  projection: projection,
+                  features: new ol.format.GeoJSON().readFeatures("{\n" +
+                    "    \"type\": \"Feature\",\n" +
+                    "    \"geometry\":" + response.data[i].zjdzdxx.theGeom  + ",  " +
+                    "  \"properties\":" + JSON.stringify(response.data[i]) + "}"),
+                }),
+                resolution:Math.random() * 0.00000001,
+                style: new ol.style.Style({
+                  fill: new ol.style.Fill({
+                    //矢量图层填充颜色，以及透明度
+                    color: "rgba(204, 255, 204,0.3)",
+                  }),
+                  stroke: new ol.style.Stroke({
+                    //边界样式
+                    color: "#CCFF66",
+                    width: 3,
+                  }),
+                }),
+              });
+              that.map.addLayer(hc_land);
+              var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
+              var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
+              var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
+              var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
+              //定位查询位置
+              var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+              console.info(center)
+              that.map.getView().animate({
+                // 只设置需要的属性即可
+                center: center, // 中心点
+                zoom: 16.9, // 缩放级别
+                rotation: undefined, // 缩放完成view视图旋转弧度
+                duration: 1000, // 缩放持续时间，默认不需要设置
+                resolution:Math.random() * 0.00000001,
+              });
+            }
+          } else {  // 加载全部地图，不带宅基地图斑
+            let deptId = this.deptId;
+            getQueryLand(deptId).then((response) => {
+              if (response.code == 200) {
+                let InsertCode = response.data;
+                if (InsertCode != null) {
+                  let lat = InsertCode.lat;
+                  let lng = InsertCode.lng;
+                  console.info(lat);
+                  let center;
+                  if(lat !=null && lng !=null && lat !="" && lng !=""){
+                    center = [lng,lat];
+                  }else {
+                    center = [115.452752, 31.789033];
+                  }
+                  console.info(center);
+                  that.map.getView().animate({
+                    // 只设置需要的属性即可
+                    center: ol.proj.fromLonLat(center), // 中心点
+                    zoom: 17.9, // 缩放级别
+                    rotation: undefined, // 缩放完成view视图旋转弧度
+                    duration: 1000, // 缩放持续时间，默认不需要设置
+                  });
+                }
+              }
+            });
+          }
+          var geo_zjdzd;
+          that.map.on("singleclick", function (evt) {
+            let feature = that.map.forEachFeatureAtPixel(
+              evt.pixel,
+              (feature) => feature
+            );
+            //document.getElementById(that.uuidMap).innerHTML = '';
+            if (feature && (feature !==undefined)) {
+              that.map.removeLayer(geo_zjdzd);
+              var aleft = [];
+              for(var i=0;i<feature.values_.geometry.flatCoordinates.length;i++){
+                aleft.push("["+feature.values_.geometry.flatCoordinates[i]+","+feature.values_.geometry.flatCoordinates[i+1] +"]")
+                i = i+1;
+              }
+              var aright = "[[["+aleft +"]]]";
+              var geoThegeom = "{\"type\": \"MultiPolygon\", \"coordinates\": "+aright + "}";
+              this.closeMoule= null;
+              //图层查询定位开始 ---------start
+              geo_zjdzd = new ol.layer.Vector({
+                title: "add Layer",
+                source: new ol.source.Vector({
+                  projection: projection,
+                  features: new ol.format.GeoJSON().readFeatures("{\n" +
+                    "    \"type\": \"Feature\",\n" +
+                    "    \"geometry\":" + geoThegeom + "}"),
+                }),
+                resolution:Math.random() * 0.00000001,
+                style: new ol.style.Style({
+                  fill: new ol.style.Fill({
+                    //矢量图层填充颜色，以及透明度
+                    color: "rgb(204, 255, 255,0.5)",
+                  }),
+                  stroke: new ol.style.Stroke({
+                    //边界样式
+                    color: "#00FFFF",
+                    width: 3,
+                  }),
+                }),
+              });
+              that.map.addLayer(geo_zjdzd);
+              //that.closeMoule = feature.values_.zjddm;
+              that.$emit('closeMoule', feature.values_.zjddm);
+              var maxXMap = geo_zjdzd.values_.source.featuresRtree_.rbush_.data.maxX;
+              var maxYMap = geo_zjdzd.values_.source.featuresRtree_.rbush_.data.maxY;
+              var minXMap = geo_zjdzd.values_.source.featuresRtree_.rbush_.data.minX;
+              var minYMap = geo_zjdzd.values_.source.featuresRtree_.rbush_.data.minY;
+              //定位查询位置
+              var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+              that.map.getView().animate({
+                // 只设置需要的属性即可
+                center: center, // 中心点
+                zoom: 16.9, // 缩放级别
+                rotation: undefined, // 缩放完成view视图旋转弧度
+                duration: 1000, // 缩放持续时间，默认不需要设置
+                resolution:Math.random() * 0.00000001,
+              });
+
+            }
+          });
+        }
+      });
+    },
+    showHistoryDown() {
+      this.showHistoryTable = false;
+      this.$emit('closeMoule', this.closeMoule);
+      this.closeMoule = null;
+    },
+  },
+  watch: {},
+};
+</script>
+
+<style scoped>
+#that.message {
+  width: 100%;
+  height: 100%;
+}
+.fuTitle {
+  border-top: 1px solid #e9e9e9;
+  text-align: center;
+  padding: 10px 0px 0px 0px;
+  font-size: 36px;
+  color: #999;
+}
+.ant-btn-red {
+  position: relative;
+  display: inline-block;
+  background: #D0EEFF;
+  border: 1px solid #99D3F5;
+  border-radius: 4px;
+  padding: 4px 12px;
+  overflow: hidden;
+  color: #1E88C7;
+  text-decoration: none;
+  text-indent: 0;
+  line-height: 20px;
+
+}
+#land-btn-wrap{
+  position: absolute;
+  right: 3%;
+  top: 5%;
+  z-index: 2000;
+}
+</style>

src/permission.js

@@ -177,7 +177,7 @@ const whiteList = [
   // '/agriculturalTrusteeship/billDetail4',//买家选购-订单详情
   // '/agriculturalTrusteeship/evaluate',//买家选购-服务评价
 
-  '/plotPremisesMobile/index',//两清三化
+  '/plotPremisesMobile/index',//闲置资源
 
 ]
 

src/router/index.js

@@ -416,12 +416,12 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/user/supply/supplyAdd'], resolve)
   },
-  //两清三化宅基地
+  //闲置资源宅基地
   {
     path: '/homestead/index',
     name: 'homesteadIndex',
     meta: {
-      title: '两清三化宅基地',
+      title: '闲置资源宅基地',
       hidden: true,
     },
     component: (resolve) => require(['@/views/homestead/index'], resolve)
@@ -435,12 +435,12 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/homestead/login'], resolve)
   },
-  //两清三化宅基地
+  //闲置资源宅基地
   {
     path: '/authenticRight/index',
     name: 'authenticRightIndex',
     meta: {
-      title: '两清三化宅基地',
+      title: '闲置资源宅基地',
       hidden: true,
     },
     component: (resolve) => require(['@/views/authenticRight/index'], resolve)
@@ -2975,6 +2975,96 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/homesteadSurvey/shyqrAdd'], resolve)
   },
+  {
+    path: '/homesteadSurvey/nhcyAdd',
+    name: 'nhcyAdd',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/nhcyAdd'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/hncyList2',
+    name: 'hncyList2',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/hncyList2'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/hncyDetails',
+    name: 'hncyDetails',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/hncyDetails'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/nhAdd',
+    name: 'nhAdd',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/nhAdd'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/nhDetails',
+    name: 'nhDetails',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/nhDetails'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/zrzAdd',
+    name: 'zrzAdd',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/zrzAdd'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/nhcyList',
+    name: 'nhcyList',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/nhcyList'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/nmfwList',
+    name: 'nmfwList',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/nmfwList'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/nmfwAdd',
+    name: 'nmfwAdd',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/nmfwAdd'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/fsssAdd',
+    name: 'fsssAdd',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/fsssAdd'], resolve)
+  },
   {
     path: '/homesteadSurvey/settle',
     name: 'homesteadSettle',
@@ -5267,12 +5357,12 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/agriculturalTrusteeship/buyer/evaluate'], resolve)
   },
-  //<--------------------------------------两清三化-------------------------------------->
+  //<--------------------------------------闲置资源-------------------------------------->
   {
     path: '/plotPremisesMobile/index',
     name: 'plotPremisesMobile',
     meta: {
-      title: '两清三化',
+      title: '闲置资源',
       hidden: true,
     },
     component: (resolve) => require(['@/views/plotPremisesMobile/index'], resolve)

src/views/homestead/login.vue

@@ -3,7 +3,7 @@
     <div class="login_header"></div>
     <div class="login_content">
       <div class="homestead_wrap">
-        <div class="key_title">环翠区两清三化</div>
+        <div class="key_title">环翠区闲置资源</div>
         <div class="slogan">数据调查系统</div>
       </div>
       <div class="from_wrap">

src/views/homesteadSurvey/add.vue

@@ -44,9 +44,9 @@
         </van-row>
       </div>
     </van-sticky>
-    <van-form @submit="submitzjd">
+    <van-form  ref="form">
       <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
-        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">宅基地信息</p>
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">空间信息</p>
         <!--<van-field
           v-model="form.deptId"
           name="行政区划名称"
@@ -66,12 +66,14 @@
         />
         <van-field
           autocomplete="off"
-          v-model="form.zjddm"
-          name="宅基地代码"
-          label="宅基地代码"
-          placeholder="自动生成"
+          v-model="form.zldwdm"
+          name="坐落单位代码"
+          label="坐落单位代码"
+          placeholder="坐落单位代码"
           input-align="right"
-          disabled
+          v-show="false"
+          required
+          :rules="[{ required: true}]"
         />
         <van-field
           autocomplete="off"
@@ -80,36 +82,24 @@
           name="宗地代码"
           label="宗地代码"
           placeholder="自动生成"
-          disabled
-          v-show="false"
         />
-        <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
-          <template #input>
-            <van-radio-group v-model="form.sffz" 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="form.zjdzsh"
-          name="宅基地证书号"
-          label="宅基地证书号"
-          placeholder="宅基地证书号"
-          maxlength="50"
           autocomplete="off"
+          input-align="right"
+          v-model="form.bdcdyh"
+          name="不动产单元号"
+          label="不动产单元号"
+          placeholder="不动产单元号"
         />
         <van-field
           autocomplete="off"
           input-align="right"
-          v-model="form.zjdpzmj"
-          name="批准面积(㎡)"
-          label="批准面积(㎡)"
-          placeholder="单位：平方米"
-          type="number"
-          maxlength="15"
+          v-model="form.zl"
+          name="坐落"
+          label="坐落"
+          placeholder="坐落"
+          required
+          :rules="[{ required: true }]"
         />
         <van-field
           autocomplete="off"
@@ -120,28 +110,86 @@
           label="宗地面积(㎡)"
           placeholder="宗地面积(㎡)"
           maxlength="15"
+          required
+          :rules="[{ required: true }]"
+        />
+        <field-select
+          v-model="form.yt"
+          label="用途"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择用途"
+          remote-url="/system/dict/data/type/land_use"
+          :on-remote-response="'data'"
+          required
+          :rules="[{ required: true }]"
+        />
+        <field-select
+          v-model="form.dj"
+          label="等级"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择等级"
+          remote-url="/system/dict/data/type/tddj"
+          :on-remote-response="'data'"
         />
-
         <van-field
           autocomplete="off"
           input-align="right"
-          v-model="form.zl"
-          name="坐落"
-          label="坐落"
-          placeholder="坐落"
-          required
-          :rules="[{ required: true, message: '坐落不能为空' }]"
+          v-model="form.jg"
+          name="价格(万元)"
+          label="价格(万元)"
+          placeholder="价格(万元)"
+          type="number"
+          maxlength="15"
+        />
+        <field-select
+          v-model="form.dj"
+          label="权利类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择权利类型"
+          remote-url="/system/dict/data/type/rights_type"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.dj"
+          label="权利类型方式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择权利类型方式"
+          remote-url="/system/dict/data/type/right_setting_mode"
+          :on-remote-response="'data'"
         />
         <van-field
           autocomplete="off"
-          v-model="form.zldwdm"
-          name="坐落单位代码"
-          label="坐落单位代码"
-          placeholder="自动生成"
           input-align="right"
-          disabled
-          v-show="false"
+          v-model="form.rjl"
+          name="容积率"
+          label="容积率"
+          placeholder="容积率"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.jzmd"
+          name="建筑密度"
+          label="建筑密度"
+          placeholder="建筑密度"
+          type="number"
+          maxlength="15"
         />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.jzxg"
+          name="建筑限高"
+          label="建筑限高"
+          placeholder="建筑限高"
+          type="number"
+          maxlength="15"
+        />
+
         <van-field
           autocomplete="off"
           input-align="right"
@@ -151,7 +199,7 @@
           placeholder="宗地四至-东"
           maxlength="150"
           required
-          :rules="[{ required: true, message: '宗地四至-东不能为空' }]"
+          :rules="[{ required: true, message: '' }]"
         />
         <van-field
           autocomplete="off"
@@ -162,7 +210,7 @@
           placeholder="宗地四至-南"
           maxlength="150"
           required
-          :rules="[{ required: true, message: '宗地四至-南不能为空' }]"
+          :rules="[{ required: true, message: '' }]"
         />
         <van-field
           input-align="right"
@@ -172,7 +220,7 @@
           placeholder="宗地四至-西"
           maxlength="150"
           required
-          :rules="[{ required: true, message: '宗地四至-西不能为空' }]"
+          :rules="[{ required: true, message: '' }]"
         />
         <van-field
           autocomplete="off"
@@ -183,7 +231,236 @@
           placeholder="宗地四至-北"
           maxlength="150"
           required
-          :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
+          :rules="[{ required: true}]"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.tfh"
+          name="图幅号"
+          label="图幅号"
+          placeholder="图幅号"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.djh"
+          name="地籍号"
+          label="地籍号"
+          placeholder="图幅号"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.bz"
+          name="备注"
+          label="备注"
+          placeholder="备注"
+        />
+        <field-select
+          v-model="form.sjly"
+          label="数据来源"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择数据来源"
+          remote-url="/system/dict/data/type/sjly"
+          :on-remote-response="'data'"
+          required
+          :rules="[{ required: true}]"
+        />
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">属性信息</p>
+        <field-select
+          v-model="form.zjdqdfs"
+          label="取得方式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择取得方式"
+          remote-url="/system/dict/data/type/acquisition_method"
+          :on-remote-response="'data'"
+        />
+        <van-field
+                        autocomplete="off"
+                        input-align="right"
+                        v-model="form.zjdqdsj"
+                        name="取得时间"
+                        label="取得时间"
+                        placeholder="取得时间"
+                        readonly
+                        @click="showZjdqdsj = true"
+                      />
+        <van-popup v-model:show="showZjdqdsj" position="bottom">
+                        <van-datetime-picker
+                          type="date"
+                          @confirm="onConfirmzjdqdsj"
+                          @cancel="showZjdqdsj = false"
+                          :min-date="minDate"
+                          :max-date="maxDate"
+                        />
+        </van-popup>
+        <FieldRadio
+          v-model="form.isMore"
+          label="是否一户多宅"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfcz"
+          label="是否超占"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+          @change="onSfczChanged"
+        />
+        <van-field
+          v-if="showCzmj"
+          autocomplete="off"
+          input-align="right"
+          v-model="form.czmj"
+          type="number"
+          name="超占面积(㎡)"
+          label="超占面积(㎡)"
+          placeholder="超占面积(㎡)"
+          maxlength="15"
+          required
+          :rules="[{ required: true, message: '' }]"
+        />
+        <FieldRadio
+          v-model="form.sffz"
+          label="是否发证"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+          @change="onSffzChanged"
+        />
+        <van-field
+          v-if="showFzxx"
+          input-align="right"
+          v-model="form.zsh"
+          name="证书号"
+          label="证书号"
+          placeholder="证书号"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '' }]"
+        />
+        <van-field
+          v-if="showFzxx"
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zsmj"
+          type="number"
+          name="证书面积(㎡)"
+          label="证书面积(㎡)"
+          placeholder="证书面积(㎡)"
+          maxlength="15"
+          required
+          :rules="[{ required: true, message: '' }]"
+        />
+        <van-field
+          v-if="showFzxx"
+          input-align="right"
+          v-model="form.fzdw"
+          name="发证单位"
+          label="发证单位"
+          placeholder="发证单位"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '' }]"
+        />
+        <van-field
+          v-if="showWbzyy"
+          input-align="right"
+          v-model="form.wbzyy"
+          name="未办证原因"
+          label="未办证原因"
+          placeholder="未办证原因"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '' }]"
+        />
+        <field-select
+          v-model="form.houseOwnership"
+          label="权利归属"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择权利归属"
+          remote-url="/system/dict/data/type/house_ownership"
+          :on-remote-response="'data'"
+        />
+        <field-select
+        v-model="form.landStatus"
+        label="使用状态"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择使用状态"
+        remote-url="/system/dict/data/type/land_status"
+        :on-remote-response="'data'"
+      />
+        <field-select
+          v-model="form.zjdlyzk"
+          label="利用状况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择利用状况"
+          remote-url="/system/dict/data/type/zjdlyzk"
+          :on-remote-response="'data'"
+          @change="onZjdlyzkChanged"
+        />
+        <van-field
+          v-if="showXzyy"
+          input-align="right"
+          v-model="form.zjdxzyy"
+          name="闲置原因"
+          label="闲置原因"
+          placeholder="闲置原因"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '' }]"
+        />
+        <van-field
+          v-if="showXzyy"
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zjdxzqssj"
+          name="闲置起始时间"
+          label="闲置起始时间"
+          placeholder="闲置起始时间"
+          required
+          :rules="[{ required: true, message: '' }]"
+          readonly
+          @click="showXzqssj = true"
+        />
+        <van-popup v-model:show="showXzqssj" position="bottom">
+          <van-datetime-picker
+            type="date"
+            @confirm="onConfirmxzqssj"
+            @cancel="showXzqssj = false"
+            :min-date="minDate"
+            :max-date="maxDate"
+          />
+        </van-popup>
+        <field-select
+          v-model="form.landPhms"
+          label="盘活利用模式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择盘活利用模式"
+          remote-url="/system/dict/data/type/phlyms"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.nsy"
+          type="number"
+          name="年收益(元)"
+          label="年收益(元)"
+          placeholder="年收益(元)"
+          maxlength="15"
         />
 <!--        <van-collapse v-model="activeZjd">-->
 <!--          <van-collapse-item title="利用状况" name="1" class="label-class">-->
@@ -450,8 +727,7 @@
         <MapGisDrawing ref="zjdProductResh" :message="form.theGeomJson" :zjddm="form.zjddm"  ></MapGisDrawing>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" native-type="submit">保存</van-button>
-        <van-button plain color="#22B7F2" round type="info" style="width:45%" native-type="submit">取消</van-button>
+        <van-button round color="#22B7F2" style="width:45%"  @click="submitzjd">保存</van-button>
       </div>
       <div style="height: 50px;"></div>
     </van-form>
@@ -461,6 +737,8 @@
 <script>
 import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
 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 {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
 import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
@@ -475,7 +753,7 @@ import { Notify, Dialog, Toast } from 'vant';
 import axios from "axios";
 export default {
   name: "homesteadAdd",
-  components: { MapGisDrawing,},
+  components: { MapGisDrawing,FieldSelect, FieldRadio},
   data() {
     return {
       active:1,
@@ -487,13 +765,31 @@ export default {
           nhdm :'777888999',
         }
       ],
+      showZjdqdsj:false,
+      showCzmj:false,
+      showFzxx:false,
+      showWbzyy:false,
+      showXzyy:false,
+      showXzqssj:false,
+      minDate: new Date(),
+      maxDate: new Date(2025, 10, 1),
       form:{}
     };
   },
   created(){
     let data = this.$route.query.res;
     this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
-    console.info(this.form);
+    if(this.form.sfcz === "1"){
+      this.showCzmj = true;
+    }
+    if(this.form.sffz === "1"){
+      this.showFzxx = true;
+    }else{
+      this.showWbzyy = true;
+    }
+    if(this.form.zjdlyzk !== "1"){
+      this.showXzyy = true;
+    }
     this.onSubmitzjd();
   },
   mounted(){
@@ -506,17 +802,22 @@ export default {
       }, 500);
     },
     submitzjd(){
-      updateZjdzd(this.form).then(response => {
-        let _this =this
-        this.$toast({
-          icon: 'success', // 找到自己需要的图标
-          message: '保存成功',
-          duration:"1000",
-          onClose:function(){
-            _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
-          }
-        })
+      this.$refs.form.validate().then(() => {
+          updateZjdzd(this.form).then(response => {
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '保存成功',
+              duration:"1000",
+              onClose:function(){
+                _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+              }
+            })
+          });
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
       });
+
     },
     guidProduct(){
       return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -529,6 +830,40 @@ export default {
     MapTag: function (data) {
       this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
     },
+    onConfirmzjdqdsj(data){
+      this.form.zjdqdsj = this.getNowFormatDate(data).substr(0,10);
+      this.showZjdqdsj = false;
+    },
+    onConfirmxzqssj(data){
+      this.form.zjdxzqssj = this.getNowFormatDate(data).substr(0,10);
+      this.showXzqssj = false;
+    },
+    /**是否超占处理*/
+    onSfczChanged(val){
+      if(val === '1'){
+        this.showCzmj = true;
+      }else{
+        this.showCzmj = false;
+      }
+    },
+    /**是否发证*/
+    onSffzChanged(val){
+      if(val === '1'){
+        this.showFzxx = true;
+        this.showWbzyy = false;
+      }else{
+        this.showFzxx = false;
+        this.showWbzyy = true;
+      }
+    },
+    /**宅基地利用状态处理*/
+    onZjdlyzkChanged(val){
+      if(val.dictValue === '1'){
+        this.showXzyy = false;
+      }else{
+        this.showXzyy = true;
+      }
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){
@@ -540,7 +875,7 @@ export default {
       } else {
         this.$cookies.set("search","");
       }
-      this.$router.push({name:'homesteadList'});
+      this.$router.push({name: this.$router.back(-1)});
       // }
     },
   }

src/views/homesteadSurvey/add2.vue

@@ -89,7 +89,7 @@
         <p style="font-size: 16px;" @click="showPopupsyqr('')">+ 添加使用权人</p>
       </div>
       <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
-        <p style="font-size: 16px;" @click="showPopupnh('')">+ 添加农户信息</p>
+        <p style="font-size: 16px;" @click="showPopupnhcy()">+ 添加农户信息</p>
       </div>
     </div>
   </div>
@@ -130,7 +130,7 @@ export default {
   },
   methods: {
     getList(){
-      getShyqrs({zjddm:this.zjdzdxx.zjddm,shyqrdbxm:this.zjdzdxx.shyqrdbxm }).then(response => {
+      getShyqrs({zjddm:this.zjdzdxx.zjddm}).then(response => {
         this.syqrlist = response.rows;
       });
     },
@@ -145,14 +145,21 @@ export default {
       } else {
         this.$cookies.set("search","");
       }
-      this.$router.push({name:'homesteadList'});
+      this.$router.push({name: this.$router.back(-1)});
       // }
     },
-    showPopupsyqr(){
-      this.$router.push({name:'shyqrAdd'});
+    showPopupsyqr(val){
+      this.$router.push({name:'shyqrAdd',query:val});
+    },
+    showPopupnh(val){
+      this.$router.push({name:'nhAdd',query:val});
+    },
+    showPopupnhcy(){
+      this.$router.push({name:'nhcyAdd',query:{}});
+    },
+    showPopuphncylist(val){
+      this.$router.push({name:'nhcyList',query:val});
     },
-    showPopupnh(){},
-    showPopuphncylist(){},
   }
 }
 </script>

src/views/homesteadSurvey/add3.vue

@@ -65,11 +65,11 @@
             <p style="flex:1;text-align:right;">{{item.zcs}}</p>
           </div>
           <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
               <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
               <span style="font-size: 14px;color: #fff;margin-left: 5px;">自然幢信息</span>
             </p>
-            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopuphncylist(item)">
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="shownmfwlist(item)">
               <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
               <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">房屋列表</span>
             </p>
@@ -81,7 +81,7 @@
       </van-swipe-cell>
       <div style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
         <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
-          <p style="font-size: 16px;">+ 添加自然幢信息</p>
+          <p style="font-size: 16px;" @click="showPopupAddzrz()">+ 添加自然幢信息</p>
         </div>
       </div>
     </div>
@@ -136,13 +136,20 @@ export default {
       } else {
         this.$cookies.set("search","");
       }
-      this.$router.push({name:'homesteadList'});
+      this.$router.push({name: this.$router.back(-1)});
       // }
     },
-    showPopupzrz(){},
-    shownmfwlist(){},
+    showPopupzrz(val){
+      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}});
+    },
+    shownmfwlist(val){
+      this.$router.push({name:'nmfwList',query:val});
+    },
     deletezrz(){},
-    showPopupzrz(){},
   }
 }
 </script>

src/views/homesteadSurvey/add4.vue

@@ -65,9 +65,9 @@
           <p style="flex:1;text-align:right;">{{item.jzwqk}}</p>
         </div>
         <div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
             <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">查看附属设施信息</span>
+            <span style="font-size: 14px;color: #fff;margin-left: 5px;" >查看附属设施信息</span>
           </p>
         </div>
       </div>
@@ -77,26 +77,58 @@
     </van-swipe-cell>
     <div style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
       <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
-        <p style="font-size: 16px;">+ 添加附属设施信息</p>
+        <p style="font-size: 16px;" @click="showPopupAddzrz()">+ 添加附属设施信息</p>
       </div>
     </div>
     <div style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
       <p style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
-        <span style="font-size: 14px;color: #fff;margin-left: 5px;">异常标记</span>
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
       <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
-        <span style="font-size: 14px;color: #fff;margin-left: 5px;">签名确认</span>
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
       </p>
       <p style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
-        <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">调查审核</span>
+        <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;"  @click="dcsh()">调查审核</span>
       </p>
     </div>
+    <van-popup v-model="dcshShow" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="examineData"
+        value-key="dictLabel"
+        @confirm="onSurveyStatusChanged"
+        @cancel="dcshShow = false"
+      />
+    </van-popup>
+    <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 5% 5% 5%;border:1px solid #BFBFBF;">
+        <vue-esign
+          ref="esign"
+          class="mySign"
+          :height="200"
+          :isCrop="signature.isCrop"
+          :lineWidth="signature.lineWidth"
+          :lineColor="signature.lineColor"
+          :bgColor.sync="signature.bgColor"
+          v-if="!signature.resultImg"
+        />
+        <img :src="signature.resultImg" alt="" width="100%" height="100%;" v-if="signature.resultImg"/>
+      </van-row>
+      <van-row type="flex" justify="center" v-if="!signature.resultImg" style="margin-bottom:20px;">   <!--v-if="!formEnabled.acceptingForm.townFormEnabled"-->
+        <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>
   </div>
 </template>
 
 <script>
 import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
-import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
+import {listZjdzd,getZjdzd,updateZjdzd,zjddcSign,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
 import MapGisDrawing from "@/components/Map/MapGisDrawing";
 import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
 import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
@@ -111,16 +143,30 @@ import { Notify, Dialog, Toast } from 'vant';
 import axios from "axios";
 export default {
   name: "homesteadAdd",
-  components: { MapGisDrawing,},
+  components: { MapGisDrawing},
   data() {
     return {
       active:4,
-      zjdzdxx:{},
-      fssslist:[]
+      dcshShow:false,
+      showesign:false,
+      examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
+      zjdzdxx:{surveyStatus:"5"},
+      fssslist:[],
+      //电子签名
+      signature: {
+        lineWidth: 6, // 画笔的线条粗细
+        lineColor: "#000000", // 画笔的颜色
+        bgColor: "", // 画布的背景颜色
+        resultImg: "", // 最终画布生成的base64图片
+        isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+      },
     };
   },
   created(){
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    if(this.zjdzdxx.surveySign != null){
+      this.signature.resultImg = "http://localhost/api/"+this.zjdzdxx.surveySign;
+    }
     this.getList();
   },
   mounted(){
@@ -132,6 +178,71 @@ export default {
         this.fssslist = response.rows;
       });
     },
+    onSurveyStatusChanged(val){
+      this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue);
+      updateZjdzd(this.zjdzdxx).then(response => {
+        let _this =this
+        _this.$toast({
+          icon: 'success', // 找到自己需要的图标
+          message: '保存成功',
+          duration:"1000",
+          onClose:function(){
+            _this.dcshShow = false;
+            _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}});
+          }
+        })
+      });
+    },
+    // 清空画板
+    handleReset() {
+      this.resultImg = null
+      if(this.$refs.esign){
+        this.$refs.esign.reset();
+      }
+    },
+    // 生成签字图
+    handleGenerate() {
+      console.info( this.$refs.esign
+        .generate() );
+      this.$refs.esign
+        .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+        .then((res) => {
+          this.signature.resultImg = res;
+          let wj = this.dataURLtoBlob(res);
+          let param = new FormData()  // 创建form对象
+          param.append('file', wj)  // 通过append向form对象添加数据
+          param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+          zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+            this.$notify({type: 'success', message: '签字成功'});
+            this.showesign = false;
+            // location.reload();
+            getZjdzd(this.zjdzdxx.id).then((response) => {
+              localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
+            });
+
+            this.getList();
+          });
+
+        })
+        .catch((err) => {
+          // 画布没有签字时会执行这里提示一下
+          this.$toast.fail('请签名后再保存签字');
+        });
+    },
+    dataURLtoBlob (dataurl, filename = 'file') {
+      let arr = dataurl.split(',')
+      let mime = arr[0].match(/:(.*?);/)[1]
+      let suffix = mime.split('/')[1]
+      let bstr = atob(arr[1])
+      let n = bstr.length
+      let u8arr = new Uint8Array(n)
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+      }
+      return new File([u8arr], `${filename}.${suffix}`, {
+        type: mime
+      })
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){
@@ -143,13 +254,35 @@ export default {
       } else {
         this.$cookies.set("search","");
       }
-      this.$router.push({name:'homesteadList'});
+      this.$router.push({name: this.$router.back(-1)});
       // }
     },
-    showPopupzrz(){},
+    showPopupzrz(item){     this.$router.push({name:'fsssAdd',query:item});},
+    showPopupAddzrz(){
+      this.$router.push({name:'fsssAdd',query:{zjddm:this.zjdzdxx.zjddm}});
+    },
     shownmfwlist(){},
     deletezrz(){},
-    showPopupzrz(){},
+    qmqr(){
+      this.showesign = true;
+    },
+    ycbj(){
+      this.$set(this.zjdzdxx, 'surveyStatus', "2");
+      updateZjdzd(this.zjdzdxx).then(response => {
+        let _this =this
+        this.$toast({
+          icon: 'success', // 找到自己需要的图标
+          message: '保存成功',
+          duration:"1000",
+          onClose:function(){
+            _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}});
+          }
+        })
+      });
+    },
+    dcsh(){
+      this.dcshShow = true;
+    },
   }
 }
 </script>

src/views/homesteadSurvey/fsssAdd.vue

@@ -0,0 +1,368 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <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="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+              <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <van-form ref = "form">
+      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">附属设施信息</p>
+        <!--<van-field
+          v-model="form.deptId"
+          name="行政区划名称"
+          label="行政区划名称"
+          placeholder="行政区划名称"
+          :rules="[{ required: true, message: '' }]"
+        />-->
+        <van-field
+          input-align="right"
+          v-model="form.zjddm"
+          name="宅基地代码"
+          label="宅基地代码"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.fssslx"
+          label="附属设施类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择附属设施类型"
+          remote-url="/system/dict/data/type/fsss_type"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          v-model="form.jzmj"
+          label="建筑面积(m²)"
+          placeholder="请输入建筑面积"
+          input-align="right"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+          type="number"/>
+        <FieldRadio
+          v-model="form.sfzsy"
+          label="是否正在使用"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.jzwqk"
+          label="建筑物情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择建筑物情况"
+          remote-url="/system/dict/data/type/jzwqk"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.jsqtdzk"
+          label="建设前土地状况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择建设前土地状况"
+          remote-url="/system/dict/data/type/land_state"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.remark"
+          name="备注"
+          label="备注"
+          maxlength="50"
+          autocomplete="off"
+        />
+
+        <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>
+        <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
+      </div>
+      <div style="height: 50px;"></div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+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 CommonMap from "@/components/house/CommonMap";
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+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";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  components: {FieldSelect, FieldRadio,CommonMap},
+  name: "zrzAdd",
+  data() {
+    return {
+      active:3,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+      // 地图绘制
+      drawInsert: null,
+      // 当前位置信息
+      tGeoOrganizationLat: null,
+      tGeoOrganizationLng: null,
+      minDate: new Date(),
+      maxDate: new Date(2025, 10, 1),
+      showZgqrzrq:false,
+      form:{}
+    };
+  },
+  created(){
+    let data = this.$route.query;
+    this.form = data;
+    if(this.form.id == null){
+      this.$set(this.form, 'fssslx', "11");
+      this.$set(this.form, 'sfzsy', "1");
+      this.$set(this.form, 'jzwqk', "1");
+      this.$set(this.form, 'jsqtdzk', "1");
+    }
+    this.$nextTick(() => {
+
+      this.pointDarw(null);
+      // this.pointDarwNature(null);
+      this.$refs.pointDarwMap && this.$refs.pointDarwMap.update();
+    })
+  },
+  mounted(){
+
+  },
+  methods: {
+    getList(){
+      listNh({hzzjhm:this.form.shyqrdbzjhm}).then(response => {
+        this.form = response.rows[0];
+      });
+    },
+    submitzjd(){
+      this.$refs.form.validate().then(() => {
+      if(this.form.id == null){
+        addFsss(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }else{
+        updateFsss(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
+      });
+    },
+    // 绘制申请地图
+    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;
+      }
+    },
+    cancel(){
+      this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: this.form.zjddm}});
+    },
+    // 获取登录人位置坐标
+    getLandCoord(func) {
+      if (func
+        && this.tGeoOrganizationLng !== null && this.tGeoOrganizationLng !== ''
+        && this.tGeoOrganizationLat !== null && this.tGeoOrganizationLat !== '') {
+        this.$nextTick(() => {
+          func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        })
+      }
+      else {
+        console.info(this.deptId);
+        getQueryLand(this.deptId).then((response) => {
+          if (response.code == 200) {
+            let InsertCode = response.data;
+            this.form.orgCode = InsertCode.orgCode;
+            this.tGeoOrganizationLat = InsertCode.lat;
+            this.tGeoOrganizationLng = InsertCode.lng;
+            if(func)
+            {
+              func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+            }
+          }
+        });
+      }
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
+    },
+    onConfirmZgqrzrq(data){
+      this.form.jgrq = this.getNowFormatDate(data).substr(0,10);
+      this.showZgqrzrq = false;
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/homesteadSurvey/list.vue

@@ -78,7 +78,7 @@
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
             <template #title>
               <div style="display: flex;align-items: center;">
-                <p style="display: flex;align-items: center;">
+                <p style="display: flex;align-items: center;" >
                   <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
                   <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
                 </p>
@@ -123,10 +123,10 @@
             <div style="display: flex;align-items: center;">
               <p style="display: flex;align-items: center;">
                 <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-                <span style="line-height: 1;">{{limitWords(item.syqr)}}</span>
+                <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
               </p>
-              <p v-if="item.houseDataConfirmStatus=='CONFIRMED'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
-              <p v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="display: flex;align-items: center;color:#ee0a24;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #ee0a24;" @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+              <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
+              <p style="display: flex;align-items: center;color:#ee0a24;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #ee0a24;" @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
               <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>
             </div>
           </template>
@@ -416,7 +416,7 @@
       },
       methods: {
         getList(){
-          rhhcList({surveyStatus:"3"}).then(res => {
+          rhhcList({surveyStatus:"2,3,4,5"}).then(res => {
             this.list1 = res.data.zjdzdxxList;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
@@ -919,7 +919,7 @@
         // 返回
         onClickLeft(){
           this.$cookies.set("search","")
-          this.$router.push('/homesteadSurvey/index');
+          this.$router.push({name: this.$router.back(-1)});
         },
         onConfirmhncysjly(value){
           this.form5.sjlyName = value.dictLabel
@@ -1228,7 +1228,7 @@
           }else{
             let params = {
               "shyqrdbxm" : this.zjdvalue,
-              "surveyStatus":"3",
+              "surveyStatus":"2,3,4,5",
             }
             rhhcList(params).then((response) => {
               if (response.code == 200) {
@@ -1415,7 +1415,7 @@
          if(this.active === 0){
            let params = {
              "shyqrdbxm" : this.zjdvalue,
-             "surveyStatus":"3",
+             "surveyStatus":"2,3,4,5",
            }
            rhhcList(params).then((response) => {
              if (response.code == 200) {

src/views/homesteadSurvey/list2.vue

@@ -841,7 +841,7 @@
         // 返回
         onClickLeft(){
           this.$cookies.set("search","")
-          this.$router.push('/homesteadSurvey/index');
+          this.$router.push({name: this.$router.back(-1)});
         },
         onConfirmhncysjly(value){
           this.form5.sjlyName = value.dictLabel
@@ -1294,11 +1294,7 @@
               "nhdm":item.nhdm,
               "deptId":this.item.deptId
             }
-            listNhhncy(params).then((response) => {
-              if (response.code == 200) {
-                this.hncylist = response.rows
-              }
-            });
+            this.$router.push({name:'hncyList2',query:{nhdm:item.nhdm}});
           }
 
         },
@@ -1330,6 +1326,7 @@
               this.nhform.sjlyName = res.dictLabel
             }
           })
+          this.$router.push({name:'nhDetails',query:{nhdm:item.nhdm,zjhm:item.zjhm}});
         },
       getZjdList(){
          // let params1 = {

src/views/homesteadSurvey/list3.vue

@@ -53,8 +53,9 @@
         </div>
       </div>
     </van-sticky>
-    <van-form @submit="onSubmitsyqr">
+    <van-form ref="form">
       <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">所有权人信息</p>
         <van-field
           autocomplete="off"
           v-model="qlrform.qydm"
@@ -81,7 +82,7 @@
           required
           placeholder="所有权人名称"
           input-align="right"
-          :rules="[{ required: true, message: '所有权人名称不能为空' }]"
+          :rules="[{ required: true}]"
         />
         <van-field
           autocomplete="off"
@@ -91,7 +92,7 @@
           required
           placeholder="所有权性质"
           input-align="right"
-          :rules="[{ required: true, message: '所有权性质不能为空' }]"
+          :rules="[{ required: true}]"
           @click="showsuyqxz = true"
         />
         <van-field
@@ -108,15 +109,16 @@
             @cancel="showsuyqxz = false"
           />
         </van-popup>
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">代表人信息</p>
         <van-field
           autocomplete="off"
           v-model="qlrform.dbrxm"
-          name="代表人姓名"
-          label="代表人姓名"
+          name="姓名"
+          label="姓名"
           required
-          placeholder="代表人姓名"
+          placeholder="姓名"
           input-align="right"
-          :rules="[{ required: true, message: '代表人姓名不能为空' }]"
+          :rules="[{ required: true}]"
         />
         <van-field
           autocomplete="off"
@@ -126,12 +128,12 @@
         <van-field
           autocomplete="off"
           v-model="qlrform.dbrzjlxName"
-          name="代表人证件类型"
-          label="代表人证件类型"
+          name="证件类型"
+          label="证件类型"
           required
-          placeholder="代表人证件类型"
+          placeholder="证件类型"
           input-align="right"
-          :rules="[{ required: true, message: '代表人证件类型不能为空' }]"
+          :rules="[{ required: true}]"
           @click="showdbrzjlx = true"
         />
         <van-popup v-model="showdbrzjlx" position="bottom" input-align="right">
@@ -146,46 +148,46 @@
         <van-field
           autocomplete="off"
           v-model="qlrform.dbrzjhm"
-          name="代表人证件号码"
-          label="代表人证件号码"
+          name="证件号码"
+          label="证件号码"
           required
           placeholder="代表人证件号码"
           input-align="right"
-          :rules="[{ required: true, message: '代表人证件号码不能为空' },{validator:validatorIdcardqlr,message:'身份证号格式错误！'}]"
+          :rules="[{ required: true },{validator:validatorIdcardqlr,message:'身份证号格式错误！'}]"
         />
         <van-field
           autocomplete="off"
           v-model="qlrform.dbrlxdh"
-          name="代表人联系电话"
-          label="代表人联系电话"
-          placeholder="代表人联系电话"
+          name="联系电话"
+          label="联系电话"
+          placeholder="联系电话"
           type="number"
           input-align="right"
           required
-          :rules="[{ required: true, message: '代表人联系电话不能为空' }]"
+          :rules="[{ required: true}]"
         />
         <van-field
           autocomplete="off"
           v-model="qlrform.dbrtxdz"
-          name="代表人通讯地址"
-          label="代表人通讯地址"
+          name="通讯地址"
+          label="通讯地址"
           required
-          placeholder="代表人通讯地址"
+          placeholder="通讯地址"
           input-align="right"
-          :rules="[{ required: true, message: '代表人通讯地址不能为空' }]"
+          :rules="[{ required: true}]"
         />
         <van-field
           autocomplete="off"
           v-model="qlrform.dbryzbm"
-          name="代表人邮政编码"
-          label="代表人邮政编码"
+          name="邮政编码"
+          label="邮政编码"
           required
           placeholder="代表人邮政编码"
           input-align="right"
           maxlength="6"
-          :rules="[{ required: true, message: '代表人邮政编码不能为空' }]"
+          :rules="[{ required: true }]"
         />
-        <van-field name="radio" label="是否成立农村集体经济组织" required input-align="right" autocomplete="off">
+        <van-field name="radio" label="集体经济组织" required input-align="right" autocomplete="off">
           <template #input>
             <van-radio-group v-model="qlrform.sfclncjtjjzz" direction="horizontal">
               <van-radio name="Y">是</van-radio>
@@ -193,12 +195,13 @@
             </van-radio-group>
           </template>
         </van-field>
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">代理人信息</p>
         <van-field
           autocomplete="off"
           v-model="qlrform.dlrxm"
-          name="代理人姓名"
-          label="代理人姓名"
-          placeholder="代理人姓名"
+          name="姓名"
+          label="姓名"
+          placeholder="姓名"
           input-align="right"
         />
         <van-field
@@ -209,9 +212,9 @@
         <van-field
           autocomplete="off"
           v-model="qlrform.dlrzjlxName"
-          name="代理人证件类型"
-          label="代理人证件类型"
-          placeholder="代理人证件类型"
+          name="证件类型"
+          label="证件类型"
+          placeholder="证件类型"
           input-align="right"
           @click="showdlrzjlx = true"
         />
@@ -227,33 +230,33 @@
         <van-field
           autocomplete="off"
           v-model="qlrform.dlrzjhm"
-          name="代理人证件号码"
-          label="代理人证件号码"
-          placeholder="代理人证件号码"
+          name="证件号码"
+          label="证件号码"
+          placeholder="证件号码"
           input-align="right"
         />
         <van-field
           autocomplete="off"
           v-model="qlrform.dlrlxdh"
-          name="代理人联系电话"
-          label="代理人联系电话"
-          placeholder="代理人联系电话"
+          name="联系电话"
+          label="联系电话"
+          placeholder="联系电话"
           input-align="right"
         />
         <van-field
           autocomplete="off"
           v-model="qlrform.dlrtxdz"
-          name="代理人通讯地址"
-          label="代理人通讯地址"
-          placeholder="代理人通讯地址"
+          name="通讯地址"
+          label="通讯地址"
+          placeholder="通讯地址"
           input-align="right"
         />
         <van-field
           autocomplete="off"
           v-model="qlrform.dlryzbm"
-          name="代理人邮政编码"
-          label="代理人邮政编码"
-          placeholder="代理人邮政编码"
+          name="邮政编码"
+          label="邮政编码"
+          placeholder="邮政编码"
           input-align="right"
         />
       </div>
@@ -300,7 +303,7 @@
         input-align="right"
         @click="showsjly = true"
         required
-        :rules="[{ required: true, message: '数据来源不能为空' }]"
+        :rules="[{ required: true}]"
       />
       <van-field
         autocomplete="off"
@@ -326,7 +329,7 @@
       />
     </div>
       <div style="margin: 16px;" v-if="!isFinished">
-        <van-button round block color="#7AC943" native-type="submit">保存</van-button>
+        <van-button round block color="#7AC943" @click="onSubmitsyqr">保存</van-button>
       </div>
     </van-form>
   </div>
@@ -1094,7 +1097,7 @@
         // 返回
         onClickLeft(){
           this.$cookies.set("search","")
-          this.$router.push('/homesteadSurvey/index');
+          this.$router.push({name: this.$router.back(-1)});
         },
         onConfirmhncysjly(value){
           this.form5.sjlyName = value.dictLabel
@@ -1221,30 +1224,35 @@
         },
         // 所有权人保存
         onSubmitsyqr(){
-          if(this.qlrform.id!=null){
-            updateSuyqr(this.qlrform).then(
-              response => {
-                let _this =this
-                this.$toast({
-                  icon: 'success', // 找到自己需要的图标
-                  message: '修改成功',
-                  duration:"1000"
-                })
-              }
-            );
-          }else{
-            this.qlrform.deptId = this.item.deptId
-            addSuyqr(this.qlrform).then(
-              response => {
-                let _this =this
-                this.$toast({
-                  icon: 'success', // 找到自己需要的图标
-                  message: '保存成功',
-                  duration:"1000"
-                })
-              }
-            );
-          }
+          this.$refs.form.validate().then(() => {
+            if(this.qlrform.id!=null){
+              updateSuyqr(this.qlrform).then(
+                response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '修改成功',
+                    duration:"1000"
+                  })
+                }
+              );
+            }else{
+              this.qlrform.deptId = this.item.deptId
+              addSuyqr(this.qlrform).then(
+                response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '保存成功',
+                    duration:"1000"
+                  })
+                }
+              );
+            }
+          }).catch((e) => {
+            Dialog({ type: 'danger', message: '请填写完整的表单项' });
+          });
+
         },
         // 查询所有权人
         getSyqr(){
@@ -5268,6 +5276,17 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  .title:before
+  {
+    content:"";
+    width: 6px;
+    height: 20PX;
+    background: #7ac943;
+    border-radius: 3px;
+    position:absolute;
+    left:0;
+    bottom:0;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list4.vue

@@ -1973,7 +1973,7 @@
         // 返回
         onClickLeft(){
           this.$cookies.set("search","")
-          this.$router.push('/homesteadSurvey/index');
+          this.$router.push({name: this.$router.back(-1)});
         },
         onConfirmhncysjly(value){
           this.form5.sjlyName = value.dictLabel
@@ -3094,7 +3094,7 @@
           //镇边界查询开始 ------------------------------start
           // var zhenTc= new ol.layer.Tile({
           //   source: new ol.source.TileWMS({
-          //     url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+          //     url: that.mapGeoServerUrl+"/wms",
           //     params: {
           //       LAYERS: 'zjd_dc:t_house_survey_border_town',
           //       TILED: true,
@@ -3134,7 +3134,7 @@
           //   outputFormat: "application/json",
           //   //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
           // };
-          // let url_dw = that.mapGeoServerUrl + "/geoserver/zjd_dc/wfs"; //wfsurl;
+          // let url_dw = that.mapGeoServerUrl + "/wfs"; //wfsurl;
           // url_dw = url_dw + "?";
           // for (let key in param_dw) {
           //   url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -3153,9 +3153,9 @@
           //       var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'";
           //       zrzTc = new ol.layer.Image({
           //         source: new ol.source.ImageWMS({
-          //           url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+          //           url: that.mapGeoServerUrl + "/wms",
           //           params: {
-          //             LAYERS: 'zjd_dc:t_house_survey_zrz',
+          //             LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
           //             TILED: true,
           //             cql_filter: cql_filter_map,
           //             SRID: 3857,
@@ -3169,7 +3169,7 @@
           //       //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
           //       fsssTc = new ol.layer.Image({
           //         source: new ol.source.ImageWMS({
-          //           url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+          //           url: that.mapGeoServerUrl + "/wms",
           //           params: {
           //             LAYERS: 'zjd_dc:t_house_survey_fsss',
           //             TILED: true,
@@ -3483,37 +3483,37 @@
           map.addLayer(zjdTc);
           //宅基地图层查询开始 ------------------start
           var zrzTc;
-          // //自然幢图层查询开始 ------------------start
-          // var zrzTc = new ol.layer.Image({
-          //   source: new ol.source.ImageWMS({
-          //     url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
-          //     params: {
-          //       LAYERS: 'zjd_dc:t_house_survey_zrz',
-          //       TILED: true,
-          //       cql_filter: cql_filter,
-          //       SRID: 3857,
-          //       TIMESTAMP: new Date().getTime(),
-          //     },
-          //   }),
-          // });
-          // map.addLayer(zrzTc);
-          // //自然幢图层查询开始 ------------------start
-          //
+          //自然幢图层查询开始 ------------------start
+           zrzTc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/wms",
+              params: {
+                LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
+                TILED: true,
+                cql_filter: cql_filter,
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          map.addLayer(zrzTc);
+          //自然幢图层查询开始 ------------------start
+
           var fsssTc;
           // //附属设施图层查询开始 ------------------start
-          // var fsssTc = new ol.layer.Image({
-          //   source: new ol.source.ImageWMS({
-          //     url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
-          //     params: {
-          //       LAYERS: 'zjd_dc:t_house_survey_fsss',
-          //       TILED: true,
-          //       cql_filter: cql_filter,
-          //       SRID: 3857,
-          //       TIMESTAMP: new Date().getTime(),
-          //     },
-          //   }),
-          // });
-          // map.addLayer(fsssTc);
+           fsssTc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/wms",
+              params: {
+                LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+                TILED: true,
+                cql_filter: cql_filter,
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          map.addLayer(fsssTc);
           // //附属设施图层查询开始 ------------------start
           //使用geoserver服务查询开始 -------------------end
         //   if(this.backMap ==1){
@@ -3527,7 +3527,7 @@
         //       'CQL_FILTER': cql
         //     },
         //     serverType: 'geoserver',
-        //     url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+        //     url: that.mapGeoServerUrl + "/wms",
         //   });
         //   zjdTc.setSource(wmsSourceBack);
         //   ol.view.setResolution(ol.view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新
@@ -4186,7 +4186,7 @@
             //   //查询条件
             //   var cql_filter_cun;
             //   var cun = that.$cookies.get("item").deptId;
-            //   difang = ["zjd_dc:t_house_survey_zjdzd", "zjd_dc:t_house_survey_zrz","zjd_dc:t_house_survey_fsss"];
+            //   difang = ["zjd_dc:t_house_survey_zjdzd", "nsgk_wulanhaote:t_homespace_zrz","zjd_dc:t_house_survey_fsss"];
             //   var tach = 0;
             //   var once = 0;
             //   for (var i = 0; i < difang.length; i++) {
@@ -4202,7 +4202,7 @@
             //       //循环判断查询条件
             //       if (difang[i] == "zjd_dc:t_house_survey_zjdzd") {
             //         cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
-            //       } else if(difang[i] == "zjd_dc:t_house_survey_zrz") {
+            //       } else if(difang[i] == "nsgk_wulanhaote:t_homespace_zrz") {
             //         cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
             //       } else if(difang[i] == "zjd_dc:t_house_survey_fsss") {
             //         cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
@@ -4216,7 +4216,7 @@
             //     //业务图层  wms服务
             //     delete_map[i] = new ol.layer.Tile({
             //       source: new ol.source.TileWMS({
-            //         url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            //         url: that.mapGeoServerUrl+"/wms",
             //         params: {
             //           LAYERS: difang[i],
             //           //'LAYERS': 'new_shp:new_shp_all',
@@ -4242,7 +4242,7 @@
             //       outputFormat: "application/json",
             //       //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
             //     };
-            //     let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl;
+            //     let url_dw = that.mapGeoServerUrl+"/wfs"; //wfsurl;
             //     url_dw = url_dw + "?";
             //     for (let key in param_dw) {
             //       url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -4779,7 +4779,7 @@
               outputFormat: "application/json",
               //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
             };
-            let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl;
+            let url_dw = that.mapGeoServerUrl+"/wfs"; //wfsurl;
             url_dw = url_dw + "?";
             for (let key in param_dw) {
               url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -4822,9 +4822,9 @@
 
           //查询全部图层  -------查询叠加图层出现覆盖问题
           var wmsSource = new ol.source.TileWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "zjd_dc:t_house_survey_all",
+              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx",
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4861,9 +4861,9 @@
 
           //查询附属设施图层
           var FssswmsSource = new ol.source.TileWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "zjd_dc:t_house_survey_fsss",
+              LAYERS: "nsgk_wulanhaote:t_homestead_fsss",
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4976,6 +4976,7 @@
                 }
               }
               if (url_bbox) {
+                console.info(url_bbox);
                 fetch(url_bbox).then((res) => {
                   var geojsonmap = res.json();
                   return geojsonmap;
@@ -5005,6 +5006,7 @@
                     return response.text();
                   })
                   .then(function (html) {
+                    console.info(html);
                     document.getElementById("info").innerHTML = html;
                     if (html.indexOf("<table") != -1) {
                       that.mapZjdData = "";
@@ -5027,9 +5029,9 @@
                           obj.id = zjdIdNum; //	主键id
                           obj.deptName = trs.find("td").eq(3).text();//行政区划名称
 
-                          obj.zjddm = trs.find("td").eq(6).text();//宅基地代码
+                          obj.zjddm = trs.find("td").eq(7).text();//宅基地代码
 
-                          obj.zdmj = trs.find("td").eq(11).text();//宗地面积
+                          obj.zdmj = trs.find("td").eq(12).text();//宗地面积
 
                           obj.active = 1;
 
@@ -5044,9 +5046,9 @@
                           var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                           zrzTc = new ol.layer.Image({
                             source: new ol.source.ImageWMS({
-                              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                              url: that.mapGeoServerUrl + "/wms",
                               params: {
-                                LAYERS: 'zjd_dc:t_house_survey_zrz',
+                                LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
                                 TILED: true,
                                 cql_filter: cql_filter_map,
                                 SRID: 3857,
@@ -5060,9 +5062,9 @@
                           //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                           fsssTc = new ol.layer.Image({
                             source: new ol.source.ImageWMS({
-                              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                              url: that.mapGeoServerUrl + "/wms",
                               params: {
-                                LAYERS: 'zjd_dc:t_house_survey_fsss',
+                                LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
                                 TILED: true,
                                 cql_filter: cql_filter_map,
                                 SRID: 3857,
@@ -5100,7 +5102,7 @@
                                 projection: projection,
                                 features: new ol.format.GeoJSON().readFeatures("{\n" +
                                   "    \"type\": \"Feature\",\n" +
-                                  "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+                                  "    \"geometry\":" + that.mapZjdData.theGeomJson + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
                               }),
                               style: styleZjd
                             });
@@ -5153,8 +5155,9 @@
                           });
                           //let cloneObj = JSON.parse(JSON.stringify(obj));
                           //that.mapZjdData = cloneObj;
-                        } else if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz") {
+                        } else if ($("#info .featureInfo .featureInfo").text() == "t_homespace_zrz") {
                           //that.mapZjdTeAll.mapZjdAData ={};
+                          that.mapXs = true;
                           that.mapZjdDataTure = "";
                           that.mapZjdTeAll.mapFsssAData = {};
                           map.removeLayer(hc_land_on);
@@ -5162,26 +5165,27 @@
                           that.mapHasDateStatus = 1;
                           let trs = $("#info .featureInfo").find("tr:eq(1)");
                           let zrzXq = trs.find("td").eq(0).text();
-                          let zrzIdNum = zrzXq.replace("t_house_survey_zrz.", "");
+                          let zrzIdNum = zrzXq.replace("t_homespace_zrz.", "");
                           obj.id = zrzIdNum; //	主键id
                           obj.deptName = trs.find("td").eq(3).text();//行政区划名称
-                          obj.zjddm = trs.find("td").eq(4).text();//宅基地代码
-                          obj.scjzmj = trs.find("td").eq(12).text();//实测建筑面积
+                          obj.zjddm = trs.find("td").eq(6).text();//宅基地代码
+                          obj.scjzmj = trs.find("td").eq(14).text();//实测建筑面积
                           let params = {
                             "deptId": that.$cookies.get("item").deptId,
                             "zjddm": obj.zjddm,
                           }
+                          that.mapClick = obj.zjddm;
                           that.$cookies.set("search", "")
                           //that.$cookies.set("map", "")
                           console.log(that.mapZjdData);
                           //if (that.mapZjdData !="" && that.mapZjdData !=null && that.mapZjdData !=undefined) {
-                          console.log(that.mapClick);
-                          console.log(obj.zjddm);
                           if(that.mapXs && that.mapClick == obj.zjddm){
+
                             listZjdzd(params).then((response) => {
                               that.mapZjdData = response.rows[0];
                               //that.mapZjdAData.active = 1;
                               that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+                              console.info(obj.id);
                               getZrz(obj.id).then((response) => {
                                 if (response.data.scjzmj != "") {
                                   that.textMjAll = response.data.scjzmj;
@@ -5205,7 +5209,7 @@
                                     projection: projection,
                                     features: new ol.format.GeoJSON().readFeatures("{\n" +
                                       "    \"type\": \"Feature\",\n" +
-                                      "    \"geometry\":" + that.mapZrzData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZrzData) + "}"),
+                                      "    \"geometry\":" + that.mapZrzData.theGeomJson + ",    \"properties\":" + JSON.stringify(that.mapZrzData) + "}"),
                                   }),
                                   style: styleZjd
                                 });
@@ -5231,9 +5235,9 @@
                             var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                             zrzTc = new ol.layer.Image({
                               source: new ol.source.ImageWMS({
-                                url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                                url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'zjd_dc:t_house_survey_zrz',
+                                  LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5247,9 +5251,9 @@
                             //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                             fsssTc = new ol.layer.Image({
                               source: new ol.source.ImageWMS({
-                                url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                                url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'zjd_dc:t_house_survey_fsss',
+                                  LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5285,7 +5289,7 @@
                                   projection: projection,
                                   features: new ol.format.GeoJSON().readFeatures("{\n" +
                                     "    \"type\": \"Feature\",\n" +
-                                    "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+                                    "    \"geometry\":" + that.mapZjdData.theGeomJson+ ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
                                 }),
                                 style: styleZjd
                               });
@@ -5337,28 +5341,30 @@
                               sourceMapLookMap.addFeature(newcenterFeatureMap);
                             });
                           }
-                        } else if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss") {
+                        } else if ($("#info .featureInfo .featureInfo").text() == "t_homestead_fsss") {
                           that.mapZjdTeAll.mapZrzAData = {};
                           that.mapZjdDataTure = "";
+                          that.mapXs = true;
                           //that.mapZjdTeAll.mapZjdAData ={};
                           map.removeLayer(hc_land_on);
                           let obj = {};
                           that.mapHasDateStatus = 0;
                           let trs = $("#info .featureInfo").find("tr:eq(1)");
                           let fsssXq = trs.find("td").eq(0).text();
-                          let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", "");
+                          let fsssIdNum = fsssXq.replace("t_homestead_fsss.", "");
                           obj.id = fsssIdNum; //	主键id
-                          obj.deptName = trs.find("td").eq(4).text();//行政区划名称
-                          obj.zjddm = trs.find("td").eq(1).text();//宅基地代码
+                          obj.deptName = trs.find("td").eq(3).text();//行政区划名称
+                          obj.zjddm = trs.find("td").eq(4).text();//宅基地代码
                           // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态
                           // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型
-                          obj.jzmj = trs.find("td").eq(8).text(); //建筑面积
+                          obj.jzmj = trs.find("td").eq(6).text(); //建筑面积
 
                           let params = {
                             "deptId": that.$cookies.get("item").deptId,
                             "zjddm": obj.zjddm,
                             "pageSize": 20,
                           }
+                          that.mapClick = obj.zjddm;
                           that.$cookies.remove("search")
                           //if (that.mapZjdData !="" && that.mapZjdData !=null && that.mapZjdData !=undefined) {
                           if(that.mapXs && that.mapClick == obj.zjddm){
@@ -5390,7 +5396,7 @@
                                   projection: projection,
                                   features: new ol.format.GeoJSON().readFeatures("{\n" +
                                     "    \"type\": \"Feature\",\n" +
-                                    "    \"geometry\":" + that.mapfsssData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapfsssData) + "}"),
+                                    "    \"geometry\":" + that.mapfsssData.theGeomJson + ",    \"properties\":" + JSON.stringify(that.mapfsssData) + "}"),
                                 }),
                                 style: styleZjd
                               });
@@ -5416,9 +5422,9 @@
                             var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                             zrzTc = new ol.layer.Image({
                               source: new ol.source.ImageWMS({
-                                url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                                url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'zjd_dc:t_house_survey_zrz',
+                                  LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5432,9 +5438,9 @@
                             //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                             fsssTc = new ol.layer.Image({
                               source: new ol.source.ImageWMS({
-                                url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                                url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'zjd_dc:t_house_survey_fsss',
+                                  LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5470,7 +5476,7 @@
                                   projection: projection,
                                   features: new ol.format.GeoJSON().readFeatures("{\n" +
                                     "    \"type\": \"Feature\",\n" +
-                                    "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+                                    "    \"geometry\":" + that.mapZjdData.theGeomJson + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
                                 }),
                                 style: styleZjd
                               });
@@ -5964,19 +5970,34 @@
         },
         //宅基地点击地图核查
         zjdHc(){
+          console.info(this.mapZrzData)
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
             if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
               this.mapZjdTeAll.active =1;
               //this.$cookies.set("search",this.mapZjdTeAll);
               this.$cookies.set("search","")
-              this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+              let trs = $("#info .featureInfo").find("tr:eq(1)");
+              let zjdXq = trs.find("td").eq(0).text();
+              let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", "");
+              getZjdzd(zjdIdNum).then((response) => {
+                this.mapZjdData = response.data;
+                this.mapZjdTeAll.active = 1;
+                this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
+                //this.$cookies.set("search",this.mapZjdTeAll);
+                console.info(this.mapZjdTeAll.mapZjdAData);
+                localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
+                setTimeout(() => {
+                  this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+                }, 500);
+              });
               //this.$router.push({path:'/homesteadSurvey/add'});
             }else if(this.mapZrzData !=undefined && this.mapZrzData !=""){
               if(this.mapZjdTeAll.mapZjdAData !=""){
                 this.mapZjdTeAll.active = 3;
                 //this.$cookies.set("search",this.mapZjdTeAll);
                 this.$cookies.set("search","")
-                this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+                console.info(this.mapZjdTeAll);
+                this.$router.push({path:'/homesteadSurvey/zrzAdd',query: this.mapZjdTeAll.mapZrzAData});
               } else {
                 this.$toast("必须有宅基地数据才能进入自然幢核查");
               }
@@ -5985,7 +6006,7 @@
                 this.mapZjdTeAll.active = 4;
                 //this.$cookies.set("search", this.mapZjdTeAll);
                 this.$cookies.set("search","")
-                this.$router.push({path: '/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+                this.$router.push({path: '/homesteadSurvey/fsssAdd',query: this.mapZjdTeAll.mapFsssAData});
               } else {
                 this.$toast("必须有宅基地数据才能进入附属设施核查");
               }

src/views/homesteadSurvey/nhAdd.vue

@@ -0,0 +1,327 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <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="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+              <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <van-form  ref="form">
+      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农户信息</p>
+        <!--<van-field
+          v-model="form.deptId"
+          name="行政区划名称"
+          label="行政区划名称"
+          placeholder="行政区划名称"
+          :rules="[{ required: true, message: '' }]"
+        />-->
+
+        <van-field
+          input-align="right"
+          v-model="form.hzxm"
+          name="姓名"
+          label="户主姓名"
+          placeholder="请输入户主姓名"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.hzzjlx"
+          label="证件类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请输入户主证件类型"
+          remote-url="/system/dict/data/type/zjlx"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          input-align="right"
+          v-model="form.hzzjhm"
+          name="证件号码"
+          label="证件号码"
+          placeholder="请输入使用权人证件号码"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          input-align="right"
+          v-model="form.hncysl"
+          name="成员数量"
+          label="成员数量"
+          placeholder="请输入成员数量"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <FieldRadio
+          v-model="form.sfwbh"
+          label="是否五保户"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfpkh"
+          label="是否贫困户"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfwzjd"
+          label="是否无宅基地"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfjbzgq"
+          label="是否具备资格权"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zgqrzrq"
+          name="资格权认证日期"
+          label="资格权认证日期"
+          placeholder="资格权认证日期"
+          readonly
+          @click="showZgqrzrq = true"
+        />
+        <van-popup v-model:show="showZgqrzrq" position="bottom">
+          <van-datetime-picker
+            type="date"
+            @confirm="onConfirmZgqrzrq"
+            @cancel="showZgqrzrq = false"
+            :min-date="minDate"
+            :max-date="maxDate"
+          />
+        </van-popup>
+        <van-field
+          input-align="right"
+          v-model="form.hkszd"
+          name="户口所在地"
+          label="户口所在地"
+          placeholder="请输入户口所在地"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.txdz"
+          name="通讯地址"
+          label="通讯地址"
+          placeholder="请输入通讯地址"
+          maxlength="50"
+          autocomplete="off"
+        />
+
+        <van-field
+          input-align="right"
+          v-model="form.bz"
+          name="备注"
+          label="备注"
+          placeholder="请输入备注"
+          maxlength="50"
+          autocomplete="off"
+        />
+      </div>
+      <div style="margin: 16px;display: flex;justify-content: space-around;">
+        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
+      </div>
+      <div style="height: 50px;"></div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+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 {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+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";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  components: {FieldSelect, FieldRadio},
+  name: "nhAdd",
+  data() {
+    return {
+      active:2,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+      minDate: new Date(),
+      maxDate: new Date(2025, 10, 1),
+      showZgqrzrq:false,
+      form:{}
+    };
+  },
+  created(){
+    let data = this.$route.query;
+    console.info(data)
+    this.form = data;
+    if(this.form.shyqrdbzjhm != null){
+      this.getList();
+    }
+
+  },
+  mounted(){
+
+  },
+  methods: {
+    getList(){
+      listNh({hzzjhm:this.form.shyqrdbzjhm}).then(response => {
+        this.form = response.rows[0];
+      });
+    },
+    submitzjd(){
+      this.$refs.form.validate().then(() => {
+      updateNh(this.form).then(response => {
+        let _this =this
+        this.$toast({
+          icon: 'success', // 找到自己需要的图标
+          message: '保存成功',
+          duration:"1000",
+          onClose:function(){
+            _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+          }
+        })
+      });
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
+      });
+    },
+    cancel(){
+      this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: this.form.zjddm}});
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
+    },
+    onConfirmZgqrzrq(data){
+      this.form.zgqrzrq = this.getNowFormatDate(data).substr(0,10);
+      this.showZgqrzrq = false;
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/homesteadSurvey/nhcyAdd.vue

@@ -0,0 +1,355 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <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="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+              <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <van-form ref = "form">
+      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农户成员信息</p>
+        <!--<van-field
+          v-model="form.deptId"
+          name="行政区划名称"
+          label="行政区划名称"
+          placeholder="行政区划名称"
+          :rules="[{ required: true, message: '' }]"
+        />-->
+
+        <van-field
+          input-align="right"
+          v-model="form.xm"
+          name="姓名"
+          label="姓名"
+          placeholder="请输入姓名"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.zjlx"
+          label="证件类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请输入使用权人证件类型"
+          remote-url="/system/dict/data/type/zjlx"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          input-align="right"
+          v-model="form.zjhm"
+          name="证件号码"
+          label="证件号码"
+          placeholder="请输入使用权人证件号码"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.yhzgx"
+          label="与户主关系"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择与户主关系"
+          remote-url="/system/dict/data/type/family_status"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.xb"
+          label="性别"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/sys_user_sex"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.hklx"
+          label="户口类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择户口类型"
+          remote-url="/system/dict/data/type/account_type"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          input-align="right"
+          v-model="form.lxdh"
+          name="联系电话"
+          label="联系电话"
+          placeholder="请输入联系电话"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.hyzk"
+          label="婚姻状况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/hyzk"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.hkszd"
+          name="户口所在地"
+          label="户口所在地"
+          placeholder="请输入户口所在地"
+          maxlength="50"
+          autocomplete="off"
+        />
+
+        <field-select
+          v-model="form.cybz"
+          label="成员备注"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择成员备注"
+          remote-url="/system/dict/data/type/cybz"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.cybzsm"
+          name="备注说明"
+          label="备注说明"
+          placeholder="请输入备注说明"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.sjly"
+          label="数据来源"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择数据来源"
+          remote-url="/system/dict/data/type/sjly"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfbjtjjzzcy"
+          label="是否本集体经济组织成员"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfjbzgq"
+          label="具备资格权"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+      </div>
+      <div style="margin: 16px;display: flex;justify-content: space-around;">
+        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
+      </div>
+      <div style="height: 50px;"></div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+import FieldSelect from "@/components/form/FieldSelect";
+import FieldRadio from "@/components/form/FieldRadio";
+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";
+
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  components: {FieldSelect, FieldRadio},
+  name: "nhctAdd",
+  data() {
+    return {
+      active:2,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+      form:{}
+    };
+  },
+  created(){
+    let data = this.$route.query;
+    this.form = data;
+    if(this.form.id == null){
+      this.$set(this.form, 'zjlx', "01");
+      this.$set(this.form, 'xb', "1");
+      this.$set(this.form, 'yhzgx', "23");
+      this.$set(this.form, 'hklx', "01");
+      this.$set(this.form, 'hyzk', "01");
+      this.$set(this.form, 'sjly', "01");
+      this.$set(this.form, 'sfbjtjjzzcy', "1");
+      this.$set(this.form, 'sfjbzgq', "1");
+    }
+    console.info(data);
+  },
+  mounted(){
+
+  },
+  methods: {
+    getList(){
+      listNhhncy(this.form).then(response => {
+
+      });
+    },
+    submitzjd(){
+      this.$refs.form.validate().then(() => {
+      if(this.form.id == null){
+        addNhhncy(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }else{
+        updateNhhncy(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
+      });
+    },
+    cancel(){
+      this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: this.form.zjddm}});
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/homesteadSurvey/nhcyList.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <template #left>
+            <van-icon name="arrow-left" size="18" color="#fff" />
+          </template>
+          <!-- <template #right>
+          <van-icon name="map-marked" size="18" color="#fff" />
+        </template>-->
+          <template #title>
+            <p style="color:#fff">入户调查</p>
+          </template>
+        </van-nav-bar>
+      </div>
+      <div style="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <div style="margin:30px auto 0;width: 95%;">
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">户内成员</p>
+    </div>
+    <van-swipe-cell v-for="(item,index) in hnnylist" :key="'syqr'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
+      <div style="padding:15px;">
+        <p style="display: flex;align-items: center;">
+          <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+          <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
+        </p>
+        <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">证件号码:</p>
+          <p  style="flex:1;text-align:right;">{{item.zjhm}}</p>
+        </div>
+        <div style="display:flex;line-height:20px;margin-top: 5px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">农户代码:</p>
+          <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
+        </div>
+        <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
+
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopuphncy(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">详情</span>
+          </p>
+        </div>
+      </div>
+      <template #right>
+        <van-button square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
+      </template>
+    </van-swipe-cell>
+  </div>
+</template>
+
+<script>
+import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
+import MapGisDrawing from "@/components/Map/MapGisDrawing";
+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";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  name: "nhcyList",
+  components: { MapGisDrawing,},
+  data() {
+    return {
+      active:2,
+      // 使用权人列表
+      shyqrData:{},
+      hnnylist:[],
+    };
+  },
+  created(){
+    this.shyqrData = this.$route.query;
+    this.getList();
+  },
+  mounted(){
+
+  },
+  methods: {
+    getList(){
+      listNhhncy({nhdm:this.shyqrData.nhdm }).then(response => {
+        this.hnnylist = response.rows;
+      });
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+    showPopupsyqr(val){
+      this.$router.push({name:'shyqrAdd',query:val});
+    },
+    showPopupnh(val){
+
+      this.$router.push({name:'nhcyAdd',query:{nhdm:this.hnnylist[0].nhdm}});
+    },
+    showPopuphncy(val){
+      this.$router.push({name:'nhcyAdd',query:val});
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/homesteadSurvey/nmfwAdd.vue

@@ -0,0 +1,563 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <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="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+              <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <van-form ref = "form">
+      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农民房屋信息</p>
+        <!--<van-field
+          v-model="form.deptId"
+          name="行政区划名称"
+          label="行政区划名称"
+          placeholder="行政区划名称"
+          :rules="[{ required: true, message: '' }]"
+        />-->
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">基本信息</p>
+        <van-field
+          input-align="right"
+          v-model="form.nmfwzh"
+          name="房屋幢号"
+          label="房屋幢号"
+          maxlength="50"
+          autocomplete="off"
+          :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
+          input-align="right"
+          v-model="form.sjcs"
+          name="实际层数"
+          label="实际层数"
+          maxlength="50"
+          autocomplete="off"
+          type="number"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.hh"
+          name="户号"
+          label="户号"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.hx"
+          label="户型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择户型"
+          remote-url="/system/dict/data/type/nmfwhx"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.hxjg"
+          label="户型结构"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择户型结构"
+          remote-url="/system/dict/data/type/nmfwhxjg"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          v-model="form.nmfwmj"
+          label="房屋面积(m²)"
+          placeholder="请输入房屋面积"
+          input-align="right"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+          type="number"/>
+
+        <van-field
+          v-model="form.fjzdmj"
+          label="房基占地面积(m²)"
+          placeholder="请输入房基占地面积"
+          input-align="right"
+          label-width="auto"
+          type="number"/>
+
+        <van-field
+          v-model="form.jzmj"
+          label="建筑面积(m²)"
+          placeholder="请输入建筑面积"
+          input-align="right"
+          label-width="auto"
+          type="number"/>
+        <field-select
+          v-model="form.fwlx"
+          label="房屋类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房屋类型"
+          remote-url="/system/dict/data/type/fwlx"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.fwxz"
+          label="房屋性质"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房屋性质"
+          remote-url="/system/dict/data/type/fwxz"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.fwjg"
+          label="房屋结构"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房屋结构"
+          remote-url="/system/dict/data/type/housing_structure"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.zl"
+          name="坐落"
+          label="坐落"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.sjly"
+          label="数据来源"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择数据来源"
+          remote-url="/system/dict/data/type/sjly"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.bz"
+          name="备注"
+          label="备注"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">不动产信息</p>
+        <van-field
+          input-align="right"
+          v-model="form.bdcdyh"
+          name="不动产单元号"
+          label="不动产单元号"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.fwbm"
+          name="房屋编码"
+          label="房屋编码"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.zrzh"
+          name="自然幢号"
+          label="自然幢号"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.ch"
+          name="层号"
+          label="层号"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.sjc"
+          name="实际层"
+          label="实际层"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.myc"
+          name="名义层"
+          label="名义层"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">证书信息</p>
+        <FieldRadio
+          v-model="form.sffz"
+          label="是否发证"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfjf"
+          label="是否纠纷"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfcf"
+          label="是否查封"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">利用情况</p>
+        <field-select
+          v-model="form.lyzk"
+          label="房屋利用状况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房屋利用状况"
+          remote-url="/system/dict/data/type/nmfwlyzk"
+          :on-remote-response="'data'"
+        />
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">抵押情况</p>
+        <FieldRadio
+          v-model="form.sfdy"
+          label="是否抵押"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">其他信息</p>
+        <van-field
+          input-align="right"
+          v-model="form.jznd"
+          name="建筑年代"
+          label="建筑年代"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.fwaqxjddj"
+          label="房屋安全性鉴定等级"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房屋安全性鉴定等级"
+          remote-url="/system/dict/data/type/fwaqxjddj"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.fwzt"
+          label="房屋状态"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房房屋状态"
+          remote-url="/system/dict/data/type/fwzt"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.fwyt"
+          label="房屋用途"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房房屋状态"
+          remote-url="/system/dict/data/type/fwyt"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfytrgy"
+          label="与其他人共有"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+      </div>
+      <div style="margin: 16px;display: flex;justify-content: space-around;">
+        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
+      </div>
+      <div style="height: 50px;"></div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+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 CommonMap from "@/components/house/CommonMap";
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
+
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  components: {FieldSelect, FieldRadio,CommonMap},
+  name: "zrzAdd",
+  data() {
+    return {
+      active:3,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+      // 地图绘制
+      drawInsert: null,
+      // 当前位置信息
+      tGeoOrganizationLat: null,
+      tGeoOrganizationLng: null,
+      minDate: new Date(),
+      maxDate: new Date(2025, 10, 1),
+      showZgqrzrq:false,
+      form:{}
+    };
+  },
+  created(){
+    let data = this.$route.query;
+    console.info(data)
+    this.form = data;
+    if(this.form.id == null){
+      this.$set(this.form, 'hx', "01");
+      this.$set(this.form, 'hxjg', "01");
+      this.$set(this.form, 'fwlx', "01");
+      this.$set(this.form, 'fwxz', "6");
+      this.$set(this.form, 'fwjg', "01");
+      this.$set(this.form, 'sjly', "01");
+      this.$set(this.form, 'sffz', "1");
+      this.$set(this.form, 'sfjf', "0");
+      this.$set(this.form, 'sfcf', "0");
+      this.$set(this.form, 'lyzk', "10");
+      this.$set(this.form, 'sfdy', "0");
+      this.$set(this.form, 'fwaqxjddj', "01");
+      this.$set(this.form, 'fwzt', "01");
+      this.$set(this.form, 'fwyt', "10");
+      this.$set(this.form, 'sfytrgy', "0");
+    }
+  },
+  mounted(){
+
+  },
+  methods: {
+    submitzjd(){
+      this.$refs.form.validate().then(() => {
+      if(this.form.id == null){
+        addNmfw(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }else{
+        updateNmfw(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
+      });
+    },
+    // 绘制申请地图
+    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;
+      }
+    },
+    cancel(){
+      this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: this.form.zjddm}});
+    },
+    // 获取登录人位置坐标
+    getLandCoord(func) {
+      if (func
+        && this.tGeoOrganizationLng !== null && this.tGeoOrganizationLng !== ''
+        && this.tGeoOrganizationLat !== null && this.tGeoOrganizationLat !== '') {
+        this.$nextTick(() => {
+          func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        })
+      }
+      else {
+        console.info(this.deptId);
+        getQueryLand(this.deptId).then((response) => {
+          if (response.code == 200) {
+            let InsertCode = response.data;
+            this.form.orgCode = InsertCode.orgCode;
+            this.tGeoOrganizationLat = InsertCode.lat;
+            this.tGeoOrganizationLng = InsertCode.lng;
+            if(func)
+            {
+              func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+            }
+          }
+        });
+      }
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
+    },
+    onConfirmZgqrzrq(data){
+      this.form.jgrq = this.getNowFormatDate(data).substr(0,10);
+      this.showZgqrzrq = false;
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/homesteadSurvey/nmfwList.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <template #left>
+            <van-icon name="arrow-left" size="18" color="#fff" />
+          </template>
+          <!-- <template #right>
+          <van-icon name="map-marked" size="18" color="#fff" />
+        </template>-->
+          <template #title>
+            <p style="color:#fff">入户调查</p>
+          </template>
+        </van-nav-bar>
+      </div>
+      <div style="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <div style="margin:30px auto 0;width: 95%;">
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">农民房屋</p>
+    </div>
+    <van-swipe-cell v-for="(item,index) in nmfwlist" :key="'nmfw'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
+      <div style="padding:15px;">
+        <p style="display: flex;align-items: center;">
+          <img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 5px;">
+          <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
+        </p>
+        <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">农民房屋面积:</p>
+          <p  style="flex:1;text-align:right;">{{item.nmfwmj}}</p>
+        </div>
+        <div style="display:flex;line-height:20px;margin-top: 5px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">农户代码:</p>
+          <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
+        </div>
+        <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnmfw(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">详情</span>
+          </p>
+        </div>
+      </div>
+      <template #right>
+        <van-button square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
+      </template>
+    </van-swipe-cell>
+
+    <div style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
+      <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+        <p style="font-size: 16px;" @click="showPopupAddnmfw()">+ 添加农民房屋</p>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
+import MapGisDrawing from "@/components/Map/MapGisDrawing";
+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";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  name: "nmfwList",
+  components: { MapGisDrawing,},
+  data() {
+    return {
+      active:3,
+      // 使用权人列表
+      zrzData:{},
+      nmfwlist:[],
+    };
+  },
+  created(){
+    this.zrzData = this.$route.query;
+    this.getList();
+  },
+  mounted(){
+
+  },
+  methods: {
+    getList(){
+      listNmfw({nmfwzh:this.zrzData.nmfwzh}).then(response => {
+        this.nmfwlist = response.rows;
+      });
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+    showPopupnmfw(val){
+      this.$router.push({name:'nmfwAdd',query:val});
+    },
+    showPopupAddnmfw(){
+      this.$router.push({name:'nmfwAdd',query:{nhdm:this.nmfwlist[0].nhdm,nmfwzh:this.nmfwlist[0].nmfwzh}});
+    },
+    showPopuphncy(val){
+      this.$router.push({name:'nhcyAdd',query:val});
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/homesteadSurvey/shyqrAdd.vue

@@ -44,7 +44,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <van-form @submit="submitzjd">
+    <van-form ref = "form">
       <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">使用权人信息</p>
         <!--<van-field
@@ -55,40 +55,58 @@
           :rules="[{ required: true, message: '' }]"
         />-->
         <van-field
-          autocomplete="off"
-          v-model="form.nhdm"
-          name="农户代码"
+          readonly
+          clickable
           label="农户代码"
-          placeholder="自动生成"
+          placeholder="请选择"
+          v-model="form.nhdm"
+          @click="shownhdm = true"
           input-align="right"
-          disabled
+          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
-          autocomplete="off"
           v-model="form.zjddm"
-          name="宅基地代码"
           label="宅基地代码"
-          placeholder="自动生成"
           input-align="right"
-          disabled
+          :rules="[{ required: true }]"
+          required
         />
         <van-field
-          autocomplete="off"
-          input-align="right"
+          readonly
+          clickable
+          label="农民房屋代码"
+          placeholder="请选择"
           v-model="form.nmfwdm"
-          name="农民房屋代码"
-          label="宗地代码"
-          placeholder="自动生成"
-          disabled
+          @click="shownmfwdm = true"
+          input-align="right"
+          right-icon="arrow-down"
         />
+        <van-popup v-model="shownmfwdm" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="nmfwDictionaries"
+            value-key="nmfwdm"
+            @confirm="onConfirmnmfwdm"
+            @cancel="shownmfwdm = false"
+          />
+        </van-popup>
         <van-field
           autocomplete="off"
           input-align="right"
           v-model="form.bdcdyh"
           name="不动产单元号"
           label="不动产单元号"
-          placeholder="自动生成"
-          disabled
         />
         <van-field
           autocomplete="off"
@@ -96,17 +114,15 @@
           v-model="form.bdcqzh"
           name="不动产权证号"
           label="不动产权证号"
-          placeholder="自动生成"
-          disabled
+          placeholder="不动产权证号"
         />
         <van-field
           autocomplete="off"
           input-align="right"
           v-model="form.qzysxlh"
-          name="权证印刷序列号"
-          label="权证印刷序列号"
-          placeholder="自动生成"
-          disabled
+          name="权证印刷号"
+          label="权证印刷号"
+          placeholder="权证印刷序列号"
         />
         <van-field
           autocomplete="off"
@@ -114,375 +130,189 @@
           v-model="form.fzjg"
           name="发证机关"
           label="发证机关"
-          disabled
         />
-        <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
-          <template #input>
-            <van-radio-group v-model="form.sffz" 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="form.zjdzsh"
-          name="宅基地证书号"
-          label="宅基地证书号"
-          placeholder="宅基地证书号"
+          v-model="form.shyqrdbxm"
+          name="代表姓名"
+          label="代表姓名"
+          placeholder="请输入使用权人代表姓名"
           maxlength="50"
           autocomplete="off"
+          :rules="[{ required: true }]"
+          required
         />
-        <van-field
-          autocomplete="off"
-          input-align="right"
-          v-model="form.zjdpzmj"
-          name="批准面积(㎡)"
-          label="批准面积(㎡)"
-          placeholder="单位：平方米"
-          type="number"
-          maxlength="15"
+        <field-select
+          v-model="form.shyqrdbzjlx"
+          label="证件类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请输入使用权人证件类型"
+          remote-url="/system/dict/data/type/zjlx"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
         />
         <van-field
-          autocomplete="off"
           input-align="right"
-          v-model="form.zdmj"
-          type="number"
-          name="宗地面积(㎡)"
-          label="宗地面积(㎡)"
-          placeholder="宗地面积(㎡)"
-          maxlength="15"
-        />
-
-        <van-field
+          v-model="form.shyqrdbzjhm"
+          name="证件号码"
+          label="证件号码"
+          placeholder="请输入使用权人证件号码"
+          maxlength="50"
           autocomplete="off"
-          input-align="right"
-          v-model="form.zl"
-          name="坐落"
-          label="坐落"
-          placeholder="坐落"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.xb"
+          label="性别"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/sys_user_sex"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
           required
-          :rules="[{ required: true, message: '坐落不能为空' }]"
         />
         <van-field
-          autocomplete="off"
-          v-model="form.zldwdm"
-          name="坐落单位代码"
-          label="坐落单位代码"
-          placeholder="自动生成"
           input-align="right"
-          disabled
-          v-show="false"
+          v-model="form.dh"
+          name="联系电话"
+          label="联系电话"
+          placeholder="请输入联系电话"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-cell title="是否本集体经济组织成员" >
+          <template #right-icon>
+            <van-radio-group v-model="form.sfbncjtjjzzcy" direction="horizontal" >
+              <van-radio name="1">是</van-radio>
+              <van-radio name="0">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+        <field-select
+          v-model="form.hklx"
+          label="户口类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/account_type"
+          :on-remote-response="'data'"
         />
         <van-field
-          autocomplete="off"
           input-align="right"
-          v-model="form.zdszd"
-          name="宗地四至-东"
-          label="宗地四至-东"
-          placeholder="宗地四至-东"
-          maxlength="150"
+          v-model="form.dz"
+          name="地址"
+          label="地址"
+          placeholder="请输入地址"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.qlrlx"
+          label="权利人类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择权利人类型"
+          remote-url="/system/dict/data/type/obligee_type"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.sshy"
+          label="所属行业"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择所属行业"
+          remote-url="/system/dict/data/type/gmjjhy"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.gj"
+          label="国家/地区"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择国家/地区"
+          remote-url="/system/dict/data/type/country_or_region"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
           required
-          :rules="[{ required: true, message: '宗地四至-东不能为空' }]"
+        />
+        <field-select
+          v-model="form.hjszss"
+          label="户籍所在省市"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择户籍所在省市"
+          remote-url="/system/dict/data/type/province_code"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.sfsyqrzjgy"
+          label="使用权人之间共有"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择使用权人之间共有"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.gyfs"
+          label="共有方式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择共有方式"
+          remote-url="/system/dict/data/type/common_mode"
+          :on-remote-response="'data'"
         />
         <van-field
           autocomplete="off"
           input-align="right"
-          v-model="form.zdszn"
-          name="宗地四至-南"
-          label="宗地四至-南"
-          placeholder="宗地四至-南"
-          maxlength="150"
-          required
-          :rules="[{ required: true, message: '宗地四至-南不能为空' }]"
+          v-model="form.ftzdmj"
+          name="分摊宗地面积(㎡)"
+          label="分摊宗地面积(㎡)"
+          placeholder="单位：平方米"
+          type="number"
+          maxlength="15"
         />
+
+        <van-cell title="持证人" >
+          <template #right-icon>
+            <van-radio-group v-model="form.sfczr" direction="horizontal" >
+              <van-radio name="1">是</van-radio>
+              <van-radio name="0">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
         <van-field
           input-align="right"
-          v-model="form.zdszx"
-          name="宗地四至-西"
-          label="宗地四至-西"
-          placeholder="宗地四至-西"
-          maxlength="150"
-          required
-          :rules="[{ required: true, message: '宗地四至-西不能为空' }]"
+          v-model="form.qlbl"
+          name="权利比例(%)"
+          label="权利比例(%)"
+          placeholder="请输入权利比例(%)"
+          maxlength="50"
+          autocomplete="off"
         />
         <van-field
-          autocomplete="off"
           input-align="right"
-          v-model="form.zdszb"
-          name="宗地四至-北"
-          label="宗地四至-北"
-          placeholder="宗地四至-北"
-          maxlength="150"
-          required
-          :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
+          v-model="form.bz"
+          name="备注"
+          label="备注"
+          placeholder="请输入备注"
+          maxlength="50"
+          autocomplete="off"
         />
-<!--        <van-collapse v-model="activeZjd">-->
-<!--          <van-collapse-item title="利用状况" name="1" class="label-class">-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.lyzkName"-->
-<!--              name="当前利用状况"-->
-<!--              label="当前利用状况"-->
-<!--              placeholder="当前利用状况"-->
-<!--              readonly-->
-<!--              @click="showlyzk = true"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              v-model="form.lyzk"-->
-<!--              style="display:none"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.zjdxzyy"-->
-<!--              name="闲置原因"-->
-<!--              label="闲置原因"-->
-<!--              placeholder="宅基地闲置原因"-->
-<!--              maxlength="200"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.xzkssj"-->
-<!--              name="闲置开始时间"-->
-<!--              label="闲置开始时间"-->
-<!--              placeholder="闲置开始时间"-->
-<!--              readonly-->
-<!--              @click="showPickerxzkssj = true"-->
-<!--            />-->
-<!--            <van-popup v-model:show="showPickerxzkssj" position="bottom">-->
-<!--              <van-datetime-picker-->
-<!--                type="date"-->
-<!--                @confirm="onConfirmxzkssj"-->
-<!--                @cancel="showPickerxzkssj = false"-->
-<!--                :min-date="minDate"-->
-<!--                :max-date="maxDate"-->
-<!--              />-->
-<!--            </van-popup>-->
-<!--            <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">-->
-<!--              <template #input>-->
-<!--                <van-radio-group v-model="form.lzyx" 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" autocomplete="off">-->
-<!--              <template #input>-->
-<!--                <van-radio-group v-model="form.yctcyx" direction="horizontal">-->
-<!--                  <van-radio name="1">有</van-radio>-->
-<!--                  <van-radio name="0">无</van-radio>-->
-<!--                </van-radio-group>-->
-<!--              </template>-->
-<!--            </van-field>-->
-<!--          </van-collapse-item>-->
-<!--          <van-collapse-item title="其他信息" name="2" class="label-class">-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.djName"-->
-<!--              name="等级"-->
-<!--              label="等级"-->
-<!--              placeholder="等级"-->
-<!--              @click="showdj = true"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              v-model="form.dj"-->
-<!--              style="display:none"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.jg"-->
-<!--              name="价格（万元）"-->
-<!--              label="价格（万元）"-->
-<!--              placeholder="价格（万元）"-->
-<!--              maxlength="15"-->
-<!--              type="number"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.ytmc"-->
-<!--              name="用途"-->
-<!--              label="用途"-->
-<!--              placeholder="用途"-->
-<!--              readonly-->
-<!--              @click="showyt = true"-->
-<!--              required-->
-<!--              :rules="[{ required: true, message: '用途不能为空' }]"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              v-model="form.yt"-->
-<!--              style="display:none"-->
-<!--              autocomplete="off"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.qllxName"-->
-<!--              name="权利类型"-->
-<!--              label="权利类型"-->
-<!--              placeholder="权利类型"-->
-<!--              readonly-->
-<!--              @click="showqllx = true"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              v-model="form.qllx"-->
-<!--              style="display:none"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.qlxzName"-->
-<!--              name="权利性质"-->
-<!--              label="权利性质"-->
-<!--              placeholder="权利性质"-->
-<!--              readonly-->
-<!--              @click="showqlxz = true"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              v-model="form.qlxz"-->
-<!--              style="display:none"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.qlsdfsName"-->
-<!--              name="权利设定方式"-->
-<!--              label="权利设定方式"-->
-<!--              placeholder="权利设定方式"-->
-<!--              readonly-->
-<!--              @click="showqlsdfs = true"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              v-model="form.qlsdfs"-->
-<!--              style="display:none"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.rjl"-->
-<!--              name="容积率"-->
-<!--              label="容积率"-->
-<!--              placeholder="容积率"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              input-align="right"-->
-<!--              v-model="form.jzmd"-->
-<!--              name="validator"-->
-<!--              label="建筑密度"-->
-<!--              placeholder="填写0~1小数"-->
-<!--              :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"-->
-<!--              type="number"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.jzxg"-->
-<!--              name="建筑限高(m)"-->
-<!--              label="建筑限高(m)"-->
-<!--              placeholder="填写000.00~999.99小数"-->
-<!--              :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"-->
-<!--              type="number"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.zdt"-->
-<!--              name="宗地图"-->
-<!--              label="宗地图"-->
-<!--              placeholder="宗地图"-->
-<!--              maxlength="200"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.tfh"-->
-<!--              name="图幅号"-->
-<!--              label="图幅号"-->
-<!--              placeholder="图幅号"-->
-<!--              maxlength="50"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              input-align="right"-->
-<!--              v-model="form.djh"-->
-<!--              name="地籍号"-->
-<!--              label="地籍号"-->
-<!--              placeholder="自动生成"-->
-<!--              disabled-->
-<!--              v-show="false"-->
-<!--            />-->
-<!--            <van-field name="radio" label="被惩处经历" input-align="right" autocomplete="off">-->
-<!--              <template #input>-->
-<!--                <van-radio-group v-model="form.bccjl" direction="horizontal">-->
-<!--                  <van-radio name="1">有</van-radio>-->
-<!--                  <van-radio name="0">无</van-radio>-->
-<!--                </van-radio-group>-->
-<!--              </template>-->
-<!--            </van-field>-->
-<!--            <van-field-->
-<!--              autocomplete="off"-->
-<!--              v-if="form.bccjl==1"-->
-<!--              input-align="right"-->
-<!--              v-model="form.bccbz"-->
-<!--              name="被惩处备注"-->
-<!--              label="被惩处备注"-->
-<!--              placeholder="被惩处备注"-->
-<!--              maxlength="200"-->
-<!--            />-->
-<!--            <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">-->
-<!--              <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>-->
-<!--                </van-radio-group>-->
-<!--              </template>-->
-<!--            </van-field>-->
-<!--          </van-collapse-item>-->
-<!--        </van-collapse>-->
-<!--        <van-field-->
-<!--          autocomplete="off"-->
-<!--          v-model="form.sjlyName"-->
-<!--          name="数据来源"-->
-<!--          label="数据来源"-->
-<!--          placeholder="数据来源"-->
-<!--          input-align="right"-->
-<!--          readonly-->
-<!--          @click="showsjly = true"-->
-<!--        />-->
-<!--        <van-field-->
-<!--          autocomplete="off"-->
-<!--          v-model="form.sjly"-->
-<!--          style="display:none"-->
-<!--        />-->
-
-<!--        <van-field-->
-<!--          autocomplete="off"-->
-<!--          input-align="right"-->
-<!--          v-model="form.bz"-->
-<!--          name="备注"-->
-<!--          label="备注"-->
-<!--          placeholder="备注"-->
-<!--          maxlength="200"-->
-<!--        />-->
-<!--        <van-field name="uploader" label="现场照片" autocomplete="off">-->
-<!--          <template #input>-->
-<!--            <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="20" accept="image/*"></van-uploader>-->
-<!--          </template>-->
-<!--        </van-field>-->
-
+        <van-dialog v-model="mapShow" show-cancel-button>
+          <MapGisObtainTc ref="zjdProductResh" :shqrxm="hzxm" :landStatus="landStatus" :deptId="deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+        </van-dialog>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" native-type="submit">保存</van-button>
-        <van-button plain color="#22B7F2" round type="info" style="width:45%" native-type="submit">取消</van-button>
+        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
     </van-form>
@@ -492,6 +322,9 @@
 <script>
 import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
 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 MapGisObtainTc from "@/components/Map/MapGisObtainTc";
 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";
@@ -504,6 +337,7 @@ import { sysConfig} from "@/api/homesteadSurvey/index";
 import { Notify, Dialog, Toast } from 'vant';
 import axios from "axios";
 export default {
+  components: {FieldSelect, FieldRadio,MapGisObtainTc},
   name: "shyqrAdd",
   data() {
     return {
@@ -516,37 +350,106 @@ export default {
           nhdm :'777888999',
         }
       ],
+      shownhdm:false,
+      shownmfwdm:false,
+      hzxm:null,
+      landStatus:"1",
+      deptId:this.$cookies.get("item").deptId,
+      nhdmDictionaries:[],
+      nmfwDictionaries:[],
+      mapShow: false,
       form:{}
     };
   },
   created(){
-    let data = this.$route.query.res;
-    this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
-    console.info(this.form);
-    this.onSubmitzjd();
+    let data = this.$route.query;
+    this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    this.form = data;
+    if(this.form.id == null){
+      this.$set(this.form, 'shyqrdbzjlx', "01");
+      this.$set(this.form, 'xb', "1");
+      this.$set(this.form, 'sfbncjtjjzzcy', "1");
+      this.$set(this.form, 'hklx', "01");
+      this.$set(this.form, 'qlrlx', "10");
+      this.$set(this.form, 'sshy', "A");
+      this.$set(this.form, 'gj', "1");
+      this.$set(this.form, 'hjszss', "110000");
+      this.$set(this.form, 'sfsyqrzjgy', "1");
+      this.$set(this.form, 'gyfs', "1");
+      this.$set(this.form, 'sfczr', "1");
+
+    }
+    this.$set(this.form, 'zjddm', this.zjdzdxx.zjddm);
+    listZjdzd({zjddm:this.zjdzdxx.zjddm}).then(response => {
+      this.form.bdcdyh = response.rows[0].bdcdyh;
+    });
+    listNmfw({zjddm:this.zjdzdxx.zjddm}).then(response => {
+      this.nmfwDictionaries = response.rows;
+    });
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
-    onSubmitzjd(){
-      setTimeout(() => {
-        this.$refs.zjdProductResh.drawingPaceCountryDarw();
-      }, 500);
+    getList(){
+      listNh({}).then(response => {
+        this.nhdmDictionaries = response.rows;
+      });
     },
     submitzjd(){
-      updateZjdzd(this.form).then(response => {
-        let _this =this
-        this.$toast({
-          icon: 'success', // 找到自己需要的图标
-          message: '保存成功',
-          duration:"1000",
-          onClose:function(){
-            _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
-          }
-        })
+      this.$refs.form.validate().then(() => {
+      if(this.form.id == null){
+        addShyqr(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }else{
+        updateShyqr(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
       });
     },
+    mapLook(){
+      this.mapShow = true;
+      setTimeout(() => {
+        this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+      },1000);
+    },
+    /** 查找地图中宅基地 */
+    closeMoule: function (data) {
+      this.form.zjddm = data;
+    },
+    cancel(){
+      this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: this.form.zjddm}});
+    },
+    onConfirmnhdm(val){
+      this.form.nhdm = val.nhdm;
+      this.hzxm = val.hzxm;
+      this.shownhdm =false;
+    },
+    onConfirmnmfwdm(val){
+      this.form.nmfwdm = val.nmfwdm;
+      this.shownmfwdm = false;
+    },
     guidProduct(){
       return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         var r = Math.random() * 16 | 0,
@@ -569,7 +472,7 @@ export default {
       } else {
         this.$cookies.set("search","");
       }
-      this.$router.push({name:'homesteadList'});
+      this.$router.push({name: this.$router.back(-1)});
       // }
     },
   }

src/views/homesteadSurvey/zrzAdd.vue

@@ -0,0 +1,423 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <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="width:95%;left:2.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="$router.push({path:'/homesteadSurvey/add'})">
+              <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <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="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <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>
+      </div>
+    </van-sticky>
+    <van-form  ref = "form">
+      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">自然幢信息</p>
+        <!--<van-field
+          v-model="form.deptId"
+          name="行政区划名称"
+          label="行政区划名称"
+          placeholder="行政区划名称"
+          :rules="[{ required: true, message: '' }]"
+        />-->
+        <van-field
+          input-align="right"
+          v-model="form.zjddm"
+          name="宅基地代码"
+          label="宅基地代码"
+          maxlength="50"
+          autocomplete="off"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          input-align="right"
+          v-model="form.nmfwzh"
+          name="农民房屋幢号"
+          label="农民房屋幢号"
+          maxlength="50"
+          autocomplete="off"
+          placeholder="自动生成"
+          disabled
+        />
+        <van-field
+          input-align="right"
+          v-model="form.zrzh"
+          name="自然幢号"
+          label="自然幢号"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.jgrq"
+          name="竣工日期"
+          label="竣工日期"
+          placeholder="竣工日期"
+          readonly
+          @click="showZgqrzrq = true"
+        />
+        <van-popup v-model:show="showZgqrzrq" position="bottom">
+          <van-datetime-picker
+            type="date"
+            @confirm="onConfirmZgqrzrq"
+            @cancel="showZgqrzrq = false"
+            :min-date="minDate"
+            :max-date="maxDate"
+          />
+        </van-popup>
+        <van-field
+          v-model="form.jzwgd"
+          label="建筑物高度(m)"
+          placeholder="请输入建筑物高度"
+          input-align="right"
+          label-width="auto"
+          type="number"/>
+        <van-field
+          v-model="form.zzdmj"
+          label="幢占地面积(m²)"
+          placeholder="请输入幢占地面积"
+          input-align="right"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+          type="number"/>
+
+        <van-field
+          v-model="form.scjzmj"
+          label="实测建筑面积(m²)"
+          placeholder="请输入实测建筑面积"
+          input-align="right"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+          type="number"/>
+        <van-field
+          v-model="form.zcs"
+          label="总层数"
+          placeholder="请输入总层数"
+          input-align="right"
+          label-width="auto"
+          type="number"/>
+        <van-field
+          v-model="form.dscs"
+          label="地上层数"
+          placeholder="请输入地上层数"
+          input-align="right"
+          label-width="auto"
+          type="number"/>
+        <van-field
+          v-model="form.dxcs"
+          label="地下层数"
+          placeholder="请输入地下层数"
+          input-align="right"
+          label-width="auto"
+          type="number"/>
+        <field-select
+          v-model="form.fwjg"
+          label="房屋结构"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择房屋结构"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/system/dict/data/type/housing_structure"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.sjly"
+          label="数据来源"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择数据来源"
+          remote-url="/system/dict/data/type/sjly"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.bz"
+          name="备注"
+          label="备注"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <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>
+        <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
+      </div>
+      <div style="height: 50px;"></div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+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 CommonMap from "@/components/house/CommonMap";
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+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";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  components: {FieldSelect, FieldRadio,CommonMap},
+  name: "zrzAdd",
+  data() {
+    return {
+      active:3,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+      // 地图绘制
+      drawInsert: null,
+      // 当前位置信息
+      tGeoOrganizationLat: null,
+      tGeoOrganizationLng: null,
+      minDate: new Date(),
+      maxDate: new Date(2025, 10, 1),
+      showZgqrzrq:false,
+      form:{}
+    };
+  },
+  created(){
+    let data = this.$route.query;
+    console.info(data)
+    this.form = data;
+    if(this.form.shyqrdbzjhm != null){
+      this.getList();
+    }
+    this.$nextTick(() => {
+
+      this.pointDarw(null);
+      // this.pointDarwNature(null);
+      this.$refs.pointDarwMap && this.$refs.pointDarwMap.update();
+    })
+  },
+  mounted(){
+
+  },
+  methods: {
+    getList(){
+      listNh({hzzjhm:this.form.shyqrdbzjhm}).then(response => {
+        this.form = response.rows[0];
+      });
+    },
+    submitzjd(){
+      this.$refs.form.validate().then(() => {
+      if(this.form.id == null){
+        addZrz(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }else{
+        updateZrz(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: _this.form.zjddm}});
+            }
+          })
+        });
+      }
+      }).catch((e) => {
+        Dialog({ type: 'danger', message: '请填写完整的表单项' });
+      });
+    },
+    // 绘制申请地图
+    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;
+      }
+    },
+    cancel(){
+      this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: this.form.zjddm}});
+    },
+    // 获取登录人位置坐标
+    getLandCoord(func) {
+      if (func
+        && this.tGeoOrganizationLng !== null && this.tGeoOrganizationLng !== ''
+        && this.tGeoOrganizationLat !== null && this.tGeoOrganizationLat !== '') {
+        this.$nextTick(() => {
+          func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        })
+      }
+      else {
+        console.info(this.deptId);
+        getQueryLand(this.deptId).then((response) => {
+          if (response.code == 200) {
+            let InsertCode = response.data;
+            this.form.orgCode = InsertCode.orgCode;
+            this.tGeoOrganizationLat = InsertCode.lat;
+            this.tGeoOrganizationLng = InsertCode.lng;
+            if(func)
+            {
+              func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+            }
+          }
+        });
+      }
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
+    },
+    onConfirmZgqrzrq(data){
+      this.form.jgrq = this.getNowFormatDate(data).substr(0,10);
+      this.showZgqrzrq = false;
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name: this.$router.back(-1)});
+      // }
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue

@@ -155,7 +155,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue

@@ -147,7 +147,7 @@
         getPayee(this.$route.query.id).then((response) => {
           let _this = this
           this.form = response.data;
-          this.houseGetDicts("bank_type").then((res) => {
+          this.houseGetDicts("bank_type_all").then((res) => {
             for(var i = 0 ; i < res.data.length ; i++){
               _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
             }

src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue

@@ -171,7 +171,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue

@@ -171,7 +171,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue

@@ -167,7 +167,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue

@@ -150,7 +150,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue

@@ -147,7 +147,7 @@
         getPayee(this.$route.query.id).then((response) => {
           let _this = this
           this.form = response.data;
-          this.houseGetDicts("bank_type").then((res) => {
+          this.houseGetDicts("bank_type_all").then((res) => {
             for(var i = 0 ; i < res.data.length ; i++){
               _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
             }

src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue

@@ -165,7 +165,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue

@@ -165,7 +165,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }

src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue

@@ -167,7 +167,7 @@
     },
     methods: {
       getDictionaries(){
-        this.houseGetDicts("bank_type").then((res) => {
+        this.houseGetDicts("bank_type_all").then((res) => {
           for(var i = 0 ; i < res.data.length ; i++){
             this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }