户重新落宗修改

@@ -62,7 +62,7 @@
             </div>
             </div>
             <div class="footer">
             <div class="footer">
                 <el-button type="primary" @click="save">保存</el-button>
                 <el-button type="primary" @click="save">保存</el-button>
-                <el-button type="primary" @click="cancel">取消</el-button>
+                <el-button type="primary" @click="close">取消</el-button>
             </div>
             </div>
             <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
             <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
                         :isZdClose="true"></zd-query-data>
                         :isZdClose="true"></zd-query-data>
@@ -160,9 +160,6 @@
                 };
                 };
                 this.hcxlzData.bsms = this.bsms;
                 this.hcxlzData.bsms = this.bsms;
             },
             },
-            cancel() {
-                this.close();
-            },
             save() {
             save() {
                 if (this.hcxlzData.zrzbsm === '') {
                 if (this.hcxlzData.zrzbsm === '') {
                     Message.error("请选择自然幢");
                     Message.error("请选择自然幢");
@@ -170,7 +167,14 @@
                 }
                 }
                 hzl(this.hcxlzData).then(res => {
                 hzl(this.hcxlzData).then(res => {
                     if (res.success) {
                     if (res.success) {
-                        this.close();
+                        this.$router.push({
+                            path:'zrz',
+                            query: {
+                                bsm:this.hcxlzData.zrzbsm,
+                                source: 2,
+                                auth: '0,1,2'
+                            }
+                        })
                     } else {
                     } else {
                         Message.error(res.message)
                         Message.error(res.message)
                     }
                     }

@@ -730,7 +730,7 @@ export default {
 					this.rightClickFlag = this.isHb ? 'hb':'fg';
 					this.rightClickFlag = this.isHb ? 'hb':'fg';
 					if (this.fghbChoosedList.length>1) {
 					if (this.fghbChoosedList.length>1) {
 						//合并
 						//合并
-						this.lpbChVisible = true;
+						this.lpbChVisible = this.hbsmList.indexOf(this.chData.bsm) > -1 ? true : false;
 						//判断选中户可以执行的合并类型
 						//判断选中户可以执行的合并类型
 						let chIsSame = this.fghbChoosedList.every((item)=> {
 						let chIsSame = this.fghbChoosedList.every((item)=> {
 							return item.ch == this.fghbChoosedList[0].ch;
 							return item.ch == this.fghbChoosedList[0].ch;
@@ -749,7 +749,7 @@ export default {
 						})
 						})
 					}else{
 					}else{
 						//分割
 						//分割
-						this.lpbChVisible = true;
+						this.lpbChVisible = this.hbsmList.indexOf(this.chData.bsm) > -1 ? true : false;
 						this.fgData.oldbsm = item.bsm;
 						this.fgData.oldbsm = item.bsm;
 						console.log(item,'item');
 						console.log(item,'item');
 						//判断户的实际sjcs为1，只能水平分割
 						//判断户的实际sjcs为1，只能水平分割
@@ -775,7 +775,7 @@ export default {
 					break;
 					break;
 				case 'isCxlz':
 				case 'isCxlz':
 					this.rightClickFlag = 'cxlz';
 					this.rightClickFlag = 'cxlz';
-					this.lpbChVisible = true;
+					this.lpbChVisible = this.hbsmList.indexOf(this.chData.bsm) > -1 ? true : false;
 					break;
 					break;
 				case 'isLpb':
 				case 'isLpb':
 					this.rightClickFlag = type;
 					this.rightClickFlag = type;
@@ -980,8 +980,8 @@ export default {
 		},
 		},
 		//户重新落宗
 		//户重新落宗
 		handleCxlz(){
 		handleCxlz(){
-            if (this.hbsmList.length <= 0) {
-              this.hbsmList.push(this.chData);
+            if (this.hbsmList.indexOf(this.chData.bsm) == -1) {
+              this.hbsmList.push(this.chData.bsm);
             }
             }
             this.hcxlzVisible = true
             this.hcxlzVisible = true
 		},
 		},