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

@@ -144,13 +144,13 @@ export default {
 			djq: [],
 			djq: [],
 			djzq: [],
 			djzq: [],
 			ruleForm:{
 			ruleForm:{
-				"djqbsm": "",
-				"djzqbsm": "",
-				"syqlxbsm": "",
-				"userbsm": "",
-				"xmmc": "",
-				"xzqbsm": "",
-				"zdtzmbsm": ""
+				djqbsm: "",
+				djzqbsm: "",
+				syqlxbsm: "",
+				userbsm: "",
+				xmmc: "",
+				xzqbsm: "",
+				zdtzmbsm: ""
 			},
 			},
 			ruleForm1:{
 			ruleForm1:{
 				zdbsm:'',
 				zdbsm:'',
@@ -216,6 +216,28 @@ export default {
 		this.activeName = this.auth ? 'zrz':'zd'
 		this.activeName = this.auth ? 'zrz':'zd'
 	},
 	},
 	methods: {
 	methods: {
+	    // 重置
+	    result(){
+            this.ruleForm={
+                djqbsm: "",
+                djzqbsm: "",
+                syqlxbsm: "",
+                userbsm: "",
+                xmmc: "",
+                xzqbsm: "",
+                zdtzmbsm: ""
+			}
+			this.ruleForm1={
+                zdbsm:'',
+                xmmc:'',
+                userbsm:''
+            }
+            this.ruleForm2={
+                zdbsm:'',
+                xmmc:'',
+                userbsm:''
+			}
+		},
 		handleClick(tab, event) {
 		handleClick(tab, event) {
 			console.log(tab, event);
 			console.log(tab, event);
 			console.log(tab.name);
 			console.log(tab.name);
@@ -280,7 +302,7 @@ export default {
 					return false;
 					return false;
 				}
 				}
 			});
 			});
-			
+
 		},
 		},
 		newDz() {
 		newDz() {
 			//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
 			//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
@@ -364,6 +386,7 @@ export default {
 		},
 		},
 		close() {
 		close() {
 			this.$emit("closeDialog");
 			this.$emit("closeDialog");
+			this.result();
 		},
 		},
 	},
 	},
 	computed: {},
 	computed: {},

@@ -483,10 +483,9 @@ export default {
 				}
 				}
 			});
 			});
 
 
-			console.log(this.formData.syqlxbsm);
 			this.dpdm = this.dpdm + this.formData.syqlxbsm;
 			this.dpdm = this.dpdm + this.formData.syqlxbsm;
 			this.$store.state.zdtzmList.forEach((item)=>{
 			this.$store.state.zdtzmList.forEach((item)=>{
-				if(item.zdtzmbsm === this.formData.zdtzmbsm){
+				if(item.bsm === this.formData.zdtzmbsm){
 					this.dpdm = this.dpdm + item.dm;
 					this.dpdm = this.dpdm + item.dm;
 				}
 				}
 			});
 			});