Merge remote-tracking branch 'origin/master'

@@ -5,7 +5,7 @@
                 :visible.sync="isVisible"
                 width="70%"
                 @close="close"
-                :modal-append-to-body="false"
+                append-to-body
         >
             <div class="search">
                 <el-row>

@@ -313,7 +313,7 @@ export default {
 			this.tableHeight =
 				(document.documentElement.clientHeight || document.body.clientHeight) -
 				392;
-          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 205;
+          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 		});
 	},

@@ -252,17 +252,11 @@
 		<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
 		<pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
 		<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
-		<h-cxlz
-			:h-cxlz-visble="hcxlzVisible"
-			:bsms="bsms"
-			@close="hcxlzClose"
-		></h-cxlz>
 	</div>
 </template>
 
 <script>
 import {Message} from "element-ui"
-import HCxlz from "@components/hCxlz/hCxlz";
 import PlC from "@components/plc/plC";
 import PlSh from "@components/plsh/plSh";
 import PlH from "@components/plh/plH";
@@ -286,7 +280,6 @@ export default {
 		PlSh,
 		PlH,
 		PlZl,
-		HCxlz,
 	},
 	props: {},
 	data() {
@@ -297,8 +290,6 @@ export default {
 			plhVisible: false,
 			plShVisible: false,
 			plzlVisible: false,
-			hbjVisible: false,
-			hcxlzVisible:false,
 			scyclx: "0", //1是实测  0是预测
 			radio1: "",
 			radio2: "",
@@ -404,13 +395,6 @@ export default {
                 }
 			})
 		},
-	    hcxlz(){
-            if (this.bsms.length <= 0) {
-                Message.warning("请选择操作户")
-                return
-            }
-            this.hcxlzVisible = true
-		},
         loading(){
             this.getLpbMenuTree(this.$store.state.zrzbsm);
 		},
@@ -443,9 +427,6 @@ export default {
 	    lodding(){
             this.getlpbData();
 		},
-		hcxlzClose() {
-			this.hcxlzVisible = false;
-		},
 		plZlClose() {
 			this.plzlVisible = false;
 		},

@@ -304,6 +304,8 @@
 			<li v-show="rightClickFlag == 'fg'"  @click="handleFg">户分割</li>
 			<!-- 范围属性变更 -->
 			<li v-show="rightClickFlag == 'fwsxbg'"  @click="handleFwsxbg">变更信息</li>
+			<!-- 重新落宗 -->
+			<li v-show="rightClickFlag == 'cxlz'"  @click="handleCxlz">重新落宗</li>
 
 
 		</ul>
@@ -368,10 +370,17 @@
 		<el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" >
 			<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
 		</el-dialog>
+		<!-- 户重新落宗 -->
+		<h-cxlz
+			:h-cxlz-visble="hcxlzVisible"
+			:bsms="hbsmList"
+			@close="hcxlzVisible = false"
+		></h-cxlz>
 	</div>
 </template>
 <script>
 import moveH from "@components/moveH/moveH";
+import HCxlz from "@components/hCxlz/hCxlz";
 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
 import { hhb,hfg } from "@api/h";
 import { Message } from 'element-ui';
@@ -379,7 +388,7 @@ import { fwsxbgbl } from "@api/common";
 import hbj from "../hbj/index";
 export default {
 	name: "",
-	components: { moveH,hbj },
+	components: { moveH,hbj,HCxlz, },
 	props: {
 		zrzbsm:{
 			type:String,
@@ -403,6 +412,7 @@ export default {
 				zdys: [],
 			},
 			hbjVisible:false,
+			hcxlzVisible:false,
 			lpbContentWidth: "",
 			ljzWidth: 10000,
 			zdyWidth: 1000,
@@ -708,6 +718,10 @@ export default {
 					this.rightClickFlag = 'fwsxbg';
 					this.lpbChVisible = true;
 					break;
+				case 'isCxlz':
+					this.rightClickFlag = 'cxlz';
+					this.lpbChVisible = true;
+					break;
 				case 'isLpb':
 					this.rightClickFlag = type;
 					this.lpbChVisible = true;
@@ -904,6 +918,14 @@ export default {
 				}).catch(() => {
 
 				});
+		},
+		//户重新落宗
+		handleCxlz(){
+            if (this.hbsmList.length <= 0) {
+                Message.warning("请选择操作户")
+                return
+            }
+            this.hcxlzVisible = true
 		}
 	},
 	computed: {