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

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

@@ -496,6 +496,19 @@
                 this.form.dzbsm=this.$route.query.bsm;
                 this.form.dzbsm=this.$route.query.bsm;
                 this.getDzDetailByBsm(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>
 </script>

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

@@ -843,6 +843,17 @@
                         this.form.scyclx = this.scyclx;
                         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,
             }
             }
         }
         }
     }
     }

@@ -770,6 +770,17 @@
                 },
                 },
                 deep:true
                 deep:true
             },
             },
+            "$store.state.sxdrType": {
+                handler(n) {
+                    this.$nextTick(()=>{
+                        if (n === 'zrz') {
+                            this.getZrzDetailByBsm(this.$route.query.bsm)
+                        }
+                    })
+                },
+                immediate: false,
+                deep: true,
+            }
         }
         }
     }
     }
 </script>
 </script>