Merge remote-tracking branch 'origin/master'

@@ -134,7 +134,7 @@ export default {
 					ljzbsm: "",
 					ljzbsm: "",
 					zdybsm: "",
 					zdybsm: "",
 					zrzbsm: "",
 					zrzbsm: "",
-					scyclx: "0",
+					scyclx: this.scyclx,
 					qsc: "",
 					qsc: "",
 					jsc: "",
 					jsc: "",
 					hs: "",
 					hs: "",
@@ -169,7 +169,7 @@ export default {
 			immediate: true,
 			immediate: true,
 			deep: true,
 			deep: true,
 		},
 		},
-		dialogVisible:{
+		scyclx:{
 			handler(n){
 			handler(n){
 				this.$nextTick(()=>{ 
 				this.$nextTick(()=>{ 
 					this.formData.scyclx = this.scyclx;
 					this.formData.scyclx = this.scyclx;

@@ -411,7 +411,11 @@
             Qlxz,
             Qlxz,
         },
         },
         props:{
         props:{
-            bsm:String //户标识码
+            bsm:String, //户标识码
+            scyclx:{
+                type: String,
+                default: "1",
+            },
         },
         },
         data () {
         data () {
             return {
             return {
@@ -792,6 +796,15 @@
                         this.form.bdcdyh=res.result;
                         this.form.bdcdyh=res.result;
                     })
                     })
             },
             },
+        },
+        watch: {
+            scyclx:{
+                handler(n){
+                    this.$nextTick(()=>{ 
+                        this.form.scyclx = this.scyclx;
+                    })
+                }
+            }
         }
         }
     }
     }
 </script>
 </script>

@@ -249,7 +249,7 @@
 		></h-cxlz>
 		></h-cxlz>
 		<!-- 双击户的弹出框 -->
 		<!-- 双击户的弹出框 -->
 		<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
 		<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
-			<hbj ref="hbj" :bsm="hbsm"></hbj>
+			<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
 			<div class="btnGroup">
 			<div class="btnGroup">
 				<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
 				<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
 				<el-button type="primary" @click="hbjResetInfo">重置</el-button>
 				<el-button type="primary" @click="hbjResetInfo">重置</el-button>
@@ -573,7 +573,7 @@ export default {
 		plScYcChange() {
 		plScYcChange() {
 			let data = {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
 				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: "0",
+				scyclx: this.scyclx,
 			};
 			};
 			batchScYcChange(data).then((res) => {
 			batchScYcChange(data).then((res) => {
 				if (res.code === 200) {
 				if (res.code === 200) {
@@ -607,7 +607,7 @@ export default {
 		getDyztBsmList() {
 		getDyztBsmList() {
 			let data = {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
 				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: "0",
+				scyclx: this.scyclx,
 			};
 			};
 			getLpbTj(data).then((res) => {
 			getLpbTj(data).then((res) => {
 				if (res.code === 200) {
 				if (res.code === 200) {
@@ -664,7 +664,7 @@ export default {
 		getLpbFwytAndQlxz(){
 		getLpbFwytAndQlxz(){
 			let data = {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
 				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: "0",
+				scyclx: this.scyclx,
 			};
 			};
 			getLpbFwytAndQlxz(data).then((res) => {
 			getLpbFwytAndQlxz(data).then((res) => {
 				if (res.code === 200) {
 				if (res.code === 200) {

@@ -241,7 +241,12 @@ export default {
 					highest = 0;
 					highest = 0;
 				}
 				}
 			} else {
 			} else {
-				// this.zdyWidth = 124;
+				//有且仅有独立层户
+				if(this.$refs.hBsm != undefined){
+					this.$refs.hBsm.forEach((item) => {
+						this.zdyWidth += item.offsetWidth + 21;
+					});
+				}
 			}
 			}
 
 
 			//计算逻辑幢下的幢单元和层户的高度
 			//计算逻辑幢下的幢单元和层户的高度