范围属性变更业务逻辑修改

杨威
Showing 4 changed files with 108 additions and 64 deletions
src/views/panel/change/fwsxbg/index.vue
src/views/panel/change/hfghb/index.vue
src/views/zrz/lpb/bjlp/index.vue
src/views/zrz/lpb/bjlp/lpbContent/index.vue
--- a/src/views/panel/change/fwsxbg/index.vue
View file @907e999
+++ b/src/views/panel/change/fwsxbg/index.vue
View file @907e999
--- a/src/views/panel/change/hfghb/index.vue
View file @907e999
+++ b/src/views/panel/change/hfghb/index.vue
View file @907e999
@@ -84,7 +84,7 @@
        <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
          <!-- 楼盘表主体 -->
          <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
-            <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true :isHb="isHb"></lpbContent>
+            <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' lpbParent = 'isHbfg' :isHb="isHb"></lpbContent>
          </div>
          <!-- 右侧图例 -->
          <div class="lp-legend">
@@ -538,8 +538,11 @@ export default {
        .lp-overview {
          transition: 0.5s;
          flex: 1;
-          padding-right: 20px;
+          margin-right: 20px;
          box-sizing: border-box;
+          border: 1px solid #ececec;
+          border-top: 0;
+          border-bottom: 0;
        }
        .lp-legend {
          transition: 0.5s;
--- a/src/views/zrz/lpb/bjlp/index.vue
View file @907e999
+++ b/src/views/zrz/lpb/bjlp/index.vue
View file @907e999
@@ -257,10 +257,6 @@
 			:bsms="bsms"
 			@close="hcxlzClose"
 		></h-cxlz>
-		<!-- 双击户的弹出框 -->
-		<el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" >
-			<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
-		</el-dialog>
 	</div>
 </template>
@@ -275,7 +271,6 @@ import LineTree from "@components/lineTree/lineTree";
 import addLjz from "./ljz/index";
 import addZdy from "./zdy/index";
 import addCh from "./ch/index";
-import hbj from "./hbj/index";
 import lpbContent from "./lpbContent/index";
 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
@@ -291,14 +286,12 @@ export default {
 		PlSh,
 		PlH,
 		PlZl,
-		hbj,
 		HCxlz,
 	},
 	props: {},
 	data() {
 		return {
 			bsms: [],
-			hbsm: "",
 			dialogVisible: false,
 			plcVisible: false,
 			plhVisible: false,
@@ -565,12 +558,7 @@ export default {
 		getHbsm(data, type) {
 			if (type) {
 				// 双击
-				this.hbsm = data;
-				this.$store.state.hbsm=this.data;
-				this.hbjVisible = true;
-				this.$nextTick(function() {
-					this.$refs.hbj.getHInfo(this.hbsm);
-				});
 			} else {
 				//单击 TO DO
 				this.bsms = data;
--- a/src/views/zrz/lpb/bjlp/lpbContent/index.vue
View file @907e999
+++ b/src/views/zrz/lpb/bjlp/lpbContent/index.vue
View file @907e999
@@ -302,7 +302,9 @@
 			<li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
 			<!-- 分割 -->
 			<li v-show="rightClickFlag == 'fg'"  @click="handleFg">户分割</li>
-			<!-- <li v-show="rightClickFlag == 'fg'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> -->
+			<!-- 范围属性变更 -->
+			<li v-show="rightClickFlag == 'fwsxbg'"  @click="handleFwsxbg">变更信息</li>
 		</ul>
 		<!-- 层操作弹框 -->
@@ -362,6 +364,10 @@
 			:type="scyclx"
 			@loading="loadingData($store.state.zrzbsm,$parent.scyclx)"
 		></move-h>
+		<!-- 双击户的弹出框 -->
+		<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>
 	</div>
 </template>
 <script>
@@ -369,22 +375,24 @@ import moveH from "@components/moveH/moveH";
 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
 import { hhb,hfg } from "@api/h";
 import { Message } from 'element-ui';
+import { fwsxbgbl } from "@api/common";
+import hbj from "../hbj/index";
 export default {
 	name: "",
-	components: { moveH },
+	components: { moveH,hbj },
 	props: {
-		isHbfg:{
-			type:Boolean,
-			default:false
-		},
 		zrzbsm:{
 			type:String,
 			default:''
 		},
+		lpbParent:{
+			type:String,
+			default:'isLpb'
+		},
 		isHb:{
 			type:Boolean,
 			default:true
-		}
+		},
 	},
 	data() {
 		return {
@@ -394,6 +402,7 @@ export default {
 				cs: [],
 				zdys: [],
 			},
+			hbjVisible:false,
 			lpbContentWidth: "",
 			ljzWidth: 10000,
 			zdyWidth: 1000,
@@ -402,6 +411,7 @@ export default {
 			ljzcHeight: 0, //逻辑幢下层户的div高度
 			ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
 			loading: true,
+			hbsm:'',
 			hbsmList: [],
 			cbsmList: [],
 			time: null, //区分单双击事件的定时器
@@ -614,11 +624,17 @@ export default {
 		//户双击事件
 		dbclick(bsm) {
 			clearTimeout(this.time);
+			this.hbsm = bsm;
+			this.$store.state.hbsm=this.data;
+			this.hbjVisible = true;
+			this.$nextTick(function() {
+				this.$refs.hbj.getHInfo(this.hbsm);
+			});
 			// if (this.isHbfg) {
 			// }else{
-				// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
+			// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
-				this.$parent.getHbsm(bsm, true);
+			// this.$parent.getHbsm(bsm, true);
 			// }
 		},
 		//删除多重数组中的某一项
@@ -646,49 +662,59 @@ export default {
 		openMenu(e, item, type) {
 			this.lpbChLeft = e.pageX;
 			this.lpbChTop = e.pageY;
-			if (this.isHbfg) {
+			this.chData = item;
-				this.rightClickFlag = this.isHb ? 'hb':'fg';
+			switch (this.lpbParent) {
-				if (this.fghbChoosedList.length>1) {
+				case 'isHbfg':
-					//合并
+					this.rightClickFlag = this.isHb ? 'hb':'fg';
-					this.lpbChVisible = true;
+					if (this.fghbChoosedList.length>1) {
-					//判断选中户可以执行的合并类型
+						//合并
-					let chIsSame = this.fghbChoosedList.every((item)=> {
+						this.lpbChVisible = true;
-						return item.ch == this.fghbChoosedList[0].ch;
+						//判断选中户可以执行的合并类型
-					});
+						let chIsSame = this.fghbChoosedList.every((item)=> {
-					let hhIsSame = this.fghbChoosedList.every((item)=> {
+							return item.ch == this.fghbChoosedList[0].ch;
-						return item.hh == this.fghbChoosedList[0].hh;
+						});
-					});
+						let hhIsSame = this.fghbChoosedList.every((item)=> {
-					this.$nextTick(()=>{
+							return item.hh == this.fghbChoosedList[0].hh;
-						if(chIsSame){
+						});
-							this.canHb = 'zyhb'
+						this.$nextTick(()=>{
-						}else if(hhIsSame){
+							if(chIsSame){
-							this.canHb = 'sxhb'
+								this.canHb = 'zyhb'
+							}else if(hhIsSame){
+								this.canHb = 'sxhb'
+							}else{
+								this.canHb = ''
+							}
+						})
+					}else{
+						//分割
+						this.lpbChVisible = true;
+						this.fgData.oldbsm = item.bsm;
+						console.log(item,'item');
+						//判断户的实际sjcs为1，只能水平分割
+						this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
+						if(item.sjcs == 1){
+							//判断户的实际sjcs为1，只能水平分割
+							this.fgData.fgfx = 0;
+							this.fgData.fghs = '';
 						}else{
-							this.canHb = ''
+							this.fgData.fgfx = 1;
+							//判断户的实际sjhs不为1，分割户数为sjhs的值
+							this.fgData.fghs = item.sjcs;
 						}
-					})
-				}else{
-					//分割
-					this.lpbChVisible = true;
-					this.fgData.oldbsm = item.bsm;
-					console.log(item,'item');
-					//判断户的实际sjcs为1，只能水平分割
-					this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
-					if(item.sjcs == 1){
-						//判断户的实际sjcs为1，只能水平分割
-						this.fgData.fgfx = 0;
-						this.fgData.fghs = '';
-					}else{
-						this.fgData.fgfx = 1;
-						//判断户的实际sjhs不为1，分割户数为sjhs的值
-						this.fgData.fghs = item.sjcs;
 					}
-				}
+					break;
-			}else{
+				case 'isFwsxbg':
-				console.log(e, "e");
+					console.log(item,'item');
-				this.chData = item;
+					this.rightClickFlag = 'fwsxbg';
-				this.rightClickFlag = type;
+					this.lpbChVisible = true;
-				this.lpbChVisible = true;
+					break;
+				case 'isLpb':
+					this.rightClickFlag = type;
+					this.lpbChVisible = true;
+					break;
+				default:
+					break;
 			}
 		},
 		// 户单元状态点击事件
@@ -851,6 +877,33 @@ export default {
 				}
 			})
 			.catch(() => {});
+		},
+		//范围属性变更
+		handleFwsxbg(){
+			let params = { bsm: this.chData.bsm, type: 'h'};
+			this.$confirm('是否确定范围属性变更?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					fwsxbgbl(params)
+						.then((res) => {
+							if (res.code == 200) {
+								console.log('成功');
+								this.getLpb(this.zrzbsm,this.scyclx);
+								this.dbclick(this.chData.bsm);
+							} else {
+								this.$message({
+									message: res.message,
+									type: "warning",
+								});
+							}
+						}).catch((error) => {
+						});
+				}).catch(() => {
+				});
 		}
 	},
 	computed: {