From 84f10d3bb5c5b86d29aa9dcae5b6cf623071d1a2 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Tue, 1 Mar 2022 10:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E6=B7=BB=E5=8A=A0=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 10e4bd82..63d51c93 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -3895,7 +3895,7 @@
                         let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", "");
                         obj.id = fsssIdNum; //	主键id
                         obj.deptName = trs.find("td").eq(4).text();//行政区划名称
-                        obj.zjddm = trs.find("td").eq(2).text();//宅基地代码
+                        obj.zjddm = trs.find("td").eq(1).text();//宅基地代码
                         // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态
                         // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型
                         obj.jzmj = trs.find("td").eq(8).text(); //建筑面积
@@ -4532,14 +4532,22 @@
               this.$router.push({path:'/homesteadSurvey/add'});
             }
             if(this.mapZrzData !=undefined && this.mapZrzData !=""){
-              this.mapZjdTeAll.active =3;
-              this.$cookies.set("search",this.mapZjdTeAll);
-              this.$router.push({path:'/homesteadSurvey/add'});
+              if(this.mapZjdTeAll.mapZjdAData !=""){
+                this.mapZjdTeAll.active =3;
+                this.$cookies.set("search",this.mapZjdTeAll);
+                this.$router.push({path:'/homesteadSurvey/add'});
+              } else {
+                this.$toast("必须有宅基地数据才能进入自然幢核查");
+              }
             }
             if(this.mapFsssData !=undefined && this.mapFsssData !=""){
-              this.mapZjdTeAll.active =4;
-              this.$cookies.set("search",this.mapZjdTeAll);
-              this.$router.push({path:'/homesteadSurvey/add'});
+              if(this.mapZjdTeAll.mapZjdAData !="") {
+                this.mapZjdTeAll.active = 4;
+                this.$cookies.set("search", this.mapZjdTeAll);
+                this.$router.push({path: '/homesteadSurvey/add'});
+              } else {
+                this.$toast("必须有宅基地数据才能进入附属设施核查");
+              }
             }
           } else {
             this.$dialog.alert({
@@ -4673,7 +4681,7 @@
             this.$cookies.set("search",this.mapZjdTeAll);
             this.$router.push({path:'/homesteadSurvey/add'});
           }else {
-            this.$toast("请先在地图上选择宅基地后，再添加自然幢选择");
+            this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮");
           }
         },
         fsssTz(){
@@ -4684,7 +4692,7 @@
           this.$cookies.set("search",this.mapZjdTeAll);
           this.$router.push({path:'/homesteadSurvey/add'});
           }else {
-            this.$toast("请先在地图上选择宅基地后，再添加自然幢选择");
+            this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮");
           }
         },
         //绘图重置清除之前图层