宅基地调查

src/views/homesteadSurvey/add.vue

@@ -2643,19 +2643,23 @@
     },
     created(){
       if(this.$cookies.get("search")){
-        console.log(this.$cookies.get("search"));
+        this.active = this.$cookies.get("search").active
         this.item = this.$cookies.get("search").mapZjdAData
-        console.log(this.$cookies.get("search").active);
+        let zrz = this.$cookies.get("search").mapZrzAData
+        let fsss = this.$cookies.get("search").mapFsssAData
         if(this.$cookies.get("search").active=="3"){
-          this.active = "3"
+          this.showzrz= true
           this.getZrzList()
-          this.showzrz=true
-          this.form3 = this.$cookies.get("search").mapZrzData
+          setTimeout(() => {
+            this.showPopupzrz(zrz)
+          }, 500);
+
         }else if(this.$cookies.get("search").active=="4"){
-          this.active = "4"
+          this.showfsss= true
           this.getFsssList()
-          this.showfsss=true
-          this.form4 = this.$cookies.get("search").mapFsssData
+          setTimeout(() => {
+            this.showPopupfsss(fsss)
+          }, 500);
         }
       }else{
         this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
@@ -2756,6 +2760,8 @@
       this.getnhdmlist();
       this.getZjd();
       this.getBaseUrl();
+
+
     },
     mounted(){
         if(this.active ==1){
@@ -3378,6 +3384,7 @@
               }
             })
           });
+
         }else{
           let params = {
             "deptId" : this.item.deptId
@@ -3755,6 +3762,7 @@
         this.showhncy = true
       },
       showPopupzrz(item) {
+        console.log(item)
         if(this.form.id==null||this.form.id==""){
           Notify({ type: 'danger', message: '请先保存宅基地信息' });
         }else{
@@ -3773,16 +3781,21 @@
             }
           }else{
             this.form3 = item
-            this.sjlyOptions.map(res => {
-              if(res.dictValue == this.form3.sjly){
-                this.form3.sjlyName = res.dictLabel
-              }
-            })
-            this.fwjgOptions.map(res => {
-              if(res.dictValue == this.form3.fwjg){
-                this.form3.fwjgName = res.dictLabel
-              }
-            })
+            if(this.form3.sjly!=null){
+              this.sjlyOptions.map(res => {
+                if(res.dictValue == this.form3.sjly){
+                  this.form3.sjlyName = res.dictLabel
+                }
+              })
+            }
+            if(this.form3.fwjg!=null){
+              this.fwjgOptions.map(res => {
+                if(res.dictValue == this.form3.fwjg){
+                  this.form3.fwjgName = res.dictLabel
+                }
+              })
+            }
+
           }
           this.showzrz = true;
           this.active = 3;