Merge remote-tracking branch 'origin/master'

@@ -29,7 +29,7 @@ export function getBdcdyh (dpdm,dptype) {
  */
  */
 export function saveDzInfo (data) {
 export function saveDzInfo (data) {
     return request({
     return request({
-        url: '/fw/qjZrz/updateQjZrz',
+        url: '/fw/qjDz/updateQjDz',
         method: 'put',
         method: 'put',
         data:data
         data:data
     })
     })
@@ -38,9 +38,9 @@ export function saveDzInfo (data) {
 /**
 /**
  * 保存自然幢信息
  * 保存自然幢信息
  */
  */
-export function getZrzDetailByBsm (data) {
+export function getDzDetailByBsm (data) {
     return request({
     return request({
-        url: '/fw/qjZrz/getQjZrzDetailById',
+        url: '/fw/qjDz/getDzDetailByBsm',
         method: 'get',
         method: 'get',
         params:{
         params:{
             id:data
             id:data

@@ -100,11 +100,12 @@ export default {
 			this.$emit("changeTop", e.pageY);
 			this.$emit("changeTop", e.pageY);
 			this.$emit("changeLeft", e.pageX);
 			this.$emit("changeLeft", e.pageX);
 			this.$emit("changeZdData",item);
 			this.$emit("changeZdData",item);
-			//判断所有权类型
-			console.log(item.dm,'item.dm ');
-			if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
-				this.$emit("changeCreateVisible", true);
-			}
+			this.$emit("changeVisible", false);
+			// //判断所有权类型
+			// console.log(item.dm,'item.dm ');
+			// if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
+			// 	this.$emit("changeCreateVisible", true);
+			// }
 			//判断楼盘类型
 			//判断楼盘类型
 			switch (item.type) {
 			switch (item.type) {
 				case 'zd':
 				case 'zd':

@@ -135,17 +135,17 @@ export default {
 			}
 			}
 		},
 		},
 		
 		
-		createVisible(value) {
-			if (value) {
-				document.body.addEventListener("click", this.closeMenu);
-			} else {
-				document.body.removeEventListener("click", this.closeMenu);
-			}
-		}
+		// createVisible(value) {
+		// 	if (value) {
+		// 		document.body.addEventListener("click", this.closeMenu);
+		// 	} else {
+		// 		document.body.removeEventListener("click", this.closeMenu);
+		// 	}
+		// }
 	},
 	},
 	created() {
 	created() {
 		console.log("lineTree create");
 		console.log("lineTree create");
-		// this.preDealData(this.pd);
+		this.preDealData(this.pd);
 		// this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
 		// this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
 	},
 	},
 
 
@@ -184,8 +184,14 @@ export default {
 			this.dialogVisible = false;
 			this.dialogVisible = false;
 		},
 		},
 		preDealData(list) {
 		preDealData(list) {
-			//楼盘表目录树没有expand属性
-			list[0].expand = list[0].expand == undefined ? true:list[0].expand;
+			// //楼盘表目录树没有expand属性
+			// list[0].expand = list[0].expand == undefined ? true:list[0].expand;
+			list.forEach((x) => {
+				if (x.expand == undefined) this.$set(x, "expand", true);
+				if (x.children && x.children.length > 0) {
+					this.preDealData(x.children);
+				}
+			});
 			return list;
 			return list;
 		},
 		},
 		// 根据id展开树的具体项
 		// 根据id展开树的具体项
@@ -206,17 +212,10 @@ export default {
 			console.log(this.formatData, "this.formatData");
 			console.log(this.formatData, "this.formatData");
 		},
 		},
 		itemClick(item) {
 		itemClick(item) {
-			item.expand = item.expand == undefined? true:!item.expand;
+			// item.expand = item.expand == undefined? true:!item.expand;
+			item.expand = !item.expand;
 			this.$emit("itemClick", item);
 			this.$emit("itemClick", item);
 		},
 		},
-		// 详情点击
-		detailClick(data) {
-			clearTimeout(this.timer);
-			this.timer = setTimeout(() => {
-				this.selectedDetail = data;
-				this.$emit("detailClick", data);
-			}, 300);
-		},
 		//自然幢右键点击事件
 		//自然幢右键点击事件
 		openMenu(e,item){
 		openMenu(e,item){
 			console.log(item,'右键item');
 			console.log(item,'右键item');
@@ -228,7 +227,7 @@ export default {
 		//关闭右键菜单
 		//关闭右键菜单
 		closeMenu(){
 		closeMenu(){
 			this.lpbvisible = false;
 			this.lpbvisible = false;
-			this.createVisible = false;
+			// this.createVisible = false;
 		},
 		},
 		//楼盘表右键菜单项打开父组件弹框
 		//楼盘表右键菜单项打开父组件弹框
 		openLpbDialog(type){
 		openLpbDialog(type){

@@ -116,6 +116,10 @@
                         this.$store.state.zdbsm = row.glbsm;
                         this.$store.state.zdbsm = row.glbsm;
                         path = "/zd";
                         path = "/zd";
                         break;
                         break;
+                    case "dz":
+                        this.$store.state.dzbsm = row.glbsm;
+                        path = "/dz";
+                        break;
                     default:
                     default:
                         break;
                         break;
                 }
                 }