Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -75,14 +75,19 @@
                 window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
             },
             uploadSuccess(res, file, fileList) {
+                this.errorData = [];
                 if (res.success) {
                     this.$message.success("上传成功")
                     debugger
                     this.loading();
                     this.close()
                 } else {
-                    this.$message.error("上传失败")
-                    this.errorData = res.result
+                    if (res.result == null) {
+                        this.$message.error(res.message)
+                    } else {
+                        this.$message.error("上传失败")
+                        this.errorData = res.result;
+                    }
                 }
             }
         },
@@ -117,7 +122,7 @@
     ul {
         margin-top: 20px;
         li {
-            line-height: 15px;
+            line-height: 20px;
             color: red;
         }
     }

@@ -496,6 +496,19 @@
                 this.form.dzbsm=this.$route.query.bsm;
                 this.getDzDetailByBsm(this.$route.query.bsm)
             }
+        },
+        watch:{
+            "$store.state.sxdrType": {
+                handler(n) {
+                    this.$nextTick(()=>{
+                        if (n === 'dz') {
+                            this.getDzDetailByBsm(this.$route.query.bsm)
+                        }
+                    })
+                },
+                immediate: false,
+                deep: true,
+            }
         }
     }
 </script>

@@ -940,20 +940,19 @@
                 if (val != '') {
                     this.$refs.zddm.style.border = '';
                 }
+            },
+            "$store.state.sxdrType": {
+                handler(n) {
+                    this.$nextTick(()=>{
+                        if (n === 'zd') {
+                            this.getZdjbxxData(this.$store.state.zdbsm)
+                        }
+                    })
+                },
+                immediate: false,
+                deep: true,
             }
         },
-        "$store.state.sxdrType": {
-            handler(n) {
-                this.$message.success(n)
-                this.$nextTick(()=>{
-                    if (n === 'zd') {
-                        this.getZdjbxxData(this.$store.state.zdbsm)
-                    }
-                })
-            },
-            immediate: true,
-            deep: true,
-        }
     };
 </script>
 <style lang="less" scoped>

@@ -843,6 +843,17 @@
                         this.form.scyclx = this.scyclx;
                     })
                 }
+            },
+            "$store.state.sxdrType": {
+                handler(n) {
+                    this.$nextTick(()=>{
+                        if (n === 'h') {
+                            this.getHInfo(this.$store.state.hbsm)
+                        }
+                    })
+                },
+                immediate: false,
+                deep: true,
             }
         }
     }
@@ -909,7 +920,7 @@
 			height: 30px !important;
 		}
 	}
-    
+
 	.header-button {
 		height: 50px;
 		position: fixed;

@@ -686,7 +686,7 @@
                             }
                             //权利性质数据传给子组件
                             this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS
-      
+
                         }
                     }
                 })
@@ -759,7 +759,7 @@
                     })
                 },
                 deep:true
-            }, 
+            },
             "form.fwjgList": {
                handler : function (newVal, oldVal) {
                     newVal.forEach((item,ind)=>{
@@ -770,6 +770,17 @@
                 },
                 deep:true
             },
+            "$store.state.sxdrType": {
+                handler(n) {
+                    this.$nextTick(()=>{
+                        if (n === 'zrz') {
+                            this.getZrzDetailByBsm(this.$route.query.bsm)
+                        }
+                    })
+                },
+                immediate: false,
+                deep: true,
+            }
         }
     }
 </script>