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

src/views/homestead/index.vue

@@ -21,6 +21,8 @@
         <div class="text">列表</div>
       </div>
     </div>
+    <van-overlay :show="selectionIconShow" @click="homesteadListShrink" />
+
     <!--放大缩小-->
     <div class="rightZoom_wrap">
       <div class="amplification" ref="sliderBig"></div>
@@ -139,15 +141,6 @@
     <!--搜索栏目-->
     <div class="searchBar_wrap">
       <div class="actionBar_wrap" v-if="searchBarOperVisbile">
-        <div class="m_list">
-          <div
-            class="tensile"
-            :class="{ active: draw.drawMapPolygon }"
-            @click="drawMapPolygonFun"
-          >
-            <div class="icon"></div>
-          </div>
-        </div>
         <!-- <div class="m_list">
           <div class="positioning">
             <div class="icon"></div>
@@ -169,6 +162,15 @@
             <div class="icon"></div>
           </div>
         </div>
+        <div class="m_list">
+          <div
+            class="tensile"
+            :class="{ active: draw.drawMapPolygon }"
+            @click="drawMapPolygonFun"
+          >
+            <div class="icon"></div>
+          </div>
+        </div>
         <div class="m_list" @click="farmlandEditSwitchFun">
           <div class="correct"></div>
         </div>
@@ -195,21 +197,21 @@
       <div class="landHomestead_body">
         <!--0-农房-->
         <div class="body_flex" v-if="farmhouseStatus == 0">
-          <div class="attribute" @click="houseLandLookInfo('show')">
+          <div class="attribute" @click="houseLandLookInfo('show', 'house')">
             <div class="names">{{ houseInfoList.fwsyrmc }}</div>
             <div class="address">{{ houseInfoList.dz }}</div>
             <div class="nature">性质：{{ houseInfoList.tdxz }}</div>
           </div>
-          <div class="distance">
+          <div class="distance" @click="houseLandLookInfo('show', 'house')">
             <div class="size">{{ houseInfoList.xh }}</div>
             <div class="probably">大约{{ houseInfoList.jzmj }}㎡</div>
           </div>
           <div class="others">
             <div class="information">
-              <div
+              <!-- <div
                 class="location"
                 @click="landHomeSerial('house', houseInfoList)"
-              ></div>
+              ></div> -->
               <div class="status_text">{{ houseInfoList.xzqk }}</div>
             </div>
             <div class="editor">
@@ -219,21 +221,21 @@
         </div>
         <!--1-农地-->
         <div class="body_flex" v-if="farmhouseStatus == 1">
-          <div class="attribute" @click="houseLandLookInfo('show')">
+          <div class="attribute" @click="houseLandLookInfo('show', 'land')">
             <div class="names">{{ landInfoList.syrmc }}</div>
             <div class="address">{{ landInfoList.cm }}</div>
             <div class="nature">性质：{{ landInfoList.nydlx }}</div>
           </div>
-          <div class="distance">
+          <div class="distance" @click="houseLandLookInfo('show', 'land')">
             <div class="size">{{ landInfoList.xh }}</div>
             <div class="probably">大约{{ landInfoList.mj }}㎡</div>
           </div>
           <div class="others">
             <div class="information">
-              <div
+              <!-- <div
                 class="location"
                 @click="landHomeSerial('land', landInfoList)"
-              ></div>
+              ></div> -->
               <div class="status_text">{{ landInfoList.xzqk }}</div>
             </div>
             <div class="editor">
@@ -361,7 +363,7 @@
         <!--内容-->
         <div class="serial_flex">
           <div class="number">
-            农地编号<span>{{ landInfoLookList.xm }}</span>
+            农地编号<span>{{ landInfoLookList.xh }}</span>
           </div>
           <div class="localhref" @click="houseLandLookInfo('hide')"></div>
         </div>
@@ -437,6 +439,10 @@
       </div>
     </div>
     <!--房地全部信息编辑-->
+    <van-overlay
+      :show="landHomesteadEditVisbile"
+      @click="landHomesteadEditCancel"
+    />
     <div
       class="landHomesteadEdit_wrap"
       v-show="landHomesteadEditVisbile"
@@ -728,7 +734,7 @@
               <div class="title_m">农地编号</div>
               <div class="input_m">
                 <van-field
-                  v-model="landInfoList.xm"
+                  v-model="landInfoList.xh"
                   placeholder="农地编号"
                   class="landHomesteadEdit_input"
                 />
@@ -776,7 +782,7 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="nydlxOptionsValue"
+                  v-model="landInfoList.nydlx"
                   readonly
                   clickable
                   name="picker"
@@ -934,6 +940,7 @@ export default {
   name: "homesteadLogin",
   data() {
     return {
+      selectionIconShow: false,
       //省市区区级list
       hcAreaInfoOption: [],
       //省市区区级显示
@@ -942,7 +949,7 @@ export default {
       villageValue: "",
       //选中村相关信息
       villageDataObj: {
-        deptName: "  ", //村名
+        deptName: "　　", //村名
       },
       hcAreaInfoFieldName: {
         text: "label",
@@ -1091,8 +1098,15 @@ export default {
       this.landHomesteadEditVisbileFun("show");
     },
     //显示农地\农房详情
-    houseLandLookInfo(type) {
+    houseLandLookInfo(type, status) {
       if (type == "show") {
+        if (status == "house") {
+          $("#texiao_fang").val(this.houseInfoList.fwsyrmc);
+          $("#texiao_fang").trigger("click");
+        } else {
+          $("#texiao_di").val(this.landInfoList.syrmc);
+          $("#texiao_di").trigger("click");
+        }
         this.houseLandLookAnmitFun("show");
       } else {
         this.houseLandLookAnmitFun("hide");
@@ -1126,8 +1140,26 @@ export default {
     drawMapPolygonFun() {
       let drawMapPolygon = this.draw.drawMapPolygon;
       if (drawMapPolygon == false) {
-        this.$set(this.draw, "drawMapPolygon", true);
-        $("#drawPolygon").trigger("click");
+        console.log(this.coordinateList);
+        if (this.coordinateList == "") {
+          this.$set(this.draw, "drawMapPolygon", true);
+          $("#drawPolygon").trigger("click");
+        } else {
+          this.$dialog
+            .confirm({
+              title: "提示",
+              message: "是否重新绘制画图",
+            })
+            .then(() => {
+              // on confirm
+              this.coordinateList = "";
+              this.$set(this.draw, "drawMapPolygon", true);
+              $("#drawPolygon").trigger("click");
+            })
+            .catch(() => {
+              // on cancel
+            });
+        }
       } else {
         $("#drawRemove").trigger("click");
         this.$set(this.draw, "drawMapPolygon", false);
@@ -1141,7 +1173,7 @@ export default {
       }
       this.currentType = 0;
       this.farmlandEditSwitchVisbuleFun("show");
-      this.searchBarOperVisbile = false;
+      // this.searchBarOperVisbile = false;
     },
     //关闭选择农房土地
     farmlandEditFun() {
@@ -1327,23 +1359,53 @@ export default {
             this.$toast("请选择地图坐标");
             return false;
           }
-          houseAdd(houseInfoList).then((res) => {
-            if (res.code == 200) {
-              this.landHomesteadEditVisbileFun("hide");
-              //新增
-              this.$toast("农房信息新建成功");
-              this.initDraw();
-            }
-          });
+
+          this.$dialog
+            .confirm({
+              title: "新建农房信息",
+              message: "是否保存信息或修改信息",
+            })
+            .then(() => {
+              // on confirm
+              houseAdd(houseInfoList).then((res) => {
+                if (res.code == 200) {
+                  this.landHomesteadEditVisbileFun("hide");
+                  //新增
+                  this.$toast("新建农房信息成功");
+                  this.initDraw();
+                  $("#drawRemove").trigger("click");
+                  $("#drawReset").trigger("click");
+                  this.coordinateList = "";
+                }
+              });
+            })
+            .catch(() => {
+              // on cancel
+            });
         } else {
+          this.$dialog
+            .confirm({
+              title: "修改农房信息",
+              message: "是否保存信息或修改信息",
+            })
+            .then(() => {
+              // on confirm
+              houseEdit(houseInfoList).then((res) => {
+                if (res.code == 200) {
+                  this.landHomesteadEditVisbileFun("hide");
+                  this.$toast("修改农房信息成功");
+                  this.houseInfoLookList = this.houseInfoList;
+                  this.initDraw();
+                  $("#drawRemove").trigger("click");
+                  $("#drawReset").trigger("click");
+                  this.coordinateList = "";
+                }
+              });
+            })
+            .catch(() => {
+              // on cancel
+            });
           //编辑
-          houseEdit(houseInfoList).then((res) => {
-            if (res.code == 200) {
-              this.landHomesteadEditVisbileFun("hide");
-              this.$toast("农房信息修改成功");
-              this.houseInfoLookList = this.houseInfoList;
-            }
-          });
         }
       } else if (this.farmhouseStatus == 1) {
         //   orgCode: "", //	String		否		行政区代码
@@ -1355,7 +1417,7 @@ export default {
         landInfoList.orgCode = this.villageDataObj.orgCode;
         landInfoList.cdm = this.villageDataObj.orgCode;
         landInfoList.cm = this.villageDataObj.deptName;
-        if (landInfoList.xm == undefined || landInfoList.xm == "") {
+        if (landInfoList.xh == undefined || landInfoList.xh == "") {
           this.$toast("请填写农地编号");
           return false;
         } else if (
@@ -1390,22 +1452,51 @@ export default {
             this.$toast("请选择空间坐标");
             return false;
           }
-          landAdd(landInfoList).then((res) => {
-            if (res.code == 200) {
-              this.landHomesteadEditVisbileFun("hide");
-              //新增
-              this.initDraw();
-              this.$toast("农地信息新建成功");
-            }
-          });
+          this.$dialog
+            .confirm({
+              title: "新建农地信息",
+              message: "是否保存信息或修改信息",
+            })
+            .then(() => {
+              // on confirm
+              landAdd(landInfoList).then((res) => {
+                if (res.code == 200) {
+                  this.landHomesteadEditVisbileFun("hide");
+                  //新增
+                  this.initDraw();
+                  $("#drawRemove").trigger("click");
+                  $("#drawReset").trigger("click");
+                  this.coordinateList = "";
+                  this.$toast("新建农地信息成功");
+                }
+              });
+            })
+            .catch(() => {
+              // on cancel
+            });
         } else {
-          landEdit(landInfoList).then((res) => {
-            if (res.code == 200) {
-              this.landHomesteadEditVisbileFun("hide");
-              this.$toast("农地信息修改成功");
-              this.landInfoLookList = this.landInfoList;
-            }
-          });
+          this.$dialog
+            .confirm({
+              title: "修改农地信息",
+              message: "是否保存信息或修改信息",
+            })
+            .then(() => {
+              // on confirm
+              landEdit(landInfoList).then((res) => {
+                if (res.code == 200) {
+                  this.landHomesteadEditVisbileFun("hide");
+                  this.$toast("修改农地信息成功");
+                  this.landInfoLookList = this.landInfoList;
+                  this.initDraw();
+                  $("#drawRemove").trigger("click");
+                  $("#drawReset").trigger("click");
+                  this.coordinateList = "";
+                }
+              });
+            })
+            .catch(() => {
+              // on cancel
+            });
         }
       }
       //保存成功触发
@@ -1434,9 +1525,9 @@ export default {
     //初始化绘制
     initDraw() {
       //清除数据
-      $("#drawRemove").trigger("click");
-      $("#drawReset").trigger("click");
-      this.coordinateList = "";
+      // $("#drawRemove").trigger("click");
+      // $("#drawReset").trigger("click");
+      // this.coordinateList = "";
       //农地数据初始化
       this.landInfoList = {
         id: "", //String		是		主键id
@@ -1599,7 +1690,7 @@ export default {
         if (res.code == 200) {
           let content = res.data;
           this.hcAreaInfoOption = content;
-          let currDeptId; // = "169";
+          let currDeptId; //;= "169"
           if (content[0].children && content[0].children.length != 0) {
             if (
               content[0].children[0].children &&
@@ -1652,12 +1743,14 @@ export default {
       } else {
         this.searchBarOperVisbile = false;
         //初始化绘制
+        // this.coordinateList = "";
         this.initDraw();
       }
     },
 
     /*右侧列表 --展开收缩*/
     selectionPush() {
+      this.selectionIconShow = true;
       $(".homesteadList_wrap").animate(
         {
           right: "0",
@@ -1666,6 +1759,7 @@ export default {
       );
     },
     homesteadListShrink() {
+      this.selectionIconShow = false;
       $(".homesteadList_wrap").animate(
         {
           right: "-300px",
@@ -1947,7 +2041,8 @@ export default {
                     obj.tdfl = trs.find("td").eq(23).text(); //集体/个人
                     obj.frontHouse = trs.find("td").eq(24).text(); //图片前
                     obj.behindHouse = trs.find("td").eq(25).text(); //图片后
-                    _this.houseInfoList = obj;
+                    let cloneObj = JSON.parse(JSON.stringify(obj));
+                    _this.houseInfoList = cloneObj;
                     _this.houseInfoList.frontland = "";
                     _this.houseInfoList.behindland = "";
                     _this.houseInfoLookList = obj;
@@ -1959,7 +2054,7 @@ export default {
                     let zjId = trs.find("td").eq(0).text();
                     let zjIdNum = zjId.replace("t_geo_hc_land.", "");
                     obj.id = zjIdNum; //	主键id
-                    obj.xm = trs.find("td").eq(1).text(); //序号
+                    obj.xh = trs.find("td").eq(1).text(); //序号
                     obj.cm = trs.find("td").eq(2).text(); //村名
                     obj.cbrmc = trs.find("td").eq(3).text(); //承包人名称
                     obj.syrmc = trs.find("td").eq(4).text(); //使用人名称
@@ -1974,7 +2069,8 @@ export default {
                     obj.frontland = trs.find("td").eq(18).text(); //图片前
                     obj.behindland = trs.find("td").eq(19).text(); //图片后
                     _this.nydlxOptionsValue = trs.find("td").eq(5).text(); //农用地类型
-                    _this.landInfoList = obj;
+                    let cloneObj = JSON.parse(JSON.stringify(obj));
+                    _this.landInfoList = cloneObj;
                     //编辑图片清空
                     _this.landInfoList.frontland = "";
                     _this.landInfoList.behindland = "";
@@ -2626,7 +2722,7 @@ export default {
     //农地 - 农用地类型 选择值
     nydlxOptionsFun(value) {
       this.landInfoList.nydlx = value.dictLabel;
-      this.nydlxOptionsValue = value.dictLabel;
+      // this.nydlxOptionsValue = value.dictLabel;
       this.nydlxOptionsVibile = false;
     },
     //农地 - 是否有流转 选择值
@@ -2650,17 +2746,6 @@ export default {
         this.landInfoList.frontland = res.url;
       });
     },
-    landHomeSerial(type, data) {
-      console.log(type);
-      console.log(data);
-      if (type == "house") {
-        $("#texiao_fang").val(data.fwsyrmc);
-        $("#texiao_fang").trigger("click");
-      } else {
-        $("#texiao_di").val(data.syrmc);
-        $("#texiao_di").trigger("click");
-      }
-    },
   },
 };
 </script>
@@ -2868,7 +2953,7 @@ export default {
   }
   .address_wrap {
     position: fixed;
-    z-index: 9;
+    // z-index: 9;
     top: 24px;
     left: 16px;
     display: flex;