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

src/api/homesteadSurvey/index.js

@@ -8,7 +8,14 @@ export function listTask(query) {
     params: query
   })
 }
-
+// 数据调查任务列表（带完成数、调查数）
+export function mobileList(query) {
+  return request({
+    url: '/home/homesteadsurvey/mobileList',
+    method: 'get',
+    params: query
+  })
+}
 // 导出数据调查任务
 export function exportTask(id) {
   return request({

src/api/homesteadSurvey/nh.js

@@ -8,7 +8,13 @@ export function listNh(query) {
     params: query
   })
 }
-
+export function queryList(query) {
+  return request({
+    url: '/home/homesteadnh/queryList',
+    method: 'get',
+    params: query
+  })
+}
 // 导出数据调查-户主信息
 export function exportNh(query) {
   return request({

src/api/homesteadSurvey/nhhncy.js

@@ -9,6 +9,14 @@ export function listNhhncy(query) {
   })
 }
 
+// 查询农户户主详细
+export function getHomesteadnhhnhzByNhdm(nhdm) {
+  return request({
+    url: '/home/homesteadnhhncy/householdByNhdm/' + nhdm,
+    method: 'get'
+  })
+}
+
 // 导出数据调查-农户户内成员
 export function exportNhhncy(query) {
   return request({

src/api/homesteadSurvey/shyqr.js

@@ -71,6 +71,14 @@ export function delShyqr(id) {
     method: 'get'
   })
 }
+// 删除数据调查-使用权人
+export function deleleShyqr(nhdm) {
+  return request({
+    url: '/home/homesteadshyqr/removeMobile/' + nhdm,
+    method: 'get'
+  })
+}
+
 
 // 设为户主-使用权人
 export function setSyqrInfo(data) {

src/api/sunVillage_info/fixedAssets.js

@@ -126,6 +126,15 @@ export function getPermanent(id) {
     method: 'get'
   })
 }
+
+// 清除固定资产图层
+export function clearPermanentGeom(id) {
+  return request({
+    url: '/asset/permanent/clear/' + id,
+    method: 'get'
+  });
+}
+
 // 修改固定资产
 export function updatePermanent(data) {
   return request({
@@ -1036,6 +1045,13 @@ export function getResource(id) {
   })
 }
 
+export function clearResourceGeom(id) {
+  return request({
+    url: '/asset/resource/clear/' + id,
+    method: 'get'
+  });
+}
+
 // 资源新增
 export function addResource(data) {
   return request({

src/components/Map/MapGisLine.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
 <!--    <p class="fuTitle">地块位置绘制</p>-->
-    <div id="full-screen-acceptance" style="width: 100%;height:73vh;">
+    <div id="full-screen-acceptance" style="width: 100%;height:71vh;">
         <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
         <div id='land-btn-wrap'>
             <!--<el-button :id=this.drawingPolygonMap style="background-color:#D0EEFF;color:#1E88C7" @click="" type="primary">画图</el-button>-->
@@ -11,6 +11,7 @@
             <input :id="this.drawingResetMap" type="button" class="ant-btn ant-btn-red" value="重置图层"/>
         </div>
       </div>
+    <div style="font-size: 13px; padding-top: 5px;">备注信息：绿色地块表示该地块，蓝色表示本账套已标记的其他地块</div>
     <div id="info" style="display: none"></div>
   </div>
 </template>
@@ -18,6 +19,7 @@
 <script>
   import {getQueryLand} from "@/api/homesteadSurvey/zjdzd";
 import $ from "jquery";
+  import { getConfigKey } from "@/api/system/config";
 
 export default {
   components: {
@@ -29,15 +31,30 @@ export default {
       uuidMap: this.guidProduct(),
       drawingPolygonMap: this.guidProduct(),
       drawingResetMap: this.guidProduct(),
+      mapGeoServerUrl: "",            // geoserver地址
+      villageBorderLayerName: "",     // 乡镇边界图层名称
     };
   },
-  props: ['theGeom','message'],
-  // created() {
-  //   // setTimeout(() => {
-  //   //   this.drawingPaceCountryLine();
-  //   // }, 100);
-  // },
+  props: ['theGeom','message', 'resourceId', 'resourceList'],
+  created() {
+    // 获取geoserver的地址
+    this.getGeoServerUrl();
+    // 获取村边界的图层名称
+    this.getVillageBorderLayerName();
+  },
   methods: {
+    // 获取geoserver的地址
+    getGeoServerUrl() {
+      getConfigKey("system.geoServer.url").then(response => {
+        this.mapGeoServerUrl = response.msg;
+      });
+    },
+    // 获取村边界的图层名称
+    getVillageBorderLayerName() {
+      getConfigKey("geoserver.layer.villageBorder").then(response => {
+        this.villageBorderLayerName = response.msg;
+      });
+    },
     //地图加载
     formSubmit(){
        //父组件监听的名字必须是formSubmit
@@ -107,6 +124,51 @@ export default {
             maxZoom: 18.3, //地图放大限制
           }),
         });
+
+        // 添加村边界
+        let mapBorder = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.villageBorderLayerName,
+              cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+              SRID: 3857,
+            },
+          }),
+          name: 'villageBorderLayer'
+        });
+        map.addLayer(mapBorder);
+
+        // 添加已经存在的资源图层
+        let vectorSource = new ol.source.Vector();
+        for (let resource of this.resourceList) {
+          if (resource.theGeom && resource.id !== this.resourceId) {
+            let feature = new ol.Feature({
+              geometry: new ol.geom.MultiPolygon(JSON.parse(resource.theGeom).coordinates),
+              // permanentName: permanent.name
+            });
+            vectorSource.addFeature(feature);
+          }
+        }
+
+        let resourceLayer = new ol.layer.Vector({
+          source: vectorSource,
+          style:  (feature, resolution) => {
+            return new ol.style.Style({
+              fill: new ol.style.Fill({
+                //矢量图层填充颜色，以及透明度
+                color: "rgba(0, 218, 255, 0.3)",
+              }),
+              stroke: new ol.style.Stroke({
+                //边界样式
+                color: "#00DAFF",
+                width: 3,
+              }),
+            })
+          }
+        });
+        map.addLayer(resourceLayer);
+
         //图层查询定位开始 ---------start
         if(this.message.substring(0,1) =="{"){
           // var theGeomMap =this.message.replace("Point", "MultiPolygon");
@@ -290,6 +352,50 @@ export default {
                   maxZoom: 18, //地图放大限制
                 }),
               });
+
+              // 添加村边界
+              let mapBorder = new ol.layer.Image({
+                source: new ol.source.ImageWMS({
+                  url: this.mapGeoServerUrl + '/wms',
+                  params: {
+                    LAYERS: this.villageBorderLayerName,
+                    cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+                    SRID: 3857,
+                  },
+                }),
+                name: 'villageBorderLayer'
+              });
+              map.addLayer(mapBorder);
+
+              // 添加已经存在的资源图层
+              let vectorSource = new ol.source.Vector();
+              for (let resource of this.resourceList) {
+                if (resource.theGeom && resource.id !== this.resourceId) {
+                  let feature = new ol.Feature({
+                    geometry: new ol.geom.MultiPolygon(JSON.parse(resource.theGeom).coordinates),
+                    // permanentName: permanent.name
+                  });
+                  vectorSource.addFeature(feature);
+                }
+              }
+
+              let resourceLayer = new ol.layer.Vector({
+                source: vectorSource,
+                style:  (feature, resolution) => {
+                  return new ol.style.Style({
+                    fill: new ol.style.Fill({
+                      //矢量图层填充颜色，以及透明度
+                      color: "rgba(0, 218, 255, 0.3)",
+                    }),
+                    stroke: new ol.style.Stroke({
+                      //边界样式
+                      color: "#00DAFF",
+                      width: 3,
+                    }),
+                  })
+                }
+              });
+              map.addLayer(resourceLayer);
             }
           }
         });

src/components/Map/MapGisTagDTGCopy.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="full-screen-acceptance" style="width: 100%;height:73vh;">
+    <div id="full-screen-acceptance" style="width: 100%;height:71vh;">
       <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
       <div id='land-btn-wrap' v-show="showBtn">
         <input :id="this.drawPolygonMap" class="ant-btn ant-btn-red" type="button" value="标记"/>&nbsp;&nbsp;
@@ -8,14 +8,16 @@
         <input :id="this.drawResetMap" type="button" class="ant-btn ant-btn-red" value="重置标记"/>
       </div>
     </div>
+    <div style="font-size: 13px; padding-top: 5px;">备注信息：黄色标记表示该资产，蓝色标记是本账套已标记的其他资产</div>
     <div id="info" style="display: none"></div>
   </div>
 </template>
 
 <script>
   import $ from "jquery";
-  import {entityGet, treeselect} from "@/api/agriculturalTrusteeship";
   import Cookies from "js-cookie";
+  import {getQueryLand} from "@/api/homesteadSurvey/zjdzd";
+  import { getConfigKey } from "@/api/system/config";
 
   export default {
     data() {
@@ -25,10 +27,30 @@
         uuidMap: this.guidProduct(),
         drawPolygonMap: this.guidProduct(),
         drawResetMap: this.guidProduct(),
+        mapGeoServerUrl: "",            // geoserver地址
+        villageBorderLayerName: "",     // 乡镇边界图层名称
       };
     },
-    props: ['theGeom','message','showBtn'],
+    props: ['theGeom','message','showBtn', 'permanentId', 'permanents'],
+    created() {
+      // 获取geoserver的地址
+      this.getGeoServerUrl();
+      // 获取村边界的图层名称
+      this.getVillageBorderLayerName();
+    },
     methods: {
+      // 获取geoserver的地址
+      getGeoServerUrl() {
+        getConfigKey("system.geoServer.url").then(response => {
+          this.mapGeoServerUrl = response.msg;
+        });
+      },
+      // 获取村边界的图层名称
+      getVillageBorderLayerName() {
+        getConfigKey("geoserver.layer.villageBorder").then(response => {
+          this.villageBorderLayerName = response.msg;
+        });
+      },
       //地图加载
       formSubmit(){
         //父组件监听的名字必须是formSubmit
@@ -130,58 +152,104 @@
               maxZoom: 18.3, //地图放大限制
             }),
           });
-          //图层查询定位开始 ---------start
-          if(this.message.substring(0,1) =="{"){
-            var theGeomMap =this.message.replace("Point", "MultiPolygon");
-            var pointLeft = theGeomMap.replace("[", "[[[[");
-            var pointRight = pointLeft.replace("]", "]]]]");
-            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\":" + pointRight + "}"),
-              }),
-              style: new ol.style.Style({
-                fill: new ol.style.Fill({
-                  //矢量图层填充颜色，以及透明度
-                  color: "rgba(204, 255, 204,0.3)",
-                }),
-                stroke: new ol.style.Stroke({
-                  //边界样式
-                  color: "#47c68f",
-                  width: 3,
-                }),
-              }),
-            });
+          // 添加村边界
+          let mapBorder = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: this.mapGeoServerUrl + '/wms',
+              params: {
+                LAYERS: this.villageBorderLayerName,
+                cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+                SRID: 3857,
+              },
+            }),
+            name: 'villageBorderLayer'
+          });
+          map.addLayer(mapBorder);
+
+          // 添加已经存在的坐标点图层
+          let permanentSource = new ol.source.Vector();
+          for (let permanent of this.permanents) {
+            if (permanent.theGeom && permanent.id !== this.permanentId) {
+              let feature = new ol.Feature({
+                geometry: new ol.geom.Point(JSON.parse(permanent.theGeom).coordinates),
+                // permanentName: permanent.name
+              });
+              permanentSource.addFeature(feature);
+            }
           }
-          if(this.message.substring(0,1) =="["){
-            var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [[[this.message.replaceAll("\"","")]]]});
-            var leftJoin = zbNew.replace("\"[","[");
-            var rightJoin = leftJoin.replace("\"]","]");
-            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\":" + rightJoin + "}"),
-              }),
-              style: new ol.style.Style({
-                fill: new ol.style.Fill({
-                  //矢量图层填充颜色，以及透明度
-                  color: "rgba(204, 255, 204,0.3)",
-                }),
-                stroke: new ol.style.Stroke({
-                  //边界样式
-                  color: "#47c68f",
-                  width: 3,
+          /* let permanentLayer = new ol.layer.Vector({
+            source: clusterSource,
+            style:  (feature, resolution) => {
+              let count = feature.get("features").length;
+              if (count > 1) {
+                // 聚合点样式
+                return this.clusterStyle(count.toString());
+              } else if (count === 1) {
+                return this.iconStyle();
+              }
+            }
+          }); */
+          let permanentLayer = new ol.layer.Vector({
+            source: permanentSource,
+            style:  (feature, resolution) => {
+              return new ol.style.Style({
+                image: new ol.style.Icon({
+                  //设置图标偏移
+                  anchor: [0.5, 1],
+                  //标注样式的起点位置
+                  anchorOrigin: "top-right",
+                  //X方向单位：分数
+                  anchorXUnits: "fraction",
+                  //Y方向单位：像素
+                  anchorYUnits: "pixels",
+                  //偏移起点位置的方向
+                  offsetOrigin: "top-right",
+                  //透明度
+                  opacity: 0.9,
+                  //图片路径
+                  src: require("../../assets/images/location/blue.png"),
                 }),
+                text: new ol.style.Text({
+                  textAlign: "center", //位置
+                  textBaseline: "middle", //基准线
+                  font: "normal 12px 微软雅黑", //文字样式
+                  // text: feature.get("permanentName"), //文本内容
+                  fill: new ol.style.Fill({
+                    //文本填充样式（即文字颜色)
+                    color: "#ff0000",
+                  }),
+                })
+              })
+            }
+          });
+          map.addLayer(permanentLayer);
+
+          //图层查询定位开始 ---------start
+          var theGeomMap =this.message.replace("Point", "MultiPolygon");
+          var pointLeft = theGeomMap.replace("[", "[[[[");
+          var pointRight = pointLeft.replace("]", "]]]]");
+          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\":" + pointRight + "}"),
+            }),
+            style: new ol.style.Style({
+              fill: new ol.style.Fill({
+                //矢量图层填充颜色，以及透明度
+                color: "rgba(204, 255, 204,0.3)",
               }),
-            });
-          }
+              stroke: new ol.style.Stroke({
+                //边界样式
+                color: "#47c68f",
+                width: 3,
+              }),
+            }),
+          });
           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;
@@ -299,16 +367,16 @@
           });
           //获取坐标是否存在
           var Zb;
-          var latitude;
-          var longitude;
           //开始定位当前位置
-          navigator.geolocation.getCurrentPosition(function(position) {
-            latitude = position.coords.latitude;// 获取纬度
-            longitude = position.coords.longitude;// 获取经度
-          });
-          treeselect().then(res=>{
+          getQueryLand().then(res => {
             if (res.code == 200) {
-              Zb = [res.data[0].lng,res.data[0].lat]
+              let lat = res.data.lat;
+              let lng = res.data.lng;
+              if(lat && lng){
+                Zb = [lng,lat];
+              }else {
+                Zb =[115.452752, 31.789033];
+              }
               //加载地图
               map = new ol.Map({
                 controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
@@ -324,6 +392,78 @@
                   maxZoom: 18, //地图放大限制
                 }),
               });
+
+              // 添加村边界
+              let mapBorder = new ol.layer.Image({
+                source: new ol.source.ImageWMS({
+                  url: this.mapGeoServerUrl + '/wms',
+                  params: {
+                    LAYERS: this.villageBorderLayerName,
+                    cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+                    SRID: 3857,
+                  },
+                }),
+                name: 'villageBorderLayer'
+              });
+              map.addLayer(mapBorder);
+
+              // 添加已经存在的坐标点图层
+              let permanentSource = new ol.source.Vector();
+              for (let permanent of this.permanents) {
+                if (permanent.theGeom && permanent.id !== this.permanentId) {
+                  let feature = new ol.Feature({
+                    geometry: new ol.geom.Point(JSON.parse(permanent.theGeom).coordinates),
+                    // permanentName: permanent.name
+                  });
+                  permanentSource.addFeature(feature);
+                }
+              }
+              /* let permanentLayer = new ol.layer.Vector({
+                source: clusterSource,
+                style:  (feature, resolution) => {
+                  let count = feature.get("features").length;
+                  if (count > 1) {
+                    // 聚合点样式
+                    return this.clusterStyle(count.toString());
+                  } else if (count === 1) {
+                    return this.iconStyle();
+                  }
+                }
+              }); */
+              let permanentLayer = new ol.layer.Vector({
+                source: permanentSource,
+                style:  (feature, resolution) => {
+                  return new ol.style.Style({
+                    image: new ol.style.Icon({
+                      //设置图标偏移
+                      anchor: [0.5, 1],
+                      //标注样式的起点位置
+                      anchorOrigin: "top-right",
+                      //X方向单位：分数
+                      anchorXUnits: "fraction",
+                      //Y方向单位：像素
+                      anchorYUnits: "pixels",
+                      //偏移起点位置的方向
+                      offsetOrigin: "top-right",
+                      //透明度
+                      opacity: 0.9,
+                      //图片路径
+                      src: require("../../assets/images/location/blue.png"),
+                    }),
+                    text: new ol.style.Text({
+                      textAlign: "center", //位置
+                      textBaseline: "middle", //基准线
+                      font: "normal 12px 微软雅黑", //文字样式
+                      // text: feature.get("permanentName"), //文本内容
+                      fill: new ol.style.Fill({
+                        //文本填充样式（即文字颜色)
+                        color: "#ff0000",
+                      }),
+                    })
+                  })
+                }
+              });
+              map.addLayer(permanentLayer);
             }
           })
 

src/components/home/HomeApplyUploadCompTc.vue

@@ -63,6 +63,7 @@ export default {
     },
   },
   created() {
+    console.info(this.businessType);
     if (this.businessType !== null) {
       this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
     }

src/utils/request.js

@@ -120,8 +120,11 @@ if(responseInterceptor === undefined){
                 window.location.href = '/contracted/login';
                 return;
               }else{
-                // 产权交易
-                window.location.href = '/login';
+                if(!window.location.href.indexOf('/Login') && !window.location.href.indexOf('/login')){
+                  // 产权交易
+                  window.location.href = '/login';
+                }
+
               }
 
             })

src/views/homesteadSurvey/add.vue

@@ -301,6 +301,8 @@
                         <van-datetime-picker
                           :value="new Date"
                           type="date"
+                          :min-date="minDate"
+                          :max-date="maxDate"
                           @confirm="onConfirmzjdqdsj"
                           @cancel="showZjdqdsj = false"
                         />
@@ -790,8 +792,8 @@ export default {
       showXzyy:false,
       showXzqssj:false,
       showUpload:false,
-      minDate: new Date(1900,0,1),
-      maxDate: new Date(2025, 10, 1),
+      minDate: new Date(1950,1,1),
+      maxDate: new Date(2030, 10, 1),
       form:{}
     };
   },

src/views/homesteadSurvey/add2.vue

@@ -74,11 +74,11 @@
           <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 transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
-            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">户主</span>
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">户主</span>
           </p>
-          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: rgba(34,183,242,0.14);padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
             <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">使用权人</span>
           </p>
@@ -89,7 +89,7 @@
         </div>
       </div>
       <template #right>
-        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"/>
+        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -105,7 +105,7 @@
 </template>
 
 <script>
-import {getShyqrs,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+import {getShyqrs,addShyqr,updateShyqr,deleleShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
 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";
@@ -202,15 +202,16 @@ export default {
       // }
     },
     deleteshyqr(val){
-      const ids = val.id || this.ids;
+      const nhdm = val.nhdm
+      console.info(val.id);
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除使用权人标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除使用权人数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
         .then(function() {
-          return delShyqr(ids);
+          return deleleShyqr(nhdm);
         }).then(() => {
         this.$notify({ type: 'success' , message: "删除成功" });
         location.reload(true);

src/views/homesteadSurvey/add3.vue

@@ -74,9 +74,9 @@
             <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="showPopupzrz(item)">
-              <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-              <span style="font-size: 14px;color: #fff;margin-left: 5px;">自然幢信息</span>
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
+              <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+              <span style="font-size: 14px;color: #22B7F2;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="shownmfwlist(item)">
               <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
@@ -85,8 +85,14 @@
           </div>
         </div>
         <template #right>
-          <van-button  v-if="permission == 'true'" square  type="danger" class="delete-button" @click="deletezrz(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
-          <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>自然幢附件</van-button>
+          <van-row>
+            <van-col>
+              <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+            </van-col>
+            <van-col>
+              <van-button  v-if="permission == 'true'" square  type="danger" class="delete-button" @click="deletezrz(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+            </van-col>
+          </van-row>
         </template>
       </van-swipe-cell>
     </van-list>
@@ -309,7 +315,14 @@ export default {
           f.push(i.content)
         }
       }
-      console.info(this.uploadImgList);
+      if(f.length === 0){
+        return this.$toast.fail("请上传照片");
+      }
+      this.$toast.loading({
+        message: "数据处理中",
+        forbidClick: true,
+        duration: 10000000000,
+      });
       let _this = this;
       let file = {
         tableId:val,
@@ -350,7 +363,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除自然幢标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除自然幢号数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -389,6 +402,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

src/views/homesteadSurvey/add4.vue

@@ -74,18 +74,21 @@
           <p style="flex:1;text-align:right;">{{ formatDict(jzwqkList, 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="showUploadList(item.id)">
-            <van-icon  name="photo-o" size=".4rem" color="#FFFFFF"/>
-            <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 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 style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(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 v-show="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
+        <van-row style="height: 100%">
+          <van-col style="height: 100%">
+            <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+          </van-col>
+          <van-col style="height: 100%">
+            <van-button v-show="permission == 'true'" square type="danger" class="delete-button" @click="deletefsss(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+          </van-col>
+        </van-row>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -95,25 +98,19 @@
       </div>
     </div>
     <div  style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
-      <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
+      <p v-if="permission == 'true' && zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5'" 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;"  @click="ycbj()">异常标记</span>
       </p>
-      <p v-if="permission == 'true'" 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;"  @click="qmqr()">签名确认</span>
+      <p v-if="zjdzdxx.surveyStatus == '4'" style="width:32%;border: 1px solid transparent;background: #FFA500;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="bhyyLook()">驳回原因</span>
+      </p>
+      <p  v-if="showSh" 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;"  @click="qmqr()">{{qzqr}}</span>
       </p>
       <p v-if = "showDcsh" 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;"  @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" closeable position="right" :style="{ height: '100%' }"
                close-icon="close">
       <van-row style="margin:0 10%">
@@ -129,22 +126,22 @@
           :lineWidth="signature.lineWidth"
           :lineColor="signature.lineColor"
           :bgColor.sync="signature.bgColor"
-          v-if="!signature.resultImg"
+          v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg"
         />
       </div>
-        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' ||!signature.resultImg"
              style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
-        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
-      <div class="signature-footer"  v-if="!signature.resultImg">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg && zjdzdxx.surveyStatus != '4' && zjdzdxx.surveyStatus != '2'"/>
+      <div class="signature-footer"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg && permission == 'true'">
           <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
           <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
-        </van-row>
       </div>
     </van-popup>
-    <van-dialog v-model="ycbzShow" title="异常标记" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="confirmn" >
+    <van-dialog v-model="ycbzShow" title="异常标记" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" confirmButtonColor="#323233" :before-close="onBeforeClose" >
+      <van-form  ref="ycbzForm">
       <van-row>
         <van-col span="24">
-          <van-field v-model="zjdzdxx.surveyBz" label="异常备注" placeholder="异常备注" input-align="right" />
+          <van-field v-model="zjdzdxx.surveyBz" label="异常备注" placeholder="异常备注" input-align="right" :rules="[{ required: true }]" required />
         </van-col>
         <van-col span="12">
         <p style="margin-left: 10%;color: #646566;    font-size: 0.373333rem;">备注图片</p>
@@ -153,7 +150,27 @@
           <MultiImageUploadComp :value="zjdzdxx.surveyBztp" :uploadDisabled="false"  @fileUpdate="fileUpdate"/>
         </van-col>
       </van-row>
+      </van-form>
+
+    </van-dialog>
 
+    <van-dialog v-model="dcshShow" title="调查审核" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" confirmButtonColor="#323233" :before-close="onBeforeCloseSh" >
+      <van-form  ref="dcshForm">
+        <van-row>
+          <van-col span="24">
+            <van-field v-model="zjddcsh.auditRemark" label="备注" placeholder="审核备注" input-align="right" />
+          </van-col>
+          <van-col span="8">
+            <p style="margin-left: 10%;color: #646566;    font-size: 0.373333rem;">审核</p>
+          </van-col>
+          <van-col span="16">
+            <van-radio-group v-model="zjddcsh.surveyStatus" direction="horizontal">
+              <van-radio name="5">通过</van-radio>
+              <van-radio name="4">驳回</van-radio>
+            </van-radio-group>
+          </van-col>
+        </van-row>
+      </van-form>
 
     </van-dialog>
     <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
@@ -192,6 +209,8 @@ export default {
       dcshShow:false,
       showesign:false,
       showDcsh:false,
+      qzqr:"签名确认",
+      showSh:false,
       loading:false,
       finished:false,
       countyhc:1,
@@ -205,8 +224,8 @@ export default {
       ycbz:"",
       jzwqkList:[],
       fssslxList:[],
-      examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
       zjdzdxx:{surveyStatus:"5"},
+      zjddcsh:{surveyStatus:"5",auditRemark:""},
       fssslist:[],
       //电子签名
       signature: {
@@ -225,10 +244,10 @@ export default {
     this.houseGetDicts("fsss_type").then((response) => {
       this.fssslxList = response.data;
     });
+
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     this.permission = localStorage.getItem("executePermission");
     let businessLevel = this.$store.state.user.businessLevel;
-    console.info(this.zjdzdxx);
     if(this.zjdzdxx.surveySign != null){
       this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
     }
@@ -237,6 +256,12 @@ export default {
         if(response.data.surveyStatus === "3"  && businessLevel === "2"){
           this.showDcsh =  true;
         }
+        if(response.data.surveyStatus === '5' || response.data.surveyStatus === '3'){
+          this.qzqr = "签名图片";
+        }else{
+          this.qzqr = "签名确认";
+        }
+        this.showSh =  true;
       });
       this.getList();
     }
@@ -269,24 +294,38 @@ export default {
     canvasTTdown() {
       $('#canvasTT').css('display', 'none');
     },
-    onSurveyStatusChanged(val){
-      this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue);
-      if(val.dictValue === "5"){
-        let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
-        this.$set(this.zjdzdxx, 'surveyId', surveyItem.id);
+    bhyyLook(){
+      if(this.zjdzdxx.auditRemark !== null && this.zjdzdxx.auditRemark !== ''){
+        Dialog({ type: 'success', message: this.zjdzdxx.auditRemark });
+      }else{
+        Dialog({ type: 'success', message: "无"});
       }
-      updateZjdzd(this.zjdzdxx).then(response => {
-        let _this =this
-        _this.$toast({
-          icon: 'success', // 找到自己需要的图标
-          message: '保存成功',
-          duration:"1000",
-          onClose:function(){
-            _this.dcshShow = false;
-            _this.goRightBack();
-          }
-        })
-      });
+    },
+    onBeforeCloseSh(action, done){
+      if (action === 'confirm') {
+        if(this.zjddcsh.surveyStatus === '4') {
+          let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
+          this.$set(this.zjddcsh, 'surveyId', surveyItem.id);
+        }
+        this.$set(this.zjddcsh, 'id', this.zjdzdxx.id);
+          updateZjdzd(this.zjddcsh).then(response => {
+            if(response.code === 200){
+              let _this =this
+              _this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.dcshShow = false;
+                  _this.goRightBack();
+                }
+              })
+            }
+          });
+      } else {
+        return done();
+      }
+
     },
     onRefreshFsss(){
       if(this.loading){
@@ -329,18 +368,17 @@ export default {
         .then((res) => {
           this.signature.resultImg = res;
           let wj = this.dataURLtoBlob(res);
+          let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
           let param = new FormData()  // 创建form对象
           param.append('file', wj)  // 通过append向form对象添加数据
+          param.append('id', surveyItem.id)
           param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
-          zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+          zjddcSign(param, this.zjdzdxx.zjddm,surveyItem.id).then(response => {
             this.$notify({type: 'success', message: '签字成功'});
-            this.showesign = false;
             getZjdzd(this.zjdzdxx.id).then((response) => {
               localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
               location.reload();
             });
-
-
           });
 
         })
@@ -388,7 +426,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除附属物标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除附属物的数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -400,28 +438,41 @@ export default {
       }).catch(() => {});
     },
     qmqr(){
+      if(this.zjdzdxx.surveySign != null){
+        this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
+      }
       this.showesign = true;
     },
     ycbj(){
       this.ycbzShow = true;
     },
-    confirmn(){
-      this.$set(this.zjdzdxx, 'surveyStatus', "2");
-      updateZjdzd(this.zjdzdxx).then(response => {
-        localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx));
-        let _this =this
-        this.$toast({
-          icon: 'success', // 找到自己需要的图标
-          message: '保存成功',
-          duration:"1000",
-          onClose:function(){
-            _this.getList();
-            _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}});
-          }
-        })
-      });
+    // van-dialog 点击confirm事件不自动关闭
+    onBeforeClose(action, done) {
+      if (action === 'confirm') {
+        this.$refs.ycbzForm.validate().then(() => {
+          this.$set(this.zjdzdxx, 'surveyStatus', "2");
+          updateZjdzd(this.zjdzdxx).then(response => {
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx));
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '保存成功',
+              duration:"1000",
+              onClose:function(){
+                _this.getList();
+              }
+            })
+            return done(true);
+          });
+        }).catch(() => {
+          return done(false);
+        });
+      } else {
+        return done();
+      }
     },
     dcsh(){
+      this.$set(this.zjdzdxx, 'surveyStatus', "5");
       this.dcshShow = true;
     },
     showUploadList(id){
@@ -537,6 +588,14 @@ export default {
           f.push(i.content)
         }
       }
+      if(f.length === 0){
+        return this.$toast.fail("请上传照片");
+      }
+      this.$toast.loading({
+        message: "数据处理中",
+        forbidClick: true,
+        duration: 10000000000,
+      });
       let _this = this;
       let file = {
         tableId:val,

src/views/homesteadSurvey/hncyDetails.vue

@@ -1550,7 +1550,7 @@
                   message: '保存成功',
                   duration:"1000",
                   onClose:function(){
-                    _this.$router.push({path:'/homesteadSurvey/hncyList2',query: {nhdm: _this.form.nhdm}});
+                    _this.$router.push({path:'/homesteadSurvey/hncyList2',query: {nhdm: response.data}});
                   }
                 })
               });

src/views/homesteadSurvey/hncyList2.vue

@@ -65,8 +65,8 @@
                 <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/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>
+              <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @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;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
 
             </div>
           </template>
@@ -77,9 +77,18 @@
           </template>
         </van-cell>
         <template #right>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
+          <van-row>
+            <van-col>
+              <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
+            </van-col>
+            <van-col>
+              <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;height:100%;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
+            </van-col>
+            <van-col>
+              <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;height:100%;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
+            </van-col>
+          </van-row>
+
         </template>
     </van-swipe-cell>
     <van-dialog v-model="guohuData.visible"  title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">
@@ -599,21 +608,73 @@
         },
         //删除户主
         deletenh(item,index){
-          Dialog.confirm({
-            title: '警告',
-            message: '确认删除户内成员么？',
-          })
-            .then(() => {
-              // on confirm
-              delNhhncy(item.id).then(res => {
-                if(res.code=="200"){
-                  this.hncylist.splice(index,1);
-                }
+          if(item.yhzgx !== "02"){
+              Dialog.confirm({
+                title: '警告',
+                message: '确认删除此户内成员？',
               })
-            })
-            .catch(() => {
-              // on cancel
+                .then(() => {
+                  // on confirm
+                  delNhhncy(item.id).then(res => {
+                    if(res.code=="200"){
+                      this.getNh(this.shyqrData.nhdm);
+                    }
+                  })
+                })
+                .catch(() => {
+                  // on cancel
+                });
+          }else{
+            let yes = true
+            let params={
+              nhdm : item.nhdm,
+              deptId: item.deptId
+            }
+            listNhhncy(params).then((res) => {
+              if(res.rows.length>1){
+                yes = false
+                this.$toast({
+                  icon: 'error', // 找到自己需要的图标
+                  message: '无法删除，此户主存在户内成员！',
+                  duration:"1000",
+                  onClose:function(){
+                  }
+                })
+              }else{
+                listShyqr(params).then((res) => {
+                  if(res.rows.length>0){
+                    yes = false
+                    this.$toast({
+                      icon: 'error', // 找到自己需要的图标
+                      message: '无法删除，此户主已经成为使用权人！',
+                      duration:"1000",
+                      onClose:function(){
+                      }
+                    })
+                  }else{
+                    if(yes){
+                      Dialog.confirm({
+                        title: '警告',
+                        message: '确认删除此农户么？',
+                      })
+                        .then(() => {
+                          // on confirm
+                          delNhhncy(item.id).then(res => {
+                            if(res.code=="200"){
+                              this.getNh(this.shyqrData.nhdm);
+                            }
+                          })
+                        })
+                        .catch(() => {
+                          // on cancel
+                        });
+                    }
+                  }
+                });
+              }
             });
+          }
+
 
         },
         // 设为户主
@@ -5047,6 +5108,12 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .van-row{
+    height: 100%;
+  }
+  /deep/ .van-col{
+    height: 100%;
+  }
   .title:before
   {
     content:"";

src/views/homesteadSurvey/index.vue

@@ -80,18 +80,17 @@
       <van-cell  v-for="(item,index) in totalList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.rwmc}}  <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdwcsl}}/{{item.zjdsl}}</span></div>
+          <div>{{item.rwmc}} <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdwcsl}}/{{item.zjdsl}}</span></div>
         </template>
         <template #default>
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            v-model="item.zjdslz"
+            :rate="chooseNum(item)"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
-            :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
+            :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':( Math.round(((item.zjdwcsl/item.zjdsl)*100)))+'%'):0+'%'"
           />
         </template>
         <template #label>
@@ -118,14 +117,13 @@
         <template #default>
 
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            v-model="item.zjdslz"
+            :rate="chooseNum(item)"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
-            :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
+            :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':( Math.round(((item.zjdwcsl/item.zjdsl)*100)))+'%'):0+'%'"
           />
         </template>
         <template #label>
@@ -150,14 +148,13 @@
         </template>
         <template #default>
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            v-model="item.zjdslz"
+            :rate="chooseNum(item)"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
-            :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
+            :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':( Math.round(((item.zjdwcsl/item.zjdsl)*100)))+'%'):0+'%'"
           />
         </template>
         <template #label>
@@ -172,7 +169,7 @@
 </template>
 
 <script>
-  import {addTask, complete, delTask, exportTask, getTask, listTask,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
+  import {listTask,mobileList,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
   import {changeDept} from "@/api/homesteadSurvey/zjdzd";
   import {getInfo} from "../../api/login";
   import CircleProccess from "@/components/circleProccess.vue";
@@ -195,6 +192,7 @@
           loading: false,
           finished: false,
           checked:true,
+          zjdsl:100,
           height:200,
           phone:null,
           activeKey:0,
@@ -217,12 +215,6 @@
             rwfbzt:"PUBLISHED",
             rwzxr:null
           },
-          // 切换查询参数
-          switchParams: {
-            rwwczt: null,
-            rwfbzt:"PUBLISHED",
-            rwzxr:null
-          },
           nickName:"",
           text:0,
           isLoadingtask:false,
@@ -246,8 +238,8 @@
             this.$set(this.queryParams, "params", {deptId:100});
             this.getList();
           },1000)
-
         }else{
+
           this.$set(this.queryParams, "rwzxr", null);
           this.getList();
         }
@@ -292,13 +284,17 @@
             this.$router.push({name:'homesteadList'})
           });
         },
-        chooseValue(item){
-            let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
-          return a
+        chooseNum(item){
+          let a = ((item.zjdwcsl/item.zjdsl)*100);
+          if(a === "NaN"){
+            return a = 0
+          }else{
+           return a = Math.round(a);
+          }
         },
         chooseColor(item){
-          let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
-            if(a < 50){
+          let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed()
+            if(a === "NaN" || a < 50){
               return  '#FA5353'
             }else if(a < 100){
               return '#22B7F2'
@@ -308,8 +304,8 @@
           return  '#FA5353'
         },
         chooseColor2(item){
-          let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
-            if(a < 50){
+          let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed()
+          if(a === "NaN" || a < 50){
               return  'rgba(250,83,83,0.22)'
             }else if(a < 100){
               return 'rgba(34,183,242,0.22)'
@@ -329,10 +325,18 @@
               "pageNum": this.countyhc+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.totalList.length<response.total){
-                response.rows.map(res => {
-                  this.totalList.push(res)
+                response.rows.map(function(item) {
+                  if(item.zjdwcsl === 0){
+                    item.zjdslz = 0;
+                  }else{
+                    item.zjdslz = 100;
+                  }
+                  _this.totalList.push(item)
                 })
                 this.countyhc++
                 this.loading = false;
@@ -349,10 +353,19 @@
               "pageNum": this.countwhc+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.lenght>0&&this.doneList.length<response.total){
-                response.rows.map(res => {
-                  this.doneList.push(res)
+               response.rows.map(function(item){
+                  if(item.zjdwcsl === 0){
+                    item.zjdslz = 0;
+                  }else{
+                    item.zjdslz = 100;
+                  }
+                 _this.doneList.push(item)
+
                 })
                 this.countwhc++
                 this.loading = false;
@@ -369,10 +382,18 @@
               "pageNum": this.countqb+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.todoList.length<response.total){
-                response.rows.map(res => {
-                  this.todoList.push(res)
+                response.rows.map(function(item){
+                  if(item.zjdwcsl === 0){
+                    item.zjdslz = 0;
+                  }else{
+                    item.zjdslz = 100;
+                  }
+                 _this.todoList.push(item);
                 })
                 this.countqb++
                 this.loading = false;
@@ -391,7 +412,6 @@
             this.$set(this.queryParams, "rwzxr", null);
             this.getList();
           }
-          this.queryNum();
         },
         setCookies(item){
        /*   if(this.$cookies.get("upload")==null||this.$cookies.get("upload")==0){
@@ -412,7 +432,7 @@
             this.$cookies.set("item",JSON.stringify(item));
           }*/
           let userId = this.$store.state.user.userId;
-          let businessLevel = this.$store.getters.businessLevel;
+          // let businessLevel = this.$store.getters.businessLevel;
           let status = false;
           if(item.rwzxrIds != null && item.rwzxrIds !== ""){
             let ids = item.rwzxrIds.split(",");
@@ -422,7 +442,7 @@
               }
             });
           }
-          if(businessLevel === "1" && status){
+          if(status){
             localStorage.setItem("surveyItem",JSON.stringify(item));
             this.qiehuan(item.deptId);
           }else{
@@ -442,113 +462,88 @@
         xzChange(val){
           this.deptName = val.deptName;
           this.showDropList = false;
+          this.$set(this.queryParams, "deptId", null);
           if(val.deptId != 100){
             this.$set(this.queryParams, "parentId", val.deptId);
-            this.$set(this.switchParams, "parentId", val.deptId);
+            this.$set(this.queryParams, "params", {deptId:null});
           }else{
             this.$set(this.queryParams, "parentId", null);
-            this.$set(this.switchParams, "parentId", null);
+            this.$set(this.queryParams, "params", {deptId:val.deptId});
           }
           this.getList();
-          this.queryNum();
         },
         checkBadge(){
           this.finished = false;
           this.loading = false;
-          this.countqb = 1;
-          this.countyhc = 1;
-          this.countwhc = 1;
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
           this.getList();
-          this.queryNum();
-        },
-        queryNum(){
-          if(this.checked){
-            let userId = this.$store.state.user.userId;
-            this.$set(this.switchParams, "rwzxr", userId);
-            listTask(this.switchParams).then(response => {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-              response.rows.map(res => {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                }else{
-                  this.todo+=1
-                }
-                // if(res.rwzxr!=null&&res.rwzxr!=''){
-                //   res.rwzxr = res.rwzxr.split(',')
-              })
-
-            });
-          }else{
-            this.$set(this.switchParams, "rwzxr", null);
-            if(this.switchParams.parentId == null){
-              this.$set(this.switchParams, "params", {deptId:100});
-            }
-            listTask(this.switchParams).then(response => {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-              console.info(this.total)
-              response.rows.map(res => {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                }else{
-                  this.todo+=1
-                }
-              })
-            });
-          }
         },
         getList() {
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
+          this.countqb = 1;
+          this.countyhc = 1;
+          this.countwhc = 1;
+          this.finished = false;
+          this.loading = false;
           if(this.active==1) {
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "rwwczt", null);
             this.$set(this.queryParams, "pageNum",  this.countyhc);
             this.$set(this.queryParams, "pageSize",  4);
+            mobileList(this.queryParams).then(response => {
+              this.done = response.wcs;
+              this.todo = response.dcs;
+              this.total = response.tableDataInfo.total;
+               this.totalList = response.tableDataInfo.rows.map(function(item){
+                 if(item.zjdwcsl === 0){
+                   item.zjdslz = 0;
+                 }else{
+                   item.zjdslz = 100;
+                 }
+                return item;
+              });
+
+            });
           }else if(this.active==2) {
             this.$set(this.queryParams, "rwwczt", "FINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "pageNum",  this.countwhc);
+            mobileList(this.queryParams).then(response => {
+              this.total = response.wcs;
+              this.todo = response.dcs;
+              this.done = response.tableDataInfo.total;
+              this.doneList = response.tableDataInfo.rows.map(function(item){
+                if(item.zjdwcsl === 0){
+                  item.zjdslz = 0;
+                }else{
+                  item.zjdslz = 100;
+                }
+                return item;
+              })
+            });
           }else{
             this.$set(this.queryParams, "rwwczt", "UNFINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "pageNum",  this.countqb);
-          }
-          listTask(this.queryParams).then(response => {
-            if(this.active==1) {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-            }
-            response.rows.map(res => {
-              console.info(this.active);
-              if(this.active==1) {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                  this.doneList.push(res);
+            mobileList(this.queryParams).then(response => {
+              this.total = response.wcs;
+              this.done = response.dcs;
+              this.todo = response.tableDataInfo.total;
+              this.todoList = response.tableDataInfo.rows.map(function(item){
+                if(item.zjdwcsl === 0){
+                  item.zjdslz = 0;
                 }else{
-                  this.todo+=1
-                  this.todoList.push(res);
+                  item.zjdslz = 100;
                 }
-                // if(res.rwzxr!=null&&res.rwzxr!=''){
-                //   res.rwzxr = res.rwzxr.split(',')
-                // }
-                this.totalList = response.rows;
-              }else if(this.active==2) {
-                this.doneList.push(res);
-              }else{
-                this.todoList.push(res);
-              }
-            })
+                return item;
+              })
+            });
+          }
 
-          });
         },
         gotoLink(){
           this.$router.push('/homesteadSurvey/settle')

src/views/homesteadSurvey/list.vue

@@ -78,32 +78,37 @@
           :immediate-check="false"
           @load="onRefreshzjd"
         >
-          <van-cell  v-for="(item,index) in list1" :key="index" size="small" :clickable="true"  style="border-radius: 16px;
-          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;" >
-                  <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-                  <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
-                </p>
-                <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
-<!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
-<!--                <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' && item.surveyStatus != '3'" 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="margin-right: 3%;color:#22B7F2;font-size:12px;" ><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</p>
-                <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>
+            <van-swipe-cell v-for="(item,index) in list1" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:5px auto 0;background:#fff;">
+              <div style="padding:10px;">
+                <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.shyqrdbxm)}}</span>
+                  </p>
+                  <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
+  <!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
+  <!--                <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' && item.surveyStatus != '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
+                </div>
+              <!--<template #default>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
+              </template>-->
+                <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
+                <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
               </div>
+            <template #right>
+              <van-row>
+                <van-col>
+                  <van-button square  type="info" class="delete-button" @click="showUploadList(item.id)"><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#FFFFFF" @click="showUploadList(item.id)"/> 附件</van-button>
+                </van-col>
+                <van-col>
+                  <van-button square v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" type="danger" class="delete-button" @click="deleteZjd(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt=""> 删除</van-button>
+                </van-col>
+              </van-row>
             </template>
-            <!--<template #default>
-              <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
-              <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
-            </template>-->
-            <template #label>
-              <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
-              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
-            </template>
-          </van-cell>
+            </van-swipe-cell>
         </van-list>
         <!--</van-pull-refresh>-->
       </van-tab>
@@ -112,7 +117,7 @@
 </template>
 
 <script>
-    import {rhhcList,getQueryLand,getZjdzd,delZjdzd,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {rhhcList,getQueryLand,listZjdzd,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";
@@ -321,18 +326,6 @@
       mounted(){
       },
       created(){
-
-        axios.get('../static/dictyType.json').then(res => {
-          this.dictTypeList = res.data
-          this.zjlxOptions = this.dictTypeList.zjlx;
-          this.suyqxzOptions = this.dictTypeList.qsxz;
-          this.sjlyOptions = this.dictTypeList.sjly;
-          this.hyzkOptions = this.dictTypeList.hyzk;
-          this.occupationOptions = this.dictTypeList.occupation;
-          this.jzqkOptions = this.dictTypeList.living_condition;
-          this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
-          this.cybzOptions = this.dictTypeList.member_remark;
-        })
         this.getDicts("survey_status").then(response => {
           var arr = [];
           response.data.forEach(function (item) {
@@ -346,7 +339,6 @@
           this.surveyStatusOptions = arr;
         });
         this.getList();
-        this.getSyqr();
           // this.getDicts("family_status").then(response => {
           //   var arr = [];
           //   response.data.forEach(function (item) {
@@ -406,23 +398,8 @@
       },
       methods: {
         getList(){
-          let params = {
-            "surveyStatus":"1",
-            "pageNum": 1,
-            "pageSize":10,
-          }
-          rhhcList(params).then(res => {
+          rhhcList({}).then(res => {
             this.list1 =  res.data.zjdzdxxList;
-            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
-              this.loading2 = false
-              this.finished2 = false;
-            }else{
-              this.loading2 = false
-              this.finished2 = true
-            }
-
-          });
-          rhhcList({surveyStatus:"1,2,3,4,5"}).then(res => {
             this.whcNums = res.data.wdcs;
             this.hcycNums = res.data.dcycs;
             this.hcwcNums = res.data.dcwcs;
@@ -430,6 +407,14 @@
             this.spbhNums = res.data.dcbhs;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
+            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
+              this.loading2 = false
+              this.finished2 = false;
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
+            console.info(this.list1);
           });
         },
         showUploadList(id){
@@ -444,7 +429,14 @@
              f.push(i.content)
            }
           }
-          console.info(this.uploadImgList);
+          if(f.length === 0){
+            return this.$toast.fail("请上传照片");
+          }
+          this.$toast.loading({
+            message: "数据处理中",
+            forbidClick: true,
+            duration: 10000000000,
+          });
           let _this = this;
           let file = {
             tableId:val,
@@ -790,9 +782,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-             rhhcList(params).then((response) => {
-                if(response.data.zjdzdxxList.length>0&&this.list2.length<response.data.zjdzs){
-                  response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list1.length<response.total){
+                  response.rows.map(res => {
                     _this.list1.push(res)
                   })
                   this.countyhc++
@@ -809,9 +801,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-                if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                  response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list1.length<response.total){
+                  response.rows.map(res => {
                     _this.list1.push(res)
                   })
                   this.countyhc++
@@ -827,9 +819,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -845,9 +837,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -863,9 +855,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -880,7 +872,7 @@
           let params = {
             "deptId" : this.item.deptId,
             "pageNum": 1,
-            "pageSize":10,
+            "pageSize":6,
           }
           listNh(params).then((response) => {
             if(response.rows.length>=0){
@@ -899,7 +891,7 @@
           let params = {
             "deptId" : this.item.deptId,
             "pageNum": this.countnh+1,
-            "pageSize":10,
+            "pageSize":6,
           }
           listNh(params).then((response) => {
             if(response.rows.length>0&&this.nhlist.length<response.total){
@@ -941,10 +933,19 @@
         // 入户核查搜索框新增。
         onClickzjd(){
           this.$cookies.remove("search");
-          localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:this.qlrform.suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
-                                                              ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
-                                                              ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
-          this.$router.push({name:'homesteadAdd'});
+          let params = {
+            "deptId" : this.$store.state.user.loginDeptId
+          }
+          listSuyqr(params).then((response) => {
+            if(response.rows.length>0){
+              localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:response.rows[0].suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
+                ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
+                ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"072"}));
+              this.$router.push({name:'homesteadAdd'});
+            }
+          });
+
+
         },
         // 农户信息搜索框新增。
         onClicknh(){
@@ -1265,13 +1266,6 @@
         },
         // 宅基地搜索框
         onSearchzjd(){
-          rhhcList({"shyqrdbxm" : this.zjdvalue,surveyStatus:"1,2,3,4,5"}).then(res => {
-            this.whcNums = res.data.wdcs;
-            this.hcycNums = res.data.dcycs;
-            this.hcwcNums = res.data.dcwcs;
-            this.sptgNums = res.data.dctgs;
-            this.spbhNums = res.data.dcbhs;
-          });
           if(this.active==0){
             let params = {
               "shyqrdbxm" : this.zjdvalue,
@@ -1279,12 +1273,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.whcNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1300,12 +1293,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.hcycNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1321,12 +1313,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.hcwcNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1342,12 +1333,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.spbhNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1363,11 +1353,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.sptgNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1570,12 +1560,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.whcNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.whcNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1590,17 +1580,18 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.hcycNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.hcycNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
                  this.finished2 = true
                }
+               console.info(this.list1);
              }
            });
          }else if(this.active === 2){
@@ -1610,12 +1601,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.hcwcNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.hcwcNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1630,12 +1621,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.spbhNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.spbhNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1650,12 +1641,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.sptgNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.sptgNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -5302,6 +5293,15 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .delete-button {
+    height: 100%;
+  }
+  /deep/ .van-row{
+    height: 100%;
+  }
+  /deep/ .van-col{
+    height: 100%;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list2.vue

@@ -68,23 +68,24 @@
       :immediate-check="false"
       @load="onRefreshShyqr"
     >
-    <van-cell  v-for="(item,index) in nhlist" :key="index" size="small" :clickable="true" style="border-radius: 16px;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;">
-            <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:#22B7F2;font-size:12px;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.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>
+      <van-swipe-cell v-for="(item,index) in nhlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:5px auto 0;background:#fff;">
+        <div style="padding:10px;">
+          <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;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
+            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-right: 10px;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.png" alt="" style="margin-right: 3px;">户主</p>
+          </div>
+
+          <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
+          <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>
         </div>
-      </template>
-      <template #label>
-        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
-        <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>
+        <template #right>
+          <van-button square  type="danger" class="delete-button" @click="deletenh(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt=""> 删除</van-button>
+        </template>
+      </van-swipe-cell>
     </van-list>
     <van-dialog v-model="outsideOpen" title="外村农户"  show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" @cancel="outsideCancel" >
     <wcnhList  style="height: 600px;overflow: auto;"  ref="wcnh"/>
@@ -594,7 +595,7 @@
           }
           listNhhncy(params).then((res) => {
             console.log(res.rows.length)
-            if(res.rows.length>0){
+            if(res.rows.length>1){
               yes = false
               this.$toast({
                 icon: 'error', // 找到自己需要的图标
@@ -618,15 +619,13 @@
                   if(yes){
                     Dialog.confirm({
                       title: '警告',
-                      message: '确认删除此使用权人么？',
+                      message: '确认删除此农户么？',
                     })
                       .then(() => {
                         // on confirm
                         delNh(item.id).then(res => {
                           if(res.code=="200"){
-                            this.nhlist.splice(index,1);
-                            this.totalH--
-                            this.totalR--
+                            this.getNh();
                           }
                         })
                       })
@@ -5012,6 +5011,9 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .delete-button {
+    height: 100%;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list4.vue

@@ -5995,7 +5995,7 @@
               this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1");
               this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1");
               this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203");
-              this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01");
+              this.$set(this.mapZjdTeAll.mapZjdAData, "yt","072");
               this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1");
 
               //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;

src/views/homesteadSurvey/nhAdd.vue

@@ -304,6 +304,7 @@ export default {
     let data = this.$route.query;
     this.permission = localStorage.getItem("executePermission");
     this.form = data;
+    console.info(this.form);
     if(this.form.nhdm == null){
       this.$set(this.form, 'zjlx', "01");
       this.$set(this.form, 'xb', "1");

src/views/homesteadSurvey/nhcyList.vue

@@ -52,14 +52,13 @@
     </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>
-          <span style="line-height: 1;font-size: 16px;margin-left: 70%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
-        </p>
+        <div style="display: flex;align-items: center;">
+          <p style="flex:1;line-height: 1;font-size: 16px;"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">{{item.xm}}</p>
+          <p style="flex:1;line-height: 1;font-size: 16px; text-align:right;">{{formatDict(yhzgxList,item.yhzgx)}}</p>
+        </div>
         <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>
+          <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>
@@ -85,7 +84,7 @@
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"/>
+        <van-button v-if="permission == 'true' && item.yhzgx != '02'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
       </template>
     </van-swipe-cell>
     <van-dialog v-model="guohuData.visible" title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">

src/views/homesteadSurvey/nmfwAdd.vue

@@ -304,8 +304,6 @@
           name="登记时间"
           label="登记时间"
           placeholder="登记时间"
-          required
-          :rules="[{ required: true, message: '' }]"
           readonly
           @click="showDjsj = true"
         />
@@ -643,7 +641,7 @@ export default {
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
-      minDate: new Date(1990, 1, 1),
+      minDate: new Date(1950, 1, 1),
       maxDate: new Date(2030, 10, 1),
       showZgqrzrq:false,
       form:{}
@@ -705,7 +703,7 @@ export default {
   },
   methods: {
     getList(){
-       getShyqrs({zjddm:this.form.zjddm}).then(response => {
+       getShyqrs({zjddm:this.zjdzdxxItem.zjddm}).then(response => {
         this.nhdmDictionaries = response.rows.map(function(item){
           item.shyqrdbxm = item.shyqrdbxm + item.nhdm;
           return {

src/views/homesteadSurvey/nmfwList.vue

@@ -64,19 +64,22 @@
           <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:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;"  @click="showUploadList(item.id)">
-            <van-icon  name="photo-o" size=".4rem" color="#FFFFFF"/>
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">附件</span>
-          </p>
+        <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 #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>
+            <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="deletenmfw(item)"/>
+        <van-row>
+          <van-col>
+            <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+          </van-col>
+          <van-col>
+            <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletenmfw(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+          </van-col>
+        </van-row>
       </template>
     </van-swipe-cell>
     <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
@@ -275,7 +278,14 @@ export default {
           f.push(i.content)
         }
       }
-      console.info(this.uploadImgList);
+      if(f.length === 0){
+        return this.$toast.fail("请上传照片");
+      }
+      this.$toast.loading({
+        message: "数据处理中",
+        forbidClick: true,
+        duration: 10000000000,
+      });
       let _this = this;
       let file = {
         tableId:val,
@@ -299,7 +309,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除农民房屋标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除农民房屋数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -338,6 +348,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

src/views/homesteadSurvey/shyqrAdd.vue

@@ -63,7 +63,7 @@
           label="农户代码"
           placeholder="请选择"
           v-model="form.nhdm"
-          @click="shownhdm = true"
+          @click="checkNhdmQx"
           input-align="right"
           right-icon="arrow-down"
         />
@@ -204,7 +204,7 @@
           label="户口类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="选择性别"
+          placeholder="选择户口类型"
           remote-url="/open/zdzh/list/account_type"
           :on-remote-response="'data'"
         />
@@ -315,8 +315,8 @@ 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";
-import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
-import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+import {listNhhncy,getHomesteadnhhnhzByNhdm,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+import {queryList, 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";
@@ -392,26 +392,25 @@ export default {
   },
   methods: {
     getList(){
-      listNhhncy({yhzgx:"02"}).then(response => {
+      queryList({yhzgx:"02",searchValue:"NHDM,HZXM"}).then(response => {
         this.nhdmDictionaries = response.rows.map(function(item){
-          item.nhValue = item.xm + item.nhdm;
+          item.nhValue = item.hzxm + item.nhdm;
           return {
             nhValue:item.nhValue,
-            hzxm:item.xm,
-            sqrxb:item.xb,
-            hzzjhm:item.zjhm,
-            nhdm:item.nhdm,
-            hzzjlx:item.zjlx,
-            lxdh:item.lxdh,
-            hklx:item.hklx,
-            sfbjtjjzzcy:item.sfbjtjjzzcy,
-            deptId:item.deptId,
-            deptName:item.deptName,
+            hzxm:item.hzxm,
+            nhdm:item.nhdm
           };
         });
         this.newList = this.nhdmDictionaries;
       });
     },
+    checkNhdmQx(){
+      if(this.form.id != null){
+        this.shownhdm = false;
+      }else{
+        this.shownhdm = true;
+      }
+    },
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {
@@ -424,9 +423,6 @@ export default {
                 hzzjhm:item.zjhm,
                 nhdm:item.nhdm,
                 hzzjlx:item.zjlx,
-                lxdh:item.lxdh,
-                hklx:item.hklx,
-                sfbjtjjzzcy:item.sfbjtjjzzcy,
                 deptId:item.deptId,
                 deptName:item.deptName,
               }
@@ -456,18 +452,33 @@ export default {
       }
     },
     shyqrdmxmChange(val){
+      getHomesteadnhhnhzByNhdm(val.nhdm).then((resp) => {
+        if(resp.data)
+        {
+          let data = resp.data;
+          this.$set(this.form, "shyqrdbzjhm", data.zjhm);
+          this.$set(this.form, "shyqrdbxm", data.xm);
+          this.$set(this.form, "shyqrdbzjlx",data.zjlx);
+          this.$set(this.form, "xb", data.xb);
+          this.$set(this.form, "dh", data.lxdh);
+          this.$set(this.form, "sfbncjtjjzzcy",data.sfbjtjjzzcy);
+          this.$set(this.form, "hklx", data.hklx);
+          this.$set(this.form, "dz", data.txdz);
+        }
+      });
       this.$set(this.form, "nhdm", val.nhdm);
-      this.$set(this.form, "shyqrdbzjhm", val.hzzjhm);
-      this.$set(this.form, "shyqrdbxm", val.hzxm);
-      this.$set(this.form, "dh", val.lxdh);
-      this.$set(this.form, "xb", val.sqrxb);
-      this.$set(this.form, "hklx", val.hklx);
-      this.$set(this.form, "sfbncjtjjzzcy", val.sfbjtjjzzcy);
       listNmfw({zjddm:this.zjdzdxx.zjddm}).then(response => {
         this.nmfwDictionaries = response.rows;
       });
       this.shownhdm = false;
     },
+    parseIDCard(idcard) {
+      if(!idcard)
+        return false;
+      console.info(idcard)
+      let sex = (parseInt(idcard.substr(16, 1)) % 2) ^ 1;
+      return sex;
+    },
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){

src/views/homesteadSurvey/zrzAdd.vue

@@ -97,6 +97,8 @@
           <van-datetime-picker
             type="date"
             :value="new Date"
+            :min-date="minDate"
+            :max-date="maxDate"
             @confirm="onConfirmZgqrzrq"
             @cancel="showZgqrzrq = false"
           />
@@ -233,7 +235,7 @@ export default {
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
-      minDate: new Date(),
+      minDate: new Date(1950,1,1),
       maxDate: new Date(2025, 10, 1),
       showZgqrzrq:false,
       form:{}

src/views/project/projectDetail.vue

@@ -75,7 +75,7 @@
             <van-col span="24"><span>延时周期：</span>{{detail.delayPeriod}}秒</van-col>
           </van-row>
           <van-row v-if="detail.delayPeriod!=0">
-            <van-col span="24"><span>延时周期说明：</span>竞价的最后{{detail.delayPeriod}}秒内，任意方出价，距结束时间将延长{{detail.delayPeriod}}秒，直至无人出价为止</van-col>
+            <van-col span="24"><span>延时说明：</span>竞价的最后{{detail.delayPeriod}}秒内任意方出价，竞价结束时间将延长至此刻的{{detail.delayPeriod}}秒后，直至无人出价为止。</van-col>
           </van-row>
         </div>
       </van-tab>

src/views/sunVillage_info/arbitration/arbitrationDetail.vue

@@ -16,7 +16,6 @@
       <div class="header_main">
         纠纷调解
         <div class="return_btn" @click="onClickLeft"></div>
-        <div class="add_btn" @click="openMenu"></div>
       </div>
 
       <div class="main" style="padding-bottom: 1rem;">
@@ -30,7 +29,7 @@
                   <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}}
+                      {{item.shyqrdbxm}}
                     </van-cell>
                   </div>
                   <van-field
@@ -211,11 +210,10 @@ export default {
       landStatus:"1",
       menuVisible: false,
       mapShow:false,
-      sysFarmer:JSON.parse(Cookies.get('user')),
+      sysFarmer:{},
       showDropList:false,
       menuActions: [
-        {name: '调解/冲裁员', route: {name:'arbitrationHandlerList', query: {}}},
-        {name: '处理过程', route: {name:'arbitrationProcessList', query: {}}},
+        {name: '处理过程', route: {name:'arbitrationProcessDetail', query: {}}},
       ]
     };
   },
@@ -223,14 +221,20 @@ export default {
     this.id = this.$route.query.id;
     this.type = this.$route.query.type;
     this.getFormIntent();
-    getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
-      if (response.code == 200) {
-        this.shyqrdmxmChange(response.rows[0]);
-        this.closeMoule(response.rows[0].zjddm);
-      }
-    });
-    this.getDetail();
-    this.getUserHouseApplyProposer();
+    if(Cookies.get('user')){
+      this.sysFarmer =  JSON.parse(Cookies.get('user'));
+      getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
+        if (response.code == 200) {
+          if(response.rows.length > 0){
+            this.shyqrdmxmChange(response.rows[0]);
+            this.closeMoule(response.rows[0].zjddm);
+          }
+        }
+      });
+      this.getDetail();
+      this.getUserHouseApplyProposer();
+    }
+
   },
   computed: {
     allowCUD: function () {
@@ -409,21 +413,7 @@ export default {
       if (query !== "") {
         getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-              return {
-                sqrxm:item.shyqrdbxm,
-                sqrxb:item.xb,
-                sqrzjhm:item.shyqrdbzjhm,
-                shyqrdm:item.shyqrdm,
-                sqrzjlx:item.shyqrdbzjlx,
-                zjddm:item.zjddm,
-                sqrdh:item.dh,
-                gyfs:item.gyfs,
-                dz:item.dz,
-                deptId:item.deptId,
-                deptName:item.deptName,
-              }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -451,7 +441,7 @@ export default {
     shyqrdmxmChange(val){
       this.$set(this.arbitrationData, "shyqrdbxm", val.shyqrdbxm);
       this.$set(this.arbitrationData, "deptId", val.deptId);
-      this.$set(this.arbitrationData, "deptName", val.deptId);
+      this.$set(this.arbitrationData, "deptName", val.deptName);
       this.$set(this.arbitrationData, "shyqrzjhm", val.shyqrdbzjhm);
       this.$set(this.arbitrationData, "shyqrzjlx", val.shyqrdbzjlx);
       this.$set(this.arbitrationData, "shyqrdm", val.shyqrdm);
@@ -483,7 +473,6 @@ export default {
           this.notify("请标注宅基地位置!", 'danger');
           return;
         }*/
-        console.log("进行保存", this.arbitrationData);
         (this.arbitrationData.id ? editArbitration : addArbitration)(this.arbitrationData).then((response) => {
             this.notify("保存成功", 'success');
             this.goBack();
@@ -531,6 +520,7 @@ export default {
     },
     onActionSelect(a, index) {
       a.route.query.arbitrationId = this.arbitrationData.id;
+      console.info(a);
       this.$router.push(a.route);
     },
   },

src/views/sunVillage_info/assetMapOpen.vue

@@ -303,8 +303,6 @@
   }
   .land_information_main {
     flex: 1;
-    display: flex;
-
   // align-items: center;
   .area_information {
   // margin-bottom: 3%;
@@ -482,6 +480,7 @@
     openAttachmentList
   } from "@/api/sunVillage_info/fixedAssets";
   import {getQueryLand} from "@/api/sunVillage_info/homestead/application";
+  import { getConfigKey } from "@/api/system/config";
   export default {
     components: {
       getPermanentList,
@@ -504,10 +503,17 @@
         mapHaDataValue:false,
         mapHasDateStatus: 0, //0资源资产  1固定资产
         dialogVisible:false,
-        dialogImageUrl:''
+        dialogImageUrl:'',
+        mapGeoServerUrl: "",            // geoserver地址
+        villageBorderLayerName: "",     // 乡镇边界图层名称
       };
     },
-
+    created() {
+      // 获取geoserver的地址
+      this.getGeoServerUrl();
+      // 获取村边界的图层名称
+      this.getVillageBorderLayerName();
+    },
     mounted() {
       let mapTheGeomAll =this.$cookies.get("bookId");
       console.info(mapTheGeomAll);
@@ -526,6 +532,18 @@
       });
     },
     methods: {
+      // 获取geoserver的地址
+      getGeoServerUrl() {
+        getConfigKey("system.geoServer.url").then(response => {
+          this.mapGeoServerUrl = response.msg;
+        });
+      },
+      // 获取村边界的图层名称
+      getVillageBorderLayerName() {
+        getConfigKey("geoserver.layer.villageBorder").then(response => {
+          this.villageBorderLayerName = response.msg;
+        });
+      },
       openImage(url){
         this.dialogImageUrl = url;
         this.dialogVisible = true;
@@ -613,6 +631,21 @@
             maxZoom: 18.3, //地图放大限制
           }),
         });
+
+        // 添加村边界
+        let mapBorder = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.villageBorderLayerName,
+              cql_filter: "dept_id = '" + this.$cookies.get("deptId") + "'",
+              SRID: 3857,
+            },
+          }),
+          name: 'villageBorderLayer'
+        });
+        map.addLayer(mapBorder);
+
         //判断当前账套是否有数据
         var mapTalkAbout = true;
         //图层查询资源性资产定位开始 ---------start

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

@@ -16,6 +16,7 @@
       <van-field readonly label="收款账户" v-model="form.payeeAccount" input-align="right" label-width="auto"/>
       <van-field readonly label="所属银行" v-model="bankType" input-align="right" label-width="auto" />
       <van-field readonly label="开户银行" v-model="form.bankDeposit" input-align="right" label-width="auto"/>
+      <van-field readonly label="联行号" v-model="form.payeePaymentLines" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">

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

@@ -146,7 +146,6 @@
       getDictionaries(){
         getPayee(this.$route.query.id).then((response) => {
           let _this = this
-          this.form = response.data;
           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});
@@ -166,14 +165,14 @@
           listDeposit(queryParams).then(rr => {
             this.bankDepositOptions = []
             for(var i = 0 ; i < rr.rows.length ; i++){
-              if(_this.form.bankDeposit==rr.rows[i].id){
+              if(_this.form.payeePaymentLines==rr.rows[i].payeePaymentLines){
                 _this.bankDeposit = rr.rows[i].bankDeposit
               }
                 _this.bankDepositOptions.push({"text":rr.rows[i].bankDeposit,"value":rr.rows[i].id,
                 "payeePaymentLines":rr.rows[i].payeePaymentLines,"institutionNumber":rr.rows[i].institutionNumber});
             }
           });
-
+          _this.form = response.data;
         });
 
       },
@@ -201,7 +200,7 @@
       },
       onConfirmBankDeposit(data){
         this.bankDeposit = data.text
-        this.form.bankDeposit = data.value
+        this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;

src/views/sunVillage_info/fixedAssets.vue

@@ -45,7 +45,7 @@
                <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
                <router-link :to="{name:'sunVillageInfoFixedAssetsEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
                <div @click="openLoader(item.id,0)" style="background-color: rgba(98,173,102,0.2);color: #62AD66;">附件</div>
-               <div @click="openMap(item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
+               <div @click="openMap(item.id, item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
              </template>
            </van-swipe-cell>
 
@@ -61,9 +61,10 @@
 
        <van-popup v-model="showMap" lock-scroll position="top" :style="{ height: '80%' }" >
           <div style="padding: 0;text-align: center">
-            <MapGisTag ref="clickLoading" :showBtn="true" :message="theGeom" v-on:formSubmit="MapTag"></MapGisTag>
+            <MapGisTag ref="clickLoading" :showBtn="true" :message="theGeom" v-on:formSubmit="MapTag" :permanentId="permanentId" :permanents="permanents"></MapGisTag>
             <div style="margin-top: 1.5vh">
               <van-button type="info" size="small" @click="saveGeom">保存</van-button>
+              <van-button type="danger" size="small" @click="clearLayer">清除图层</van-button>
               <van-button plain type="info" size="small" @click="showMap = false">取消</van-button>
             </div>
           </div>
@@ -78,7 +79,9 @@
      attachmentList,
      systemAttachment,
      delPermanent,
-     updatePermanent
+     updatePermanent,
+     getPermanent,
+     clearPermanentGeom,
    } from "@/api/sunVillage_info/fixedAssets";
    import request from '@/utils/request'
    import MapGisTag from "@/components/Map/MapGisTagDTGCopy";
@@ -90,7 +93,6 @@
      data() {
        return {
          applicationList:[],
-         applicationListSecond:[],
          assetStatusOptions:[],
          auditStatus:[],
          loading: false,
@@ -112,7 +114,9 @@
          showBtn:true,
          showMap:false,
          theGeom:'',
-         listMap:0
+         listMap:0,
+         permanentId: null,   // 固定资产ID
+         permanents: [],      // 固定资产列表，存储本账套下所有的固定资产信息
        };
      },
      created() {
@@ -127,16 +131,20 @@
        });
      },
      methods: {
-       openMap(theGeom,index){
-         this.showMap = true;
-         this.theGeom = theGeom;
-         this.listMap = index;
-         this.mapClickLoading();
+       openMap(id, theGeom,index){
+         permanentList().then(response => {
+           this.showMap = true;
+           this.permanentId = id;
+           this.theGeom = theGeom;
+           this.listMap = index;
+           this.permanents = response.rows;
+           this.mapClickLoading();
+         });
        },
        //获取自己返回值
        /** 查找地图中定位点 */
        MapTag: function (data) {
-         this.applicationList[this.listMap].theGeom = data;
+         // this.applicationList[this.listMap].theGeom = data;
          this.theGeom = data;
        },
        //每个查看修改，新增  方法下引用下面方法
@@ -146,21 +154,35 @@
          }, 500);
        },
        saveGeom(){
-         console.log(this.theGeom)
          var that = this;
-         this.applicationList[this.listMap].theGeom = this.theGeom;
-         updatePermanent(this.applicationList[this.listMap]).then((response) => {
+         updatePermanent({id: this.permanentId, theGeom: this.theGeom}).then((response) => {
            if (response.code == 200){
              this.$notify({ type: 'success', message: '修改成功' });
              setTimeout(function(){
                that.showMap = false;
-               that.queryParams.pageNum += 1 ;
-               that.applicationList = [];
-               that.getList();
+               getPermanent(that.permanentId).then(response => {
+                 that.applicationList[that.listMap].theGeom = response.data.theGeom;
+               });
              },500)
            }
          });
        },
+       clearLayer() {
+         this.$dialog.confirm({
+           message: '是否清除图层？',
+         }).then(() => {
+           // on confirm
+           clearPermanentGeom(this.permanentId).then(res => {
+             if (res.code === 200) {
+               this.$notify({ type: 'success', message: '清除成功' });
+               this.showMap = false;
+               this.applicationList[this.listMap].theGeom = null;
+             }
+           });
+         }).catch(() => {
+           // on cancel
+         });
+       },
        getList(){
          setTimeout(() => {
            permanentList(this.queryParams).then(response => {
@@ -171,7 +193,6 @@
                response.rows[i].useType = this.selectDictLabel(this.useTypeOptions, response.rows[i].useType);
                // response.rows[i].originalValue = Number(response.rows[i].originalValue ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "")
                this.applicationList.push(response.rows[i]);
-               this.applicationListSecond.push(response.rows[i]);
              }
              if(this.applicationList.length >= response.total){
                this.finished = true;
@@ -255,6 +276,7 @@
        getSearchList(){
          this.applicationList = [];
          this.queryParams.pageNum = 1;
+         this.finished = false;
          this.getList();
        },
        deleteFile1(file){

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -2102,7 +2102,11 @@ export default {
    if(this.type === "todo" || this.type === "done"){
      this.$set(this.sysFarmer, 'memberName',  this.$store.getters.nickName);
    }else{
-     this.sysFarmer = JSON.parse(Cookies.get('user'));
+     if(Cookies.get('user')){
+       this.sysFarmer = JSON.parse(Cookies.get('user'));
+     }else{
+       this.$router.push('/sunVillage_info/login_code')
+     }
    }
     this.getFormIntent();
     this.getDetail();

src/views/sunVillage_info/list_chronicles.vue

@@ -51,10 +51,8 @@
  <script>
    import { getList} from "@/api/sunVillage_info/sysCbf";
    import request from '@/utils/request'
-   import MapGisLine from "@/components/Map/MapGisLine";
    export default {
      name: "certificateList",
-     components: { MapGisLine,},
      data() {
        return {
          loading: false,

src/views/sunVillage_info/list_contractor.vue

@@ -52,10 +52,8 @@
  <script>
    import { getList} from "@/api/sunVillage_info/sysCbf";
    import request from '@/utils/request'
-   import MapGisLine from "@/components/Map/MapGisLine";
    export default {
      name: "certificateList",
-     components: { MapGisLine,},
      data() {
        return {
          loading: false,

src/views/sunVillage_info/paidExit/paidExitAdd.vue

@@ -24,7 +24,7 @@
         <van-field v-model="circulation.sqrxm" 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}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
 <!--        <van-field-->
@@ -283,7 +283,7 @@
 
 <script>
 import {  getShyqrs,dyAdd,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
 import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -311,7 +311,7 @@ export default {
       bcfsDictionaries:[],//补偿方式
       zjdDictionaries:[],//宅基地代码
       getObligeeOptions:[],//下拉框列表
-      sysFarmer:JSON.parse(Cookies.get('user')),
+      sysFarmer:{},
       tcqllx:'整体退出',
       tclx:'有偿退出',
       tcfs:'使用权',
@@ -365,13 +365,20 @@ export default {
     };
   },
   created() {
+    if(Cookies.get('user')){
+      this.sysFarmer =  JSON.parse(Cookies.get('user'));
+      getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
+        if (response.code == 200) {
+          if(response.rows.length > 0){
+            this.shyqrdmxmChange(response.rows[0]);
+            this.closeMoule(response.rows[0].zjddm);
+          }
+        }
+      });
+    }else{
+      this.$router.push('/sunVillage_info/login_code');
+    }
     this.getDictionaries();
-    getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
-      if (response.code == 200) {
-        this.shyqrdmxmChange(response.rows[0]);
-        this.closeMoule(response.rows[0].zjddm);
-      }
-    });
   },
   methods: {
     getDictionaries(){
@@ -548,22 +555,10 @@ export default {
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {
+        let _this = this;
         getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-            return {
-                      sqrxm:item.shyqrdbxm,
-                      sqrxb:item.xb,
-                      sqrzjhm:item.shyqrdbzjhm,
-                      sqrnhdm:item.nhdm,
-                      sqrzjlx:item.shyqrdbzjlx,
-                      sqrdh:item.dh,
-                      gyfs:item.gyfs,
-                      dz:item.dz,
-                      deptId:item.deptId,
-                      deptName:item.deptName,
-                    }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -597,19 +592,20 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
-      this.$set(this.circulation, "deptId", val.deptId);
-      this.$set(this.circulation, "deptName", val.deptName);
-      this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.nhdm);
-      this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.xb);
-      this.$set(this.circulation, "lxdh", val.dh);
-      this.$set(this.circulation, "hkszd", val.dz);
-      this.$set(this.circulation, "zjddm", val.zjddm);
-      this.getObligeeOptions=[];
-      this.showDropList = false;
+      if(!val.shyqrdbxm.includes("村集体")){
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
+        this.$set(this.circulation, "gyqk", val.gyfs);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
+        this.$set(this.circulation, "hkszd", val.dz);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
+      }
     },
     mapLook(){
       this.mapShow = true;

src/views/sunVillage_info/paidExit/paidExitModify.vue

@@ -275,7 +275,7 @@
 
 <script>
   import {  getZyyctc,getShyqrs,zyyctcEdit,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
   import FieldSelect from "@/components/form/FieldSelect";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
   import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -303,7 +303,7 @@
         bcfsDictionaries:[],//补偿方式
         zjdDictionaries:[],//宅基地代码
         getObligeeOptions:[],//下拉框列表
-        sysFarmer:JSON.parse(Cookies.get('user')),
+        sysFarmer:{},
         tcqllx:'',
         tclx:'',
         tcfs:'',
@@ -330,7 +330,7 @@
         houseApplyUploadComp: {
           businessType: PROPOSER_MODULE,
           proposerId: this.$route.query.id,
-          homeApplyStatus: "11",
+          homeApplyStatus: "0",
           processKey: PROPOSER_STAGE_BASE_APPLY_ACTIVITY,
           tableName: PROPOSER_STAGE_BASE_APPLY_TABLE,
           attachmentList: [],
@@ -340,7 +340,12 @@
       };
     },
     created() {
-      this.getDictionaries();
+      if(Cookies.get('user')){
+        this.getDictionaries();
+      }else{
+        this.$router.push('/sunVillage_info/login_code')
+      }
+
     },
     methods: {
       getDictionaries(){

src/views/sunVillage_info/resource.vue

@@ -37,7 +37,7 @@
                <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
                <router-link :to="{name:'sunVillageInfoListResourceEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
                <div @click="openLoader(item.id,0)" style="background-color: rgb(98,173,102,0.2);color: #62AD66;">附件</div>
-               <div @click="openMap(item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
+               <div @click="openMap(item.id, item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
              </template>
            </van-swipe-cell>
 
@@ -49,9 +49,11 @@
 
        <van-popup v-model="showMap" lock-scroll position="top" :style="{ height: '80%' }" >
          <div style="padding: 0;text-align: center">
-           <MapGisLine ref="clickLoading" :message="theGeom" v-on:formSubmit="MapTag"></MapGisLine>
+           <MapGisLine ref="clickLoading" :message="theGeom" v-on:formSubmit="MapTag" :resourceId="resourceId" :resourceList="resourceList"></MapGisLine>
+<!--           <div>地图信息：绿色地块表示该地块，蓝色表示本账套已标记的其他地块</div>-->
            <div style="margin-top: 1.5vh">
              <van-button type="info" size="small" @click="saveGeom">保存</van-button>
+             <van-button type="danger" size="small" @click="clearLayer">清除图层</van-button>
              <van-button plain type="info" size="small" @click="showMap = false">取消</van-button>
            </div>
          </div>
@@ -72,7 +74,9 @@
      attachmentList,
      systemAttachment,
      delResource,
-     updateResource
+     updateResource,
+     getResource,
+     clearResourceGeom
    } from "@/api/sunVillage_info/fixedAssets";
    import request from '@/utils/request'
    import MapGisLine from "@/components/Map/MapGisLine";
@@ -105,6 +109,9 @@
          projectId:'',
          projectIndex:'',
          showBtn:true,
+         listMap: 0,
+         resourceId: null,    // 资源ID，记录当前资源的ID
+         resourceList: []     // 资源列表，存储本账套下所有的资源信息
        };
      },
      created() {
@@ -121,30 +128,49 @@
      methods: {
        saveGeom(){
          var that = this;
-         this.applicationList[this.listMap].theGeom = this.theGeom;
-         updateResource(this.applicationList[this.listMap]).then((response) => {
+         updateResource({id: this.resourceId, theGeom: this.theGeom}).then((response) => {
            if (response.code == 200){
              this.$notify({ type: 'success', message: '修改成功' });
              setTimeout(function(){
                that.showMap = false;
-               that.queryParams.pageNum += 1 ;
-               that.applicationList = [];
-               that.getList();
+               getResource(that.resourceId).then(response => {
+                 that.applicationList[that.listMap].theGeom = response.data.theGeom;
+               });
              },500)
            }
          });
        },
-       openMap(theGeom,index){
-         this.showMap = true;
-         this.theGeom = theGeom;
-         this.listMap = index;
-         this.mapClickLoading();
+       clearLayer() {
+         this.$dialog.confirm({
+           message: '是否清除图层？',
+         }).then(() => {
+           // on confirm
+           clearResourceGeom(this.resourceId).then(res => {
+             if (res.code === 200) {
+               this.$notify({ type: 'success', message: '清除成功' });
+               this.showMap = false;
+               this.applicationList[this.listMap].theGeom = null;
+             }
+           });
+         }).catch(() => {
+           // on cancel
+         });
+       },
+       openMap(id, theGeom,index){
+         listResource().then(response => {
+           this.showMap = true;
+           this.resourceId = id;
+           this.theGeom = theGeom;
+           this.listMap = index;
+           this.resourceList = response.rows;
+           this.mapClickLoading();
+         });
        },
        //每个查看修改，新增  方法下引用下面方法
        mapClickLoading(){
          setTimeout(() => {
            this.$refs.clickLoading.drawingPaceCountryLine();
-         }, 500);
+         }, 1000);
        },
        /** 查找地图中定位点 */
        MapTag: function (data) {
@@ -159,9 +185,12 @@
          });
        },
        getList(){
+         this.loading = true;
          listResource(this.queryParams).then(response => {
            this.listLength = response.total;
-           this.applicationList = response.rows;
+           response.rows.forEach(item => {
+             this.applicationList.push(item);
+           });
            if(this.applicationList.length >= response.total){
              this.finished = true;
              return;
@@ -235,6 +264,7 @@
        getSearchList(){
          this.applicationList = [];
          this.queryParams.pageNum = 1;
+         this.finished = false;
          this.getList();
        },
        deleteFile1(file){

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

@@ -16,6 +16,7 @@
       <van-field readonly label="收款账户" v-model="form.payeeAccount" input-align="right" label-width="auto"/>
       <van-field readonly label="所属银行" v-model="bankType" input-align="right" label-width="auto" />
       <van-field readonly label="开户银行" v-model="form.bankDeposit" input-align="right" label-width="auto"/>
+      <van-field readonly label="联行号" v-model="form.payeePaymentLines" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">

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

@@ -146,7 +146,6 @@
       getDictionaries(){
         getPayee(this.$route.query.id).then((response) => {
           let _this = this
-          this.form = response.data;
           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});
@@ -166,14 +165,14 @@
           listDeposit(queryParams).then(rr => {
             this.bankDepositOptions = []
             for(var i = 0 ; i < rr.rows.length ; i++){
-              if(_this.form.bankDeposit==rr.rows[i].id){
+              if(_this.form.payeePaymentLines==rr.rows[i].payeePaymentLines){
                 _this.bankDeposit = rr.rows[i].bankDeposit
               }
                 _this.bankDepositOptions.push({"text":rr.rows[i].bankDeposit,"value":rr.rows[i].id,
                 "payeePaymentLines":rr.rows[i].payeePaymentLines,"institutionNumber":rr.rows[i].institutionNumber});
             }
           });
-
+          _this.form = response.data;
         });
 
       },
@@ -201,7 +200,7 @@
       },
       onConfirmBankDeposit(data){
         this.bankDeposit = data.text
-        this.form.bankDeposit = data.value
+        this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;

src/views/yinnong/homestead/freeExit/freeExitAdd.vue

@@ -24,7 +24,7 @@
         <van-field v-model="circulation.sqrxm" 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}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
 <!--        <van-field-->
@@ -519,21 +519,7 @@ export default {
       if (query !== "") {
         getShyqrs({shyqrdbxm:query,status:1,deptId:this.sysFarmer.deptId}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-            return {
-                      sqrxm:item.shyqrdbxm,
-                      sqrxb:item.xb,
-                      sqrzjhm:item.shyqrdbzjhm,
-                      sqrnhdm:item.nhdm,
-                      sqrzjlx:item.shyqrdbzjlx,
-                      sqrdh:item.dh,
-                      gyfs:item.gyfs,
-                      dz:item.dz,
-                      deptId:item.deptId,
-                      deptName:item.deptName,
-                      zjddm:item.zjddm,
-                    }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -567,19 +553,18 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      this.$set(this.circulation, "sqrxm", val.sqrxm);
-      this.$set(this.circulation, "deptId", val.deptId);
-      this.$set(this.circulation, "deptName", val.deptName);
-      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.sqrnhdm);
-      this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.sqrxb);
-      this.$set(this.circulation, "lxdh", val.sqrdh);
-      this.$set(this.circulation, "hkszd", val.dz);
-      this.$set(this.circulation, "zjddm", val.zjddm);
-      this.getObligeeOptions=[];
-      this.showDropList = false;
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
+        this.$set(this.circulation, "gyqk", val.gyfs);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
+        this.$set(this.circulation, "hkszd", val.dz);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
     },
     mapLook(){
       this.mapShow = true;

src/views/yinnong/homestead/freeExit/freeExitModify.vue

@@ -23,7 +23,7 @@
         <van-field v-model="circulation.sqrxm" 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}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
         <!--        <van-field-->
@@ -452,19 +452,7 @@
         if (query !== "") {
           getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
             if (response.code == 200) {
-              this.getObligeeOptions = response.rows.map(function (item) {
-                return {
-                  sqrxm:item.shyqrdbxm,
-                  sqrxb:item.xb,
-                  sqrzjhm:item.shyqrdbzjhm,
-                  sqrzjlx:item.shyqrdbzjlx,
-                  sqrdh:item.dh,
-                  gyfs:item.gyfs,
-                  dz:item.dz,
-                  deptId:item.deptId,
-                  deptName:item.deptName,
-                }
-              })
+              this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
               //设置模糊查询的下拉框和滚动条
               if (this.getObligeeOptions.length > 0) {
                 this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -490,15 +478,15 @@
         }
       },
       shyqrdmxmChange(val){
-        console.info(val);
-        this.$set(this.circulation, "sqrxm", val.sqrxm);
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
         this.$set(this.circulation, "deptId", val.deptId);
-        this.$set(this.circulation, "deptName", val.deptId);
-        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
         this.$set(this.circulation, "gyqk", val.gyfs);
-        this.$set(this.circulation, "xb", val.sqrxb);
-        this.$set(this.circulation, "lxdh", val.sqrdh);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
         this.$set(this.circulation, "hkszd", val.dz);
         this.getObligeeOptions=[];
         this.showDropList = false;

src/views/yinnong/homestead/paidExit/paidExitAdd.vue

@@ -24,7 +24,7 @@
         <van-field v-model="circulation.sqrxm" 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}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
 <!--        <van-field-->
@@ -285,7 +285,7 @@
 
 <script>
 import {  getShyqrs,dyAdd,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
 import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -546,20 +546,7 @@ export default {
       if (query !== "") {
         getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-            return {
-                      sqrxm:item.shyqrdbxm,
-                      sqrxb:item.xb,
-                      sqrzjhm:item.shyqrdbzjhm,
-                      sqrnhdm:item.nhdm,
-                      sqrzjlx:item.shyqrdbzjlx,
-                      sqrdh:item.dh,
-                      gyfs:item.gyfs,
-                      dz:item.dz,
-                      deptId:item.deptId,
-                      deptName:item.deptName,
-                    }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -593,15 +580,15 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      this.$set(this.circulation, "sqrxm", val.sqrxm);
+      this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
       this.$set(this.circulation, "deptId", val.deptId);
       this.$set(this.circulation, "deptName", val.deptName);
-      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.sqrnhdm);
+      this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+      this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+      this.$set(this.circulation, "sqrnhdm", val.nhdm);
       this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.sqrxb);
-      this.$set(this.circulation, "lxdh", val.sqrdh);
+      this.$set(this.circulation, "xb", val.xb);
+      this.$set(this.circulation, "lxdh", val.dh);
       this.$set(this.circulation, "hkszd", val.dz);
       this.getObligeeOptions=[];
       this.showDropList = false;

src/views/yinnong/homestead/paidExit/paidExitModify.vue

@@ -23,7 +23,7 @@
         <van-field v-model="circulation.sqrxm" 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}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
         <!--        <van-field-->
@@ -277,7 +277,7 @@
 
 <script>
   import {  getZyyctc,getShyqrs,zyyctcEdit,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
   import FieldSelect from "@/components/form/FieldSelect";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
   import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -479,19 +479,7 @@
         if (query !== "") {
           getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
             if (response.code == 200) {
-              this.getObligeeOptions = response.rows.map(function (item) {
-                return {
-                  sqrxm:item.shyqrdbxm,
-                  sqrxb:item.xb,
-                  sqrzjhm:item.shyqrdbzjhm,
-                  sqrzjlx:item.shyqrdbzjlx,
-                  sqrdh:item.dh,
-                  gyfs:item.gyfs,
-                  dz:item.dz,
-                  deptId:item.deptId,
-                  deptName:item.deptName,
-                }
-              })
+              this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
               //设置模糊查询的下拉框和滚动条
               if (this.getObligeeOptions.length > 0) {
                 this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -517,15 +505,15 @@
         }
       },
       shyqrdmxmChange(val){
-        console.info(val);
-        this.$set(this.circulation, "sqrxm", val.sqrxm);
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
         this.$set(this.circulation, "deptId", val.deptId);
-        this.$set(this.circulation, "deptName", val.deptId);
-        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
         this.$set(this.circulation, "gyqk", val.gyfs);
-        this.$set(this.circulation, "xb", val.sqrxb);
-        this.$set(this.circulation, "lxdh", val.sqrdh);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
         this.$set(this.circulation, "hkszd", val.dz);
         this.getObligeeOptions=[];
         this.showDropList = false;