户合并完善

@@ -307,6 +307,7 @@
 import moveH from "./../../../../../components/moveH/moveH";
 import moveH from "./../../../../../components/moveH/moveH";
 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
 import { hhb } from "@api/h";
 import { hhb } from "@api/h";
+import { Message } from 'element-ui';
 export default {
 export default {
 	name: "",
 	name: "",
 	components: { moveH },
 	components: { moveH },
@@ -576,7 +577,6 @@ export default {
 			this.lpbChTop = e.pageY;
 			this.lpbChTop = e.pageY;
 			if (this.isHbfg) {
 			if (this.isHbfg) {
 				this.rightClickFlag = 'hb';
 				this.rightClickFlag = 'hb';
-				console.log(this.fghbChoosedList,'this.fghbChoosedList ');
 				if (this.fghbChoosedList.length>1) {
 				if (this.fghbChoosedList.length>1) {
 					this.lpbChVisible = true;
 					this.lpbChVisible = true;
 					//判断选中户可以执行的合并类型
 					//判断选中户可以执行的合并类型
@@ -717,19 +717,25 @@ export default {
 					.then(() => {
 					.then(() => {
 						//确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO 
 						//确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO 
 						let params = {
 						let params = {
-							"ljzbsm": "",
 							"newuserbsm": "",
 							"newuserbsm": "",
 							"oldBsms": olbBsms,
 							"oldBsms": olbBsms,
-							"scyclx": "",
-							"zdybsm": "",
-							"zrzbsm": ""
+							"scyclx": this.$parent.scyclx,
+							"ljzbsm": this.fghbChoosedList[0].ljzbsm,
+							"zdybsm": this.fghbChoosedList[0].zdybsm,
+							"zrzbsm": this.fghbChoosedList[0].zrzbsm
 						}
 						}
-						console.log(params,'params');
-						// hhb(params).then(() => {
-							//合并成功后更新楼盘表
-
-						// })
-						// .catch(() => {});
+						// console.log(params,'params');
+						hhb(params).then((res) => {
+							if(res.code == 200){
+								Message.success('合并成功');
+								// 清除选中户
+								this.clearChoosedH();
+								this.fghbChoosedList = [];
+								// 更新楼盘表
+								this.getLpb(this.zrzbsm, this.$parent.scyclx);
+							}
+						})
+						.catch(() => {});
 					})
 					})
 					.catch(() => {});
 					.catch(() => {});
 			}else{
 			}else{