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

src/api/homesteadSurvey/fsss.js

@@ -47,7 +47,7 @@ export function updateFsss(data) {
 // 删除数据调查-附属设施
 export function delFsss(id) {
   return request({
-    url: '/houseSurvey/fsss/remove/' + id,
+    url: '/home/homesteadfsss/remove/' + id,
     method: 'get'
   })
 }

src/api/homesteadSurvey/nhhncy.js

@@ -34,7 +34,32 @@ export function addNhhncy(data) {
     data: data
   })
 }
+// 过户
+export function guohu(id, to, data) {
+  return request({
+    url: `/home/homesteadnhhncy/guohu/${id}/to/${to}`,
+    method: 'post',
+    data: data
+  })
+}
+
+// 分户
+export function fenhu(id, data) {
+  return request({
+    url: '/home/homesteadnhhncy/fenhu/' + id,
+    method: 'post',
+    data: data
+  })
+}
 
+// 设为户主
+export function toHuzhu(id, data) {
+  return request({
+    url: '/home/homesteadnhhncy/toHuzhu/' + id,
+    method: 'post',
+    data: data
+  })
+}
 // 新增数据调查-户主信息
 export function nhhncyConnectTask(data) {
   return request({

src/api/homesteadSurvey/zjdzd.js

@@ -77,7 +77,7 @@ export function updateZjdzd(data) {
 // 删除数据调查-宅基地宗地
 export function delZjdzd(id) {
   return request({
-    url: '/houseSurvey/zjdzd/remove/' + id,
+    url: '/home/homesteadzjdzdxx/remove/' + id,
     method: 'get'
   })
 }
@@ -102,7 +102,7 @@ export function getQueryLand() {
 // 查询数据调查-宅基地宗地列表
 export function delZjdzdInfo(query) {
   return request({
-    url: '/houseSurvey/zjdzd/delZjdzdInfo',
+    url: '/home/homesteadzjdzdxx/delZjdzdInfo',
     method: 'get',
     params: query
   })

src/api/homesteadSurvey/zrz.js

@@ -56,7 +56,7 @@ export function zrzConnectTask(data) {
 // 删除数据调查-自然幢
 export function delZrz(id) {
   return request({
-    url: '/houseSurvey/zrz/remove/' + id,
+    url: '/home/homespacezrz/remove/' + id,
     method: 'get'
   })
 }

src/views/homesteadSurvey/add.vue

@@ -25,21 +25,21 @@
           <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-col span="4"  style="text-align:center;" @click="checkTz('/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-col span="4" style="text-align:center;" @click="checkTz('/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-col span="4" style="text-align:center;" @click="checkTz('/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>
@@ -812,7 +812,6 @@ export default {
     };
   },
   created(){
-    let data = this.$route.query.res;
     this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     this.permission = localStorage.getItem("executePermission");
     if(this.form.sfcz === "1"){
@@ -944,6 +943,14 @@ export default {
         this.showWbzyy = true;
       }
     },
+    checkTz(val){
+      console.info(val)
+      if(this.form.zjddm == null){
+        Dialog({ type: 'danger', message: '请生成宅基地信息！' });
+      }else{
+        this.$router.push({path:val});
+      }
+    },
     /**宅基地利用状态处理*/
     onZjdlyzkChanged(val){
       console.info(val);
@@ -959,6 +966,7 @@ export default {
         let map = this.$refs.pointDarwMap;
         if(data == null)
           data = this.form.theGeomJson;
+        console.info(data);
         this.setMapData(map, data);
 
       });
@@ -979,7 +987,7 @@ export default {
     },
     // 当地图绘制完成时
     onMapDrawFinished(data) {
-      console.info(data);
+      console.info(JSON.stringify(data));
       this.drawInsert = data;
       this.form.theGeomJson = JSON.stringify(this.drawInsert);
     },

src/views/homesteadSurvey/add2.vue

@@ -208,7 +208,7 @@ export default {
       this.$router.push({name:'nhAdd',query:val});
     },
     showPopupnhcy(){
-      this.$router.push({name:'nhcyAdd',query:{}});
+      this.$router.push({name:'nhcyAdd',query:{yhzgxOperate:"true"}});
     },
     showPopuphncylist(val){
       this.$router.push({name:'nhcyList',query:val});

src/views/homesteadSurvey/add3.vue

@@ -85,7 +85,7 @@
           </div>
         </div>
         <template #right>
-          <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletezrz(item,index)"/>
+          <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletezrz(item)"/>
         </template>
       </van-swipe-cell>
     </van-list>
@@ -140,7 +140,7 @@ export default {
     getList(){
       let params = {
         zjddm:this.zjdzdxx.zjddm,
-        pageNum: this.countyhc+1,
+        pageNum: 1,
         pageSize:10,
       }
       listZrz(params).then(response => {
@@ -171,12 +171,12 @@ export default {
     onRefreshZrz(){
       if(this.loading){
         let params = {
-          zjddm:this.zjdzdxx.zjddm,
-          pageNum: this.countyhc+1,
-          pageSize:10,
+          "zjddm":this.zjdzdxx.zjddm,
+          "pageNum": this.countyhc+1,
+          "pageSize":10,
         }
         listZrz(params).then(response => {
-          if(response.rows.length>0&&response.rows.length<response.total){
+          if(response.rows.length>0&&this.zrzlist.length<response.total){
             response.rows.map(res => {
               this.zrzlist.push(res)
             })
@@ -201,7 +201,21 @@ export default {
     shownmfwlist(val){
       this.$router.push({name:'nmfwList',query:val});
     },
-    deletezrz(){},
+    deletezrz(val){
+      const ids = val.id || this.ids;
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否确认删除自然幢标识为"' + val.id + '"的数据项?',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(function() {
+          return delZrz(ids);
+        }).then(() => {
+        this.$notify({ type: 'success' , message: "删除成功" });
+        location.reload(true);
+      }).catch(() => {});
+    },
   }
 }
 </script>

src/views/homesteadSurvey/add4.vue

@@ -81,7 +81,7 @@
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item.id,index)"/>
+        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -350,8 +350,21 @@ export default {
     showPopupAddzrz(){
       this.$router.push({name:'fsssAdd',query:{zjddm:this.zjdzdxx.zjddm}});
     },
-    shownmfwlist(){},
-    deletezrz(){},
+    deletefsss(val){
+      const ids = val.id || this.ids;
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否确认删除附属物标识为"' + val.id + '"的数据项?',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(function() {
+          return delFsss(ids);
+        }).then(() => {
+        this.$notify({ type: 'success' , message: "删除成功" });
+        location.reload(true);
+      }).catch(() => {});
+    },
     qmqr(){
       this.showesign = true;
     },

src/views/homesteadSurvey/hncyList2.vue

@@ -54,18 +54,22 @@
       </div>
     </van-sticky>
 <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:10px 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-cell  v-for="(item,index) in hncylist" :key="index" size="small" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
+    <van-cell  v-for="(item,index) in hncylist" :key="index" size="small" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:10px auto 0;">
       <template #title>
         <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;">{{item.xm}}</span>
           </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="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员详情</p>
-          <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+          <p v-if="item.yhzgx != '02'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</p>
+          <p v-if="item.yhzgx != '02'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</p>
+          <p v-if="item.yhzgx != '02'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.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="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
+          <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+
         </div>
       </template>
       <template #label>
@@ -74,6 +78,22 @@
         <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
       </template>
     </van-cell>
+    <van-dialog v-model="guohuData.visible"  title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">
+      <van-form ref="guohu_form"  style="height: 200px;"  label-width="180px">
+        <field-select
+          v-model="guohuData.to"
+          label="指定新户主"
+          value-key="xm"
+          data-key="nhdm"
+          placeholder="请选择农户代码"
+          :columns = "guohuData.huzhuList"
+          :on-remote-response="'data'"
+          @confirm="onGuohuChanged"
+          :rules="[{ required: true }]"
+          required
+        />
+      </van-form>
+    </van-dialog>
 <!--    </van-pull-refresh>-->
     <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;">
@@ -86,7 +106,7 @@
 <script>
     import {getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
-    import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
+    import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy,toHuzhu,fenhu,guohu} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
     import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
     import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz";
@@ -95,12 +115,14 @@
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import {deptGetId,} from "@/api/homestead/index";
+    import FieldSelect from "@/components/form/FieldSelect";
     import $ from "jquery";
     import {Dialog} from "vant";
     import {ref} from "vue";
     import axios from "axios";
     export default {
       name: "hncyList2",
+      components: {FieldSelect},
       data() {
         return {
           loading1:false,
@@ -255,6 +277,12 @@
           dataForm: {
             imageUrl: []
           },
+          guohuData: {
+            visible: false,
+            huzhuList: [],
+            id: null,
+            to: null,
+          },
           dataList: [["fsssSx"],["zjdSx"],["zrzSx"]],          //地图使用 --end
           checkBoxAll:[],
           //地图跳转存之
@@ -1236,6 +1264,68 @@
             })
           }
         },
+        handleToHuzhu(row) {
+          const ids = row.id || this.ids;
+          Dialog.confirm({
+            title: '系统提示',
+            message: '是否确认将此成员设为本户新的户主?',
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(function() {
+            return toHuzhu(ids);
+          }).then(() => {
+            this.$notify({ type: 'success' , message: "设为户主成功" });
+            location.reload(true);
+          }).catch(() => {});
+        },
+        handleFenHu(row) {
+          const ids = row.id || this.ids;
+          Dialog.confirm({
+            title: '系统提示',
+            message: '是否确认将此成员新立一户并设为户主?',
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(function() {
+            return fenhu(ids);
+          }).then(() => {
+            this.$notify({ type: 'success' , message: "分户成功" });
+            location.reload(true);
+          }).catch(() => {});
+        },
+        handleGuohu(row) {
+          const id = row.id || this.ids
+          listNhhncy({
+            deptId: this.$store.state.user.loginDeptId,
+            yhzgx: '02',
+          }).then(response => {
+            this.guohuData.id = id;
+            this.guohuData.visible = true;
+            this.guohuData.huzhuList = response.rows.filter((x) => x.nhdm != row.nhdm);
+            this.guohuData.huzhuList.map(function(item){
+              item.xm = item.xm+item.nhdm;
+            })
+          });
+        },
+        guohu() {
+          this.$refs["guohu_form"].validate(valid => {
+            if (valid) {
+              guohu(this.guohuData.id, this.guohuData.to).then(response => {
+                if(response.code != 200) throw response.msg;
+                this.$notify({ type: 'success' , message: "移户成功" });
+                this.closeGuohu();
+                location.reload(true);
+              }).catch(() => {});
+            }
+          });
+        },
+        onGuohuChanged(val){
+          this.$set(this.guohuData, 'to',val);
+        },
+        closeGuohu() {
+          this.guohuData.visible = false;
+          this.guohuData.id = this.guohuData.to = null;
+          this.guohuData.huzhuList = [];
+        },
         // 户内成员列表
         showPopuphncylist(item){
           if(item.nhdm==null||item.nhdm==""){
@@ -4952,6 +5042,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/list.vue

@@ -94,7 +94,7 @@
 <!--                <p v-if="item.zjdAudit=='1'" style="color:#7AC943;background:rgba(122,201,67,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">已审核</p>-->
 <!--                <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>-->
                 <p v-if="item.surveyStatus != '5'" 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>
-<!--                <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>-->
+                <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;"  @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
               </div>
             </template>
             <!--<template #default>
@@ -114,7 +114,7 @@
 </template>
 
 <script>
-    import {rhhcList,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {rhhcList,getQueryLand,getZjdzd,delZjdzd,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -633,15 +633,11 @@
           })
             .then(() => {
               // on confirm
-              delZjdzdInfo(item).then(res => {
+              delZjdzd(item.id).then(res => {
                 if(res.code=="200"){
-                  if(this.active==1){
                     this.list1.splice(index,1);
-                  }else if(this.active==2){
-                    this.list2.splice(index,1);
-                  }else{
-                    this.list.splice(index,1);
-                  }
+                    this.$notify({type: 'success', message: '删除成功'});
+                    location.reload();
                 }
               })
             })

src/views/homesteadSurvey/list4.vue

@@ -51,7 +51,7 @@
         <div style="border:1px solid rgb(122, 201, 67);width:90%;margin:0 auto;border-radius:15px;height:.8rem;display:flex;font-size:.3rem;">
           <div style="flex:1;text-align:center;">
             <span style="color:rgb(122, 201, 67);line-height:.8rem;">宅基地数：</span>
-            <span style="color:rgb(250, 83, 83);line-height:.8rem;">{{qbNums}} <span style="font-size:12px;">户</span></span>
+            <span style="color:rgb(250, 83, 83);line-height:.8rem;">{{qbNums}} <span style="font-size:12px;">宗</span></span>
           </div>
           <div style="flex:1;text-align:center;">
             <span style="color:rgb(122, 201, 67);line-height:.8rem">使用权人数：</span>
@@ -508,7 +508,7 @@
           placeholder="请输入宗地或权利人信息"
         >
           <template #action>
-            <div id="query">搜索</div>
+            <van-icon :name="require('../../assets/images/housesteadSurvey/add02.png')"  color="rgba(122,201,67,1)" size=".8rem" id="query" style="vertical-align:middle;"/>
           </template>
         </van-search>
         <div class="searchBox" style="display: none;">
@@ -538,10 +538,10 @@
           <img src="../../assets/images/housesteadSurvey/tool2.png">
           <p>全图</p>
         </div>
-        <div class="clMap" @click="" id="area">
-          <img src="../../assets/images/housesteadSurvey/tool3.png">
-          <p>测量</p>
-        </div>
+<!--        <div class="clMap" @click="" id="area">-->
+<!--          <img src="../../assets/images/housesteadSurvey/tool3.png">-->
+<!--          <p>测量</p>-->
+<!--        </div>-->
         <div class="hcMap" @click="zjdHc">
           <img src="../../assets/images/housesteadSurvey/tool4.png">
           <p>核查</p>
@@ -570,17 +570,17 @@
             <van-checkbox-group v-model="checked" @change="handleChecked" ref="checkboxGroup">
               <van-checkbox name="fsssSx" shape="square" style="margin-bottom: 5px;" id="fsssSx">
                 <template #default>
-                  附属设施<span style="display: inline-block;background: #00FFFF;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  附属设施<span style="display: inline-block;background: #FF8C00;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="zrzSx" shape="square" style="margin-bottom: 5px;" id="zrzSx">
                 <template #default>
-                  自<i style="margin-right: 0.5em;"></i>然<i style="margin-right: 0.5em;"></i>幢<span style="display: inline-block;background: #FFD306;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  自<i style="margin-right: 0.5em;"></i>然<i style="margin-right: 0.5em;"></i>幢<span style="display: inline-block;background: #00FA9A;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="zjdSx" shape="square" style="margin-bottom: 5px;" id="zjdSx">
                 <template #default>
-                  宅<i style="margin-right: 0.5em;"></i>基<i style="margin-right: 0.5em;"></i>地<span style="display: inline-block;background: #AE57A4;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  宅<i style="margin-right: 0.5em;"></i>基<i style="margin-right: 0.5em;"></i>地<span style="display: inline-block;background: #7CFC00;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
             </van-checkbox-group>
@@ -1198,8 +1198,8 @@
 
         <div style="text-align: center;margin-top: 3%;">
           <p class="hzlxBtn" :style="{background: mapZjdData ? '#CCC':'#7ac943'}" @click="zjdTz">宅基地</p>
-          <p class="hzlxBtn" :style="{background: mapZjdData ? '#b026ff':'#CCC'}" @click="zrzTz">自然幢</p>
-          <p class="hzlxBtn" :style="{background: mapZjdData ? '#3ac2db':'#CCC'}" @click="fsssTz">附属设施</p>
+<!--          <p class="hzlxBtn" :style="{background: mapZjdData ? '#b026ff':'#CCC'}" @click="zrzTz">自然幢</p>-->
+<!--          <p class="hzlxBtn" :style="{background: mapZjdData ? '#3ac2db':'#CCC'}" @click="fsssTz">附属设施</p>-->
         </div>
       </div>
     </van-popup>
@@ -2443,7 +2443,7 @@
         },
       getZjdList(){
         let params = {
-          "surveyStatus":"1",
+          "surveyStatus":"1,2,3,4,5",
           "pageNum": 1,
           "pageSize":10,
         }
@@ -3462,7 +3462,6 @@
             .catch((error) => {
               console.log("【异常】", error);
             });
-          map.addLayer(zjdTc);
           //宅基地图层查询开始 ------------------start
           var zrzTc;
           //自然幢图层查询开始 ------------------start
@@ -3496,321 +3495,7 @@
             }),
           });
           map.addLayer(fsssTc);
-          // //附属设施图层查询开始 ------------------start
-          //使用geoserver服务查询开始 -------------------end
-        //   if(this.backMap ==1){
-        //   var cql = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + this.mapZjdTeAll.mapZjdAData.zjddm + "'";
-        //   var wmsSourceBack = new ol.source.ImageWMS({
-        //     crossOrigin: 'anonymous',
-        //     params: {
-        //       LAYERS: 'zjd_dc:t_house_survey_all',
-        //       'VERSION': '1.1.0',
-        //       'FORMAT': "image/png",
-        //       'CQL_FILTER': cql
-        //     },
-        //     serverType: 'geoserver',
-        //     url: that.mapGeoServerUrl + "/wms",
-        //   });
-        //   zjdTc.setSource(wmsSourceBack);
-        //   ol.view.setResolution(ol.view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新
-        // }
-          //数据库直接加载数据渲染方式---------------------------------------------------start
-          //判断当前账套是否有数据
-          // var mapTalkAbout = true;
-          // //获取镇界线----start
-          // if(this.mapTownList.length >0){
-          //   for (var i = 0; this.mapTownList.length > i; i++) {
-          //     if (this.mapTownList[i] != null && this.mapTownList[i].theGeom != null && this.mapTownList[i].theGeom != "") {
-          //       mapTalkAbout =false;
-          //       this.mapTownList[i].createBy = 'mapTownList';
-          //       var theGeomLine= this.mapTownList[i].theGeom.replaceAll("MultiPolygon","LineString");
-          //       theGeomLine = theGeomLine.replaceAll("[[[[","[[");
-          //       theGeomLine = theGeomLine.replaceAll("]]]]","]]");
-          //       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\":" + theGeomLine + ",    \"properties\":" + JSON.stringify(this.mapTownList[i]) + "}"),
-          //         }),
-          //         style: new ol.style.Style({
-          //           fill: new ol.style.Fill({
-          //             //矢量图层填充颜色，以及透明度
-          //             color: "#AE57A4",
-          //           }),
-          //           stroke: new ol.style.Stroke({
-          //             //边界样式
-          //             color: "#FF0000",
-          //             width: 3,
-          //           }),
-          //           // text: new ol.style.Text({
-          //           //   text: this.mapTownList[i].xzqmc,
-          //           //   font: '30px sans-serif',
-          //           //   textAlign: "center",
-          //           //   textBaseline: "middle",
-          //           //   //font: 'verdana',
-          //           //   fill: new ol.style.Fill({
-          //           //     color: "#ff0000"
-          //           //   }),
-          //           //   // backgroundFill: new ol.style.Fill({
-          //           //   //   color: "#ff0000"
-          //           //   // }),
-          //           //   font: "30px sans-serif",
-          //           //   stroke: new ol.style.Stroke({
-          //           //     color: "#ffffff"
-          //           //     // width: 3
-          //           //   }),
-          //           //   offsetX: parseInt(0, 10),
-          //           //   offsetY: parseInt(0, 10),
-          //           //   placement: "line", //point 则自动计算面的中心k点然后标注  line 则根据面要素的边进行标注
-          //           //   overflow: false //超出面的部分不显示
-          //           //}),
-          //         }),
-          //       });
-          //       map.addLayer(hc_land);
-          //       //console.log(hc_land.values_.source.featuresRtree_.rbush_.data);
-          //       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.log(center);
-          //       map.getView().animate({
-          //         // 只设置需要的属性即可
-          //         center: center, // 中心点
-          //         zoom: 9.8, // 缩放级别
-          //         rotation: undefined, // 缩放完成view视图旋转弧度
-          //         duration: 1000, // 缩放持续时间，默认不需要设置
-          //       });
-          //     }
-          //   }
-          // }
-          // //获取镇界线----end
-          // //获取村界线----start
-          // if(this.mapVillageList.length >0){
-          //   for (var i = 0; this.mapVillageList.length > i; i++) {
-          //     if (this.mapVillageList[i] != null && this.mapVillageList[i].theGeom != null && this.mapVillageList[i].theGeom != "") {
-          //       mapTalkAbout =false;
-          //       this.mapVillageList[i].createBy = 'mapVillageList';
-          //       var theGeomLine= this.mapVillageList[i].theGeom.replaceAll("MultiPolygon","LineString");
-          //       theGeomLine = theGeomLine.replaceAll("[[[[","[[");
-          //       theGeomLine = theGeomLine.replaceAll("]]]]","]]");
-          //       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\":" + theGeomLine + ",    \"properties\":" + JSON.stringify(this.mapVillageList[i]) + "}"),
-          //         }),
-          //         style: new ol.style.Style({
-          //           fill: new ol.style.Fill({
-          //             //矢量图层填充颜色，以及透明度
-          //             color: "#AE57A4",
-          //           }),
-          //           stroke: new ol.style.Stroke({
-          //             //边界样式
-          //             color: "#ff00ff",
-          //             width: 3,
-          //           }),
-          //           // text: new ol.style.Text({
-          //           //   text: this.mapVillageList[i].dcmj,
-          //           //   font: '30px sans-serif',
-          //           //   textAlign: "center",
-          //           //   textBaseline: "middle",
-          //           //   //font: 'verdana',
-          //           //   fill: new ol.style.Fill({
-          //           //     color: "#ff00ff"
-          //           //   }),
-          //           //   // backgroundFill: new ol.style.Fill({
-          //           //   //   color: "#ff0000"
-          //           //   // }),
-          //           //   font: "30px sans-serif",
-          //           //   stroke: new ol.style.Stroke({
-          //           //     color: "#ffffff"
-          //           //     // width: 3
-          //           //   }),
-          //           //   offsetX: parseInt(0, 10),
-          //           //   offsetY: parseInt(0, 10),
-          //           //   placement: "line", //point 则自动计算面的中心k点然后标注  line 则根据面要素的边进行标注
-          //           //   overflow: false //超出面的部分不显示
-          //           // }),
-          //         }),
-          //       });
-          //       map.addLayer(hc_land);
-          //     }
-          //   }
-          // }
-          // // //获取村界线----end
-          // //宅基地定位开始 ---------start
-          // if(this.mapTheGeomZjdId.length >0) {
-          //   for (var i = 0; this.mapTheGeomZjdId.length > i; i++) {
-          //     if (this.mapTheGeomZjdId[i] !=null && this.mapTheGeomZjdId[i].theGeom != null && this.mapTheGeomZjdId[i].theGeom != "") {
-          //       mapTalkAbout =false;
-          //       this.mapTheGeomZjdId[i].createBy = 'mapTheGeomZjdId';
-          //       var styleYqr = "";
-          //       if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){
-          //         styleYqr = new ol.style.Style({
-          //           fill: new ol.style.Fill({
-          //             //矢量图层填充颜色，以及透明度
-          //             color: "#AE57A4",
-          //           }),
-          //           stroke: new ol.style.Stroke({
-          //             //边界样式
-          //             color: "#28FF28",
-          //             width: 3,
-          //           }),
-          //         });
-          //       } else {
-          //         styleYqr = new ol.style.Style({
-          //           fill: new ol.style.Fill({
-          //             //矢量图层填充颜色，以及透明度
-          //             color: "#AE57A4",
-          //           }),
-          //           stroke: new ol.style.Stroke({
-          //             //边界样式
-          //             color: "rgba(255, 45, 45,1)",
-          //             width: 3,
-          //           }),
-          //         });
-          //       }
-          //       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\":" + this.mapTheGeomZjdId[i].theGeom + ",    \"properties\":" + JSON.stringify(this.mapTheGeomZjdId[i]) + "}"),
-          //         }),
-          //         style: styleYqr
-          //       });
-          //       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]); //获取边界区域的中心位置
-          //       // map.getView().animate({
-          //       //   // 只设置需要的属性即可
-          //       //   center: center, // 中心点
-          //       //   zoom: 15.8, // 缩放级别
-          //       //   rotation: undefined, // 缩放完成view视图旋转弧度
-          //       //   duration: 1000, // 缩放持续时间，默认不需要设置
-          //       // });
-          //       //自然幢定位开始 ---------start
-          //       getZrzZjdDmList(this.mapTheGeomZjdId[i].zjddm).then((response) => {
-          //         if (response.code == 200) {
-          //           this.mapTheGeomZrzId = response.data;
-          //           if(this.mapTheGeomZrzId.length >0) {
-          //             for (var i = 0; this.mapTheGeomZrzId.length > i; i++) {
-          //               if (this.mapTheGeomZrzId[i] !=null && this.mapTheGeomZrzId[i].theGeom != null && this.mapTheGeomZrzId[i].theGeom != "") {
-          //                 this.mapTheGeomZrzId[i].createBy = 'mapTheGeomZrzId';
-          //                 var styleZrz = "";
-          //                 if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){
-          //                   styleZrz = new ol.style.Style({
-          //                     fill: new ol.style.Fill({
-          //                       //矢量图层填充颜色，以及透明度
-          //                       color: "#FFD306",
-          //                     }),
-          //                     stroke: new ol.style.Stroke({
-          //                       //边界样式
-          //                       color: "#28FF28",
-          //                       width: 3,
-          //                     }),
-          //                   });
-          //                 } else {
-          //                   styleZrz = new ol.style.Style({
-          //                     fill: new ol.style.Fill({
-          //                       //矢量图层填充颜色，以及透明度
-          //                       color: "#FFD306",
-          //                     }),
-          //                     stroke: new ol.style.Stroke({
-          //                       //边界样式
-          //                       color: "rgba(255, 45, 45,1)",
-          //                       width: 3,
-          //                     }),
-          //                   });
-          //                 }
-          //                 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\":" + this.mapTheGeomZrzId[i].theGeom + ",    \"properties\":" + JSON.stringify(this.mapTheGeomZrzId[i]) + "}"),
-          //                   }),
-          //                   style: styleZrz
-          //                 });
-          //                 map.addLayer(hc_land);
-          //               }
-          //             }
-          //           }
-          //         }
-          //       });
-          //       //自然幢定位结束 ---------end
-          //
-          //       //附属设施定位开始 ---------start
-          //       getFsssZjdDmList(this.mapTheGeomZjdId[i].zjddm).then((response) => {
-          //         if (response.code == 200) {
-          //           this.mapTheGeomFsssId = response.data;
-          //           if(this.mapTheGeomFsssId.length >0) {
-          //             for (var i = 0; this.mapTheGeomFsssId.length > i; i++) {
-          //               if (this.mapTheGeomFsssId[i] !=null && this.mapTheGeomFsssId[i].theGeom != null && this.mapTheGeomFsssId[i].theGeom != "") {
-          //                 this.mapTheGeomFsssId[i].createBy = 'mapTheGeomFsssId';
-          //                 var styleFsss = "";
-          //                 if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){
-          //                   styleFsss = new ol.style.Style({
-          //                     fill: new ol.style.Fill({
-          //                       //矢量图层填充颜色，以及透明度
-          //                       color: "#00FFFF",
-          //                     }),
-          //                     stroke: new ol.style.Stroke({
-          //                       //边界样式
-          //                       color: "#28FF28",
-          //                       width: 3,
-          //                     }),
-          //                   });
-          //                 } else {
-          //                   styleFsss = new ol.style.Style({
-          //                     fill: new ol.style.Fill({
-          //                       //矢量图层填充颜色，以及透明度
-          //                       color: "#00FFFF",
-          //                     }),
-          //                     stroke: new ol.style.Stroke({
-          //                       //边界样式
-          //                       color: "rgba(255, 45, 45,1)",
-          //                       width: 3,
-          //                     }),
-          //                   });
-          //                 }
-          //                 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\":" + this.mapTheGeomFsssId[i].theGeom + ",    \"properties\":" + JSON.stringify(this.mapTheGeomFsssId[i]) + "}"),
-          //                   }),
-          //                   style: styleFsss
-          //                 });
-          //                 map.addLayer(hc_land);
-          //               }
-          //             }
-          //           }
-          //         }
-          //       });
-          //       //附属设施定位结束 ---------end
-          //     }
-          //   }
-          // }
-          // //宅基地定位结束 ---------end
-          //数据库直接加载数据渲染方式---------------------------------------------------end
-
-          //地图操作定义------------start
-          //定位定义------------start
+          map.addLayer(zjdTc);
           var Zb;
           var latitude;
           var longitude;
@@ -3841,7 +3526,7 @@
           $("#dwMapAll").on("click", function () {
             //删除测量记录操作--------start
             //将矢量图层从图中删除
-            //map.removeLayer(helpTooltip);
+            map.removeLayer(helpTooltip);
             map.removeLayer(vector);
             map.removeInteraction(draw_cm);
             //map.removeOverlay(helpTooltipElement);
@@ -3860,8 +3545,9 @@
             if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){
               Zb = [longitude,latitude];
             }else {
-              Zb =[115.452752, 31.789033];
+              Zb =[122.115038, 46.086317];
             }
+
             //获取坐标点LocationManager
             // geoGps().then(response => {
             //
@@ -3898,6 +3584,7 @@
                 zIndex: 9999,
               });
             }
+            console.info(  Zb)
             var newcenterFeature = new ol.Feature({
               geometry: new ol.geom.Point(ol.proj.fromLonLat(Zb)), //几何信息
               name: "标注点",
@@ -3954,8 +3641,10 @@
                   //提示当前坐标是否绘制完成
                   if (that.coordinate != "" && that.coordinate != null) {
                     that.showhzht = true;
-                    that.htZjdZrzFsss = JSON.stringify(that.coordinate);
-                    console.log(that.mapZjdData);
+                    let zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [JSON.stringify(that.coordinate).replaceAll("\"","")]});
+                    let leftJoin = zbNew.replace("\"[","[");
+                    let rightJoin = leftJoin.replace("\"]","]");
+                    that.htZjdZrzFsss = rightJoin;
                     // htMapAllFu();
                   } else {
                     $("#htMapAll").trigger("click");
@@ -4753,7 +4442,7 @@
               service: "WFS",
               version: "1.0.0",
               request: "GetFeature",
-              typename: "zjd_dc:t_house_survey_border_village",
+              typename: "nsgk_wulanhaote:t_homespace_cjqy",
               //featureNS: 'nsgk_hc',//命名空间 URI
               cql_filter: cql_filter,
               //featurePrefix: 'nationalwater',//工作区名称
@@ -6105,13 +5794,15 @@
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
             this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
-            this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
+            this.mapZjdTeAll.mapZjdAData.theGeomJson =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
-            this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
+            this.$router.push({path:'/homesteadSurvey/add'});
           }else {
             this.$toast("已选择宅基地，请选择自然幢或附属设施按钮");
+
           }
         },
         zrzTz(){
@@ -6122,7 +5813,8 @@
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
-            this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZrzAData));
+            this.$router.push({path:'/homesteadSurvey/add3'});
           }else {
             this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮");
           }
@@ -6130,12 +5822,13 @@
         fsssTz(){
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
-          this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
+          this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss;
             this.mapZjdTeAll.mapFsssAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
           //this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
           //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
-          this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapFsssAData));
+            this.$router.push({path:'/homesteadSurvey/add4'});
           }else {
             this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮");
           }

src/views/homesteadSurvey/nhDetails.vue

@@ -54,12 +54,12 @@
       </div>
     </van-sticky>
 <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
-    <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-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>
+      <div style="margin:10px auto 0;width: 95%;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">农户信息</p>
+      </div>
+      <div style="margin:10px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <!--<van-field
           v-model="form.deptId"
           name="行政区划名称"

src/views/homesteadSurvey/nhcyAdd.vue

@@ -92,6 +92,7 @@
           v-model="form.yhzgx"
           label="与户主关系"
           value-key="dictLabel"
+          :readonly="yhzgxOperate"
           data-key="dictValue"
           placeholder="选择与户主关系"
           remote-url="/open/zdzh/list/family_status"
@@ -294,6 +295,7 @@ export default {
     return {
       active:2,
       permission:false,
+      yhzgxOperate:false,
       // 使用权人列表
       syqrlist:[
         {
@@ -310,9 +312,14 @@ export default {
     this.form = data;
     this.permission = localStorage.getItem("executePermission");
     if(this.form.id == null){
+      if(data.yhzgxOperate === "true"){
+        this.yhzgxOperate = true;
+        this.$set(this.form, 'yhzgx', "02");
+      }else{
+        this.$set(this.form, 'yhzgx', "11");
+      }
       this.$set(this.form, 'zjlx', "01");
       this.$set(this.form, 'xb', "1");
-      this.$set(this.form, 'yhzgx', "11");
       this.$set(this.form, 'hklx', "01");
       this.$set(this.form, 'hyzk', "01");
       this.$set(this.form, 'cybz', "9");
@@ -348,7 +355,11 @@ export default {
             message: '保存成功',
             duration:"1000",
             onClose:function(){
-              _this.$router.push({path:'/homesteadSurvey/nhcyList',query: {zjddm: _this.form.zjddm}});
+              if(_this.yhzgxOperate){
+                _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+              }else{
+                _this.$router.push({path:'/homesteadSurvey/nhcyList',query: {nhdm: _this.form.nhdm}});
+              }
             }
           })
         });
@@ -360,7 +371,11 @@ export default {
             message: '保存成功',
             duration:"1000",
             onClose:function(){
-              _this.$router.push({path:'/homesteadSurvey/nhcyList',query: {zjddm: _this.form.zjddm}});
+              if(_this.yhzgxOperate){
+                _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+              }else{
+                _this.$router.push({path:'/homesteadSurvey/nhcyList',query: {nhdm: _this.form.nhdm}});
+              }
             }
           })
         });

src/views/homesteadSurvey/nhcyList.vue

@@ -65,20 +65,47 @@
           <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)">
+          <p style="width:25%;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>
-
+          <p v-if="item.yhzgx != '02'" style="width:25%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="handleFenHu(item)">
+            <img src="../../assets/images/housesteadSurvey/list09.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">分户</span>
+          </p>
+          <p v-if="item.yhzgx != '02'" style="width:25%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="handleGuohu(item)">
+            <img src="../../assets/images/housesteadSurvey/add03.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">移户</span>
+          </p>
+          <p v-if="item.yhzgx != '02'" style="width:25%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="handleToHuzhu(item)">
+            <img src="../../assets/images/housesteadSurvey/list03.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">设为户主</span>
+          </p>
         </div>
       </div>
       <template #right>
         <van-button v-if="permission == 'true'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"/>
       </template>
     </van-swipe-cell>
+    <van-dialog v-model="guohuData.visible" title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">
+      <van-form ref="guohu_form" style="height: 200px;"  label-width="180px">
+        <field-select
+          v-model="guohuData.to"
+          label="指定新户主"
+          value-key="xm"
+          data-key="nhdm"
+          placeholder="请选择农户代码"
+          :columns = "guohuData.huzhuList"
+          :on-remote-response="'data'"
+          @confirm="onGuohuChanged"
+          :rules="[{ required: true }]"
+          required
+        />
+      </van-form>
+    </van-dialog>
     <div v-if="permission == 'true'"  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="showPopupcy()">+ 添加农户信息</p>
+        <p style="font-size: 16px;" @click="showPopupcy()">+ 添加成员信息</p>
       </div>
     </div>
   </div>
@@ -90,17 +117,18 @@ 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 {listNhhncy,addNhhncy,updateNhhncy,delNhhncy,toHuzhu,fenhu,guohu} 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 FieldSelect from "@/components/form/FieldSelect";
 import { Notify, Dialog, Toast } from 'vant';
 import axios from "axios";
 export default {
   name: "nhcyList",
-  components: { MapGisDrawing,},
+  components: { MapGisDrawing,FieldSelect},
   data() {
     return {
       active:2,
@@ -108,6 +136,12 @@ export default {
       // 使用权人列表
       shyqrData:{},
       hnnylist:[],
+      guohuData: {
+        visible: false,
+        huzhuList: [],
+        id: null,
+        to: null,
+      },
     };
   },
   created(){
@@ -138,11 +172,73 @@ export default {
       this.$router.push({name: this.$router.back(-1)});
       // }
     },
+    handleToHuzhu(row) {
+      const ids = row.id || this.ids;
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否确认将此成员设为本户新的户主?',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(function() {
+        return toHuzhu(ids);
+      }).then(() => {
+        this.$notify({ type: 'success' , message: "设为户主成功" });
+        location.reload(true);
+      }).catch(() => {});
+    },
+    handleFenHu(row) {
+      const ids = row.id || this.ids;
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否确认将此成员新立一户并设为户主?',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(function() {
+        return fenhu(ids);
+      }).then(() => {
+        this.$notify({ type: 'success' , message: "分户成功" });
+        location.reload(true);
+      }).catch(() => {});
+    },
+    handleGuohu(row) {
+      const id = row.id || this.ids
+      listNhhncy({
+        deptId: this.$store.state.user.loginDeptId,
+        yhzgx: '02',
+      }).then(response => {
+        this.guohuData.id = id;
+        this.guohuData.visible = true;
+        this.guohuData.huzhuList = response.rows.filter((x) => x.nhdm != row.nhdm);
+        this.guohuData.huzhuList.map(function(item){
+          item.xm = item.xm+item.nhdm;
+        })
+      });
+    },
+    onGuohuChanged(val){
+      this.$set(this.guohuData, 'to',val);
+    },
+    guohu() {
+      this.$refs["guohu_form"].validate(valid => {
+        if (valid) {
+          guohu(this.guohuData.id, this.guohuData.to).then(response => {
+            if(response.code != 200) throw response.msg;
+            this.$notify({ type: 'success' , message: "移户成功" });
+            this.closeGuohu();
+            location.reload(true);
+          }).catch(() => {});
+        }
+      });
+    },
+    closeGuohu() {
+      this.guohuData.visible = false;
+      this.guohuData.id = this.guohuData.to = null;
+      this.guohuData.huzhuList = [];
+    },
     showPopupsyqr(val){
       this.$router.push({name:'shyqrAdd',query:val});
     },
     showPopupcy(){
-      this.$router.push({name:'nhcyAdd',query:{nhdm:this.hnnylist[0].nhdm,suyqrdm:this.hnnylist[0].suyqrdm}});
+      this.$router.push({name:'nhcyAdd',query:{nhdm:this.shyqrData.nhdm,suyqrdm:this.shyqrData.suyqrdm,yhzgxOperate:"false"}});
     },
     showPopuphncy(val){
       this.$router.push({name:'nhcyAdd',query:val});

src/views/homesteadSurvey/nmfwAdd.vue

@@ -286,6 +286,7 @@
           v-model="form.jznd"
           name="建筑年代"
           label="建筑年代"
+          placeholder="建筑年代"
           maxlength="50"
           autocomplete="off"
         />
@@ -392,6 +393,10 @@ export default {
       this.$set(this.form, 'fwzt', "01");
       this.$set(this.form, 'fwyt', "10");
       this.$set(this.form, 'sfytrgy', "0");
+    }else{
+      if(this.form.jznd != null){
+        this.form.jznd = this.form.jznd.substr(0,10);
+      }
     }
   },
   mounted(){
@@ -402,16 +407,16 @@ export default {
       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}});
-            }
-          })
-        });
+            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

src/views/homesteadSurvey/nmfwList.vue

@@ -72,7 +72,7 @@
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
+        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletenmfw(item)"/>
       </template>
     </van-swipe-cell>
 
@@ -148,6 +148,21 @@ export default {
     showPopuphncy(val){
       this.$router.push({name:'nhcyAdd',query:val});
     },
+    deletenmfw(val){
+      const ids = val.id || this.ids;
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否确认删除农民房屋标识为"' + val.id + '"的数据项?',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(function() {
+          return delNmfw(ids);
+        }).then(() => {
+        this.$notify({ type: 'success' , message: "删除成功" });
+        location.reload(true);
+      }).catch(() => {});
+    }
   }
 }
 </script>

src/views/homesteadSurvey/shyqrAdd.vue

@@ -55,7 +55,7 @@
           :rules="[{ required: true, message: '' }]"
         />-->
 
-        <van-field v-model="form.nhdm" label="农户姓名" placeholder="农户" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <van-field v-model="form.nhdm" label="农户代码" placeholder="农户代码" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in nhdmDictionaries" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
             {{item.hzxm}}-{{item.nhdm}}

src/views/homesteadSurvey/zrzAdd.vue

@@ -244,6 +244,9 @@ export default {
     if(this.form.shyqrdbzjhm != null){
       this.getList();
     }
+    if(this.form.jgrq != null){
+      this.form.jgrq = this.form.jgrq.substr(0,10);
+    }
     this.$nextTick(() => {
 
       this.pointDarw(null);

src/views/sunVillage_info/arbitration/arbitrationDetail.vue

@@ -27,7 +27,7 @@
               <div>
                 <p class="main_title">基本信息</p>
                 <div class="main_box">
-                  <van-field v-model="arbitrationData.shyqrdbxm" readonly label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+                  <van-field v-model="arbitrationData.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
                   <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
                     <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
                       {{item.sqrxm}}

src/views/user/accountSetting/bankInformation/index.vue

@@ -70,7 +70,7 @@
         />
       </van-popup>
 
-      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入关键词"/>
+      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词"/>
       <van-field
         v-model="form.bankAddress"
         label="开户银行"