Merge remote-tracking branch 'origin/master'

@@ -106,6 +106,7 @@
                         path = "/zrz";
                         path = "/zrz";
                         break;
                         break;
                     case "zd":
                     case "zd":
+                        this.$store.state.zdbsm = row.glbsm;
                         path = "/zd";
                         path = "/zd";
                         break;
                         break;
                     default:
                     default:

@@ -444,8 +444,11 @@ export default {
 			getQjZdjbxxDetailById(this.$store.state.zdbsm)
 			getQjZdjbxxDetailById(this.$store.state.zdbsm)
 				.then((res) => {
 				.then((res) => {
 					if (res.result) {
 					if (res.result) {
-						console.log(res.result);
 						this.formData = res.result;
 						this.formData = res.result;
+						if(res.result.qjQlxzListVOS[0].qjTdytListVOS.length>0){
+							//权利性质数据传给子组件
+							this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS
+						}
 					}
 					}
 				})
 				})
 				.catch((error) => {});
 				.catch((error) => {});