From a3e1a698296f65c1e0eb872f80a506fcbc5c1130 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Fri, 11 Mar 2022 17:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue | 39 ++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 5336a634..bac5ca45 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -3142,6 +3142,7 @@
           deptId:"",
           zjddm:"",
         },
+        ztMap: true,
         //记录是否从地图进入
         enterMap: "",
         //记录从地图进入宅基地代码
@@ -3156,6 +3157,13 @@
       };
     },
     created(){
+      console.log(this.$cookies.get("search"));
+      if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
+        this.ztMap =false;
+        this.$cookies.set("item",this.$cookies.get("search"));
+      }else {
+        this.ztMap =true;
+      }
       if(this.$cookies.get("search")){
         if(this.$cookies.get("search").active!=null){
           this.cookiesInfo = this.$cookies.get("search")
@@ -3166,7 +3174,9 @@
           this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData;
           this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId;
           this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm;
-          this.$cookies.set("item",this.backMap);
+          if(this.ztMap){
+            this.$cookies.set("item",this.backMap);
+          }
           this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom;
           //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm;
           //返回地图值记录----end
@@ -3176,12 +3186,12 @@
             this.isFinished = true
           }
           this.form = this.cookiesInfo.mapZjdAData;
-          this.mapClickLoading();
-          let zrz = this.cookiesInfo.mapZrzAData;
-          let fsss = this.cookiesInfo.mapFsssAData;
           this.getnhdmlist();
           this.getBaseUrl();
           this.getZjd();
+          //this.mapClickLoading();
+          let zrz = this.cookiesInfo.mapZrzAData;
+          let fsss = this.cookiesInfo.mapFsssAData;
           if(this.cookiesInfo.active=="3"){
             this.showzrz = true
             this.form3 = this.cookiesInfo.mapZrzAData
@@ -3325,16 +3335,12 @@
       this.getDicts("Industry").then(response => {
         this.industryOptions = response.data;
       });
-      if(this.active ==1){
-        //this.form.theGeom = this.item.theGeom;
-        this.message = this.form.theGeom;
-        console.log(this.message);
-        //this.$refs.drewingClickLoading = this.form.theGeom;
-        this.mapClickLoading();
-      }
     },
     mounted(){
+      if(this.active ==1){
 
+        this.mapClickLoading();
+      }
     },
     methods: {
       showPic(){
@@ -4235,6 +4241,7 @@
         //   this.$cookies.set("item",this.backMap);
         //   this.$router.push({name:'homesteadList'});
         // } else {
+        this.enterMap="";
         this.$router.push({name:'homesteadList'});
         // }
       },
@@ -4505,7 +4512,6 @@
               }
             })
           });
-
         }else{
           let params = {
             "deptId" : this.item.deptId
@@ -4532,7 +4538,8 @@
               qlsdfsName:'地上',
               sjly:'04',
               sjlyName:'农村宅基地使用权确权登记发证',
-              zl:''
+              zl:'',
+              theGeom:this.form.theGeom,
             }
             if(response.rows.length>0){
               this.form.suyqrdm = response.rows[0].suyqrdm
@@ -4560,6 +4567,9 @@
           }
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
+            if(this.active ==3 && this.enterMap ==1){
+              this.form3.zjddm = this.backMap.zjddm;
+            }
           });
           /*listNmfw(params).then(r => {
             this.fwlist = r.rows
@@ -4574,6 +4584,9 @@
           }
           listFsss(params).then(response => {
             this.fssslist = response.rows;
+            if(this.active ==4 && this.enterMap ==1){
+              this.form4.zjddm = this.backMap.zjddm;
+            }
           });
         }
       },