Merge remote-tracking branch 'origin/master'

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

@@ -56,14 +56,15 @@
                 <div class="table-bode">
                     <table border="1">
                         <tr>
-                            <td>序号</td>
-                            <td>操作</td>
-                            <td>宗地代码</td>
-                            <td>不动产单元号</td>
-                            <td>项目名称</td>
-                            <td>不动产权证号</td>
-                            <td>权利人</td>
-                            <td>坐落</td>
+                            <th>序号</th>
+                            <th>操作</th>
+                            <th>宗地代码</th>
+                            <th>不动产单元号</th>
+                            <th>项目名称</th>
+                            <th>不动产权证号</th>
+                            <th>权利人</th>
+                            <th>坐落</th>
+                            <th>自然幢数量</th>
                         </tr>
                         <tr v-if="Data.length===0">
                             <td colspan="8">
@@ -81,6 +82,7 @@
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
+                            <td>{{item.zrzCount}}</td>
                         </tr>
                     </table>
                 </div>
@@ -167,7 +169,11 @@
                 this.getData(this.queryData)
             },
             addData: function (val) {
-               this.$emit("getData",val)
+                if (val.zrzCount < 1) {
+                    this.$message.warning("当前宗地下没有自然幢,请重新选择")
+                    return
+                }
+               this.$emit("getData",val);
             },
             isClose(flag){
 
@@ -208,7 +214,9 @@
             background-color: #F5F7FA;
         }
     }
-
+    th{
+        height: 36px;
+    }
     td {
         text-align: center;
         height: 36px;

@@ -209,7 +209,10 @@
                 let num = this.mjftData.list.length ? this.mjftData.list.length : 0
                 self.mjftData.dzwdys = num
                 return num;
-            }
+            },
+            zdbsm() {
+                return this.$route.query.bsm;
+            },
         },
         created() {
             console.log("create init...")
@@ -239,6 +242,9 @@
             "$store.state.zddm": function (zddm) {
                 this.zddm = zddm
             },
+            zdbsm: function (val) {
+                this.getData(val);
+            },
         }
     }
 </script>

@@ -730,7 +730,7 @@ export default {
 					this.rightClickFlag = this.isHb ? 'hb':'fg';
 					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)=> {
 							return item.ch == this.fghbChoosedList[0].ch;
@@ -749,7 +749,7 @@ export default {
 						})
 					}else{
 						//分割
-						this.lpbChVisible = true;
+						this.lpbChVisible = this.hbsmList.indexOf(this.chData.bsm) > -1 ? true : false;
 						this.fgData.oldbsm = item.bsm;
 						console.log(item,'item');
 						//判断户的实际sjcs为1，只能水平分割
@@ -775,7 +775,7 @@ export default {
 					break;
 				case 'isCxlz':
 					this.rightClickFlag = 'cxlz';
-					this.lpbChVisible = true;
+					this.lpbChVisible = this.hbsmList.indexOf(this.chData.bsm) > -1 ? true : false;
 					break;
 				case 'isLpb':
 					this.rightClickFlag = type;
@@ -980,8 +980,8 @@ export default {
 		},
 		//户重新落宗
 		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
 		},