Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue

@@ -44,7 +44,8 @@ const store = new Vuex.Store({
         zjlxList: [],
         gyfsList: [],
         hbsm:'',
-        contentWidth:''  //内容区域宽度
+        contentWidth:'',  //内容区域宽度
+        zrzh:'' //自然幢号
     },
     modules: {
         user,

@@ -25,8 +25,7 @@
 						<el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
 						<el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
 						<el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button>
-                        <el-button class="radioBtn" label="7" border>批量单元号</el-button>
-                        <el-button class="radioBtn" label="7" border @click="hcxlzVisible=true">户重新落宗</el-button>
+						<el-button class="radioBtn" label="7" border @click="addBdcdyh">批量单元号</el-button>
 					</div>
 				</el-col>
 			</el-row>
@@ -136,8 +135,7 @@
 				<el-button type="primary" @click="saveInfo">保存</el-button>
 				<el-button type="primary" @click="resetInfo">重置</el-button>
 				<el-button type="primary" @click="dialogVisible = false"
-                >取消
-                </el-button
+					>取消</el-button
 				>
 			</div>
 		</el-dialog>
@@ -377,17 +375,17 @@
 			console.log(this.bsms);
 		},
 		//不动产单元号输入框事件
-            inputFocus() {
+		inputFocus(){
 			this.inputWidth = 200
 		},
-            inputBlur() {
+		inputBlur(){
 			this.inputWidth = 74
 		},
-            inputChange() {
-                if (this.bdcdyh != '') {
-                    console.log('查询' + this.bdcdyh);
+		inputChange(){
+			if (this.bdcdyh!='') {
+				console.log('查询'+this.bdcdyh);
 				this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
-                } else {
+			}else{
 				this.$message({
 					message: "请输入内容后查询",
 					type: "warning",
@@ -395,40 +393,46 @@
 			}
 		},
 		//户保存
-            hbjSaveInfo() {
-                this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
+		hbjSaveInfo(){
+			this.$refs.hbj.onSave(this.bsms[this.bsms.length-1],this.tabPosition);
 		},
 		//户编辑表单重置
-            hbjResetInfo() {
+		hbjResetInfo(){
 			this.$refs.hbj.onReset();
 		},
 		//调用楼盘表信息查询接口
-            getlpbData() {
+		getlpbData(){
 			this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
 			//改变楼盘表子组件的key值，重新渲染
             this.time = new Date().getTime();
 		},
 		//实预测装换
-            plScYcChange() {
-                let data = {
-                    zrzbsm: this.$store.state.zrzbsm,
-                    scyclx: "0"
+		plScYcChange(){
+			let data={
+				zrzbsm:this.$store.state.zrzbsm,
+				scyclx:"0"
 			}
-                batchScYcChange(data).then((res) => {
-                    if (res.code === 200) {
+			batchScYcChange(data).then((res)=>{
+				if(res.code===200){
 					this.$message.success("实预测转换成功")
 				}
 			})
 		},
 		//选中房屋状态
-            handleChoosedH() {
+		handleChoosedH(){
 			//清除选中户
 			this.$refs.lpbContent.clearChoosedH()
 			//给hBsmList传值
 			// this.$refs.lpbContent.choosedList=["0a66bc775dcec26385f9124cc0fd8656", "58cafdbee129bb412527f674ef9267ae", "4bbca678fa56d5ab97b8a62c7cb54898", "ecfd72e9a31a03ba0ab4e46faba2b51b", "049033ea9d244b4b5ea75521b6862239", "013352d8a001a1d5f790296b6843627b", "ed8e3f0e2b2682cf76b4d58b9a74e49c", "37cc53acaf2c3bb92be4b9adf06d94c9", "f5a5e14ce08c26056aca5861f56e5cf6", "11eeaaa5c9f5f1231c69d3b958d05568", "421978023a36d4920dbb86300cc52dc9", "e97f2af2588cc0e41ffb6b203df617c9", "7210987d94350472dca10d4ad71fffc5", "6eb1b50edce538a4c63574e9e28fedce", "43c5fecd7623ceabc37844e8a4722603", "c361ccfcd3da9f7288110c6fa202cb96", "2321512f6f8d0ec9f570c6eec9a892fe", "ea08fb234cd908c89a0d21c085dadb2f", "be71f7f0ec926e1850d3baec8817cdbd", "6f695d6b7ecb97f7ff17f22dbe86b93c", "4ee1604b2629e6797d3096c20229223b"]
+		},
+		//批量添加不动产单元号
+		addBdcdyh(){
+			// this.pd[0].bsm //自然幢标识码
+			console.log(this.$store.state.zrzh,'this.$store.state.zrzh');
 		}
 	},
-        computed: {},
+	computed: {
+	},
 	destroyed() {
 		window.removeEventListener("resize", this.getHeight);
 	},
@@ -449,10 +453,10 @@
 			}
 		},
 	},
-    };
+};
 </script>
 <style scoped lang="less">
-    .edit {
+.edit {
 	height: 100%;
 	background-color: #eaedf5;
 	.tab-header {
@@ -465,17 +469,17 @@
 		.searchContent {
 			box-sizing: border-box;
 			padding: 0 20px;
-                /deep/ .el-radio-button__inner {
+			/deep/.el-radio-button__inner {
 				border: 1px solid #00CACD;
 				color: #00CACD;
 			}
-                /deep/ .el-radio-button__inner:hover {
+			/deep/.el-radio-button__inner:hover{
 				color: #00CACD;
 			}
-                /deep/ .is-active .el-radio-button__inner {
+			/deep/.is-active .el-radio-button__inner{
 				color: #fff;
 			}
-                /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+			/deep/.el-radio-button__orig-radio:checked+.el-radio-button__inner{
 				background-color: #00CACD;
 				border-color: #00CACD;
 			}
@@ -487,7 +491,7 @@
 		}
 		.radioBtn {
 			margin-left: 20px;
-                /deep/ .el-radio-button__inner {
+			/deep/.el-radio-button__inner {
 				border: 1px solid #dcdfe6;
 				border-radius: 4px;
 				box-shadow: 0 0 0 0 #409eff !important;
@@ -559,7 +563,7 @@
 						letter-spacing: 2px;
 					}
 				}
-                    .selectedZt {
+				.selectedZt{
 					background-color: #0091FF;
 					color: #fff;
 				}
@@ -595,12 +599,12 @@
 			}
 		}
 	}
-        .tab-content::-webkit-scrollbar {
+	.tab-content::-webkit-scrollbar{
 		width: 1px;
 	}
 	.btnGroup {
 		margin: 20px auto 0;
 		width: 230px;
 	}
-    }
+}
 </style>