Merge remote-tracking branch 'origin/master'

@@ -84,13 +84,14 @@ export function getLpbTj (data) {
  * zrzbsm 自然幢标识码 ,
  * dpdm 自然幢号 ,
  */
-export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
+export function batchGeneratorBdcdyh (dpdm,zrzbsm,override) {
     return request({
         url: 'system/generator/batchGeneratorBdcdyh',
         method: 'get',
         params: {
             zrzbsm:zrzbsm,
             dpdm:dpdm,
+            override:override
         },
     })
 }

@@ -235,6 +235,7 @@
 				</template>
 				<template v-if="!hasSyqx">
 					<el-col
+						class="pr10"
 						:span="5"
 						:key="childIndex + '7'"
 						:class="childIndex > 0 ? 'childYT' : ''"
@@ -295,6 +296,7 @@
 						</ul>
 					</el-col>
 					<el-col
+						class="pr10"
 						:span="5"
 						:key="childIndex + '5'"
 						:class="childIndex > 0 ? 'childYT' : ''"

@@ -35,7 +35,7 @@
                 </el-table-column> -->
                 <el-table-column label="操作" align="center" width="100">
                     <template slot-scope="scope">
-                        <el-tooltip class="item" effect="light" content="办理" placement="top">
+                        <el-tooltip class="item" effect="light" content="查看" placement="top">
                             <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
                         </el-tooltip>
                         <el-tooltip class="item" effect="light" content="定位" placement="top">

@@ -630,16 +630,60 @@ export default {
 		//批量添加不动产单元号
 		addBdcdyh() {
 			// this.pd[0].bsm //自然幢标识码
-			batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm).then(
+			batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then(
 				(res) => {
 					if (res.code === 200) {
 						this.$message.success("生成完成！");
-					} else {
-						this.$message.warning(res.message);
+					} else if(res.code === 206){
+						let hasGenerateCount = res.result.hasGenerateCount;
+						let unGenerateCount = res.result.unGenerateCount;
+						this.open(hasGenerateCount,unGenerateCount);
 					}
 				}
 			);
 		},
+
+		open(hasGenerateCount,unGenerateCount) {
+			const h = this.$createElement;
+			this.$msgbox({
+				title: '消息',
+				message: h('p', null, [
+					h('span', null, '未生成单元号有 '+unGenerateCount+'户,'),
+					h('span', null, '已经生成单元号有 '+hasGenerateCount+'户,'),
+					h('span', null, '是否覆盖全部重新生成？'),
+				]),
+				showCancelButton: true,
+				confirmButtonText: '覆盖全部生成',
+				cancelButtonText: '跳过已生成单元号户',
+				beforeClose: (action, instance, done) => {
+					if (action === 'confirm') {
+						instance.confirmButtonLoading = true;
+						instance.confirmButtonText = '执行中...';
+						setTimeout(() => {
+							done();
+							setTimeout(() => {
+								batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,2).then(
+									(res) => {
+										if (res.code === 200) {
+											this.$message.success("生成完成！");
+										}
+									});
+								instance.confirmButtonLoading = false;
+							}, 300);
+						}, 3000);
+					} else {
+						batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,1).then(
+								(res) => {
+									if (res.code === 200) {
+										this.$message.success("生成完成！");
+									}
+								});
+						done();
+					}
+				}
+			})
+		},
+
 		//获取各项单元状态统计数据
 		getDyztBsmList() {
 			let data = {

@@ -146,12 +146,12 @@
                 </tr>
 
                 <tr v-for="(item1,index) in form.fwytList" :key="index">
-                    <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan"  id="ytTitle">
-                        <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
+                    <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright"  id="ytTitle">
+                        <el-button type="primary" class="inAdd addMinus" size="mini" style="margin-right: 8px" @click="addYtInfo">+</el-button>
                         <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;用途<i class="requisite">*</i></span>
                     </td>
 
-                    <td  colspan="1" style="min-width:120px">
+                    <td  colspan="1" style="min-width:120px" class="tdright">
                         <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
                         规划用途
                     </td>
@@ -171,7 +171,7 @@
                                 v-model="item1.fwytzdbsm"
                         ></el-select-tree>
                     </td>
-                    <td colspan="2" >用途</td>
+                    <td colspan="2" class="tdright">用途</td>
                     <td colspan="4" >
                         <el-select-tree  style="width:100%"
                                 ref="yt"
@@ -190,12 +190,12 @@
                 </tr>
 
                 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
-                    <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
-                        <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
+                    <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" class="tdright">
+                        <el-button type="primary" class="inAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
                         <span>房屋结构<i class="requisite">*</i></span>
                     </td>
-                    <td colspan="1" >
-                        <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
+                    <td colspan="1" class="tdright">
+                        <el-button type="primary" class="inMinus addMinus" size="mini"  style="margin-right: 8px" @click="deleteFwjgInfo(index)">-</el-button>
                         <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
                     </td>
                     <td colspan="9"  >