Merge remote-tracking branch 'origin/master'

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

@@ -199,10 +199,12 @@ export function getDetailInfo(zrzbsm,lx) {
 /**
 /**
  * 批量删除户基本信息表，data为一个数组List<String>
  * 批量删除户基本信息表，data为一个数组List<String>
  */
  */
-export function batchDeleteHByHbsms(data) {
+export function batchDelete(data) {
     return request({
     return request({
         url:'/system/qjH/batchDeleteHByBsms',
         url:'/system/qjH/batchDeleteHByBsms',
         method:'post',
         method:'post',
-        data:data
+        data:{
+            hbsms:data
+        }
     })
     })
 }
 }

@@ -40,6 +40,10 @@ table{
 table,tr,.el-col,.title{
 table,tr,.el-col,.title{
     border-color: #E6E6E6 !important;
     border-color: #E6E6E6 !important;
 }
 }
+//表格加边框
+.el-table{
+    border: 1px solid #E6E6E6;
+}
 .el-table th{
 .el-table th{
     background-color: #FBFBFB;
     background-color: #FBFBFB;
 }
 }

@@ -78,6 +78,13 @@
 							@click="batchCommit"
 							@click="batchCommit"
 							><i class="iconfont iconhuzhongxinlazong"></i>批量提交</el-button
 							><i class="iconfont iconhuzhongxinlazong"></i>批量提交</el-button
 						>
 						>
+						<el-button
+							class="radioBtn"
+							label="7"
+							border
+							@click="batchDelete"
+							><i class="iconfont iconhuzhongxinlazong"></i>批量删除</el-button
+						>
 					</div>
 					</div>
 				</el-col>
 				</el-col>
 			</el-row>
 			</el-row>
@@ -91,7 +98,7 @@
 			ref="tabContent"
 			ref="tabContent"
 			:style="{ height: lpbContentHight + 'px' }"
 			:style="{ height: lpbContentHight + 'px' }"
 			v-loading="lpbloading"
 			v-loading="lpbloading"
-			v-if="bjztFlag"
+			v-show="bjztFlag"
 		>
 		>
 			<!-- 左侧树结构 -->
 			<!-- 左侧树结构 -->
 			<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
 			<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
@@ -227,7 +234,7 @@
 			</div>
 			</div>
 		</div>
 		</div>
 
 
-        <xxxx v-if="!bjztFlag"></xxxx>
+        <xxxx v-show="!bjztFlag"></xxxx>
 
 
 		<!-- 右键菜单弹出框 -->
 		<!-- 右键菜单弹出框 -->
 		<el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%" >
 		<el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%" >
@@ -277,7 +284,7 @@ import addZdy from "./zdy/index";
 import addCh from "./ch/index";
 import addCh from "./ch/index";
 import editCinfo from "./c/index";
 import editCinfo from "./c/index";
 import lpbContent from "./lpbContent/index";
 import lpbContent from "./lpbContent/index";
-import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
+import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit,batchDelete} from "@api/lpb";
 import xxxx from '../xxxx/index'
 import xxxx from '../xxxx/index'
 
 
 export default {
 export default {
@@ -403,6 +410,7 @@ export default {
 		}, 100);
 		}, 100);
 	},
 	},
 	methods: {
 	methods: {
+		//批量提交
         batchCommit(){
         batchCommit(){
             if (this.bsms.length <= 0) {
             if (this.bsms.length <= 0) {
                 Message.warning("请选择操作户")
                 Message.warning("请选择操作户")
@@ -422,9 +430,27 @@ export default {
 				}
 				}
 			}
 			}
 		},
 		},
+		//批量删除
+		batchDelete(){ if (this.bsms.length <= 0) {
+                Message.warning("请选择操作户")
+                return
+            }else{
+				if (this.qsztList.indexOf('1') > -1) {
+					Message.warning("已提交的户无法继续操作")
+				}else{
+					batchDelete(this.bsms).then(res=>{
+						if(res.code === 200){
+							Message.success("删除成功");
+							this.getlpbData();
+						}else {
+							this.$message.error(res.message);
+						}
+					})
+				}
+			}
+		},
         loading(){
         loading(){
-            //this.getLpbMenuTree(this.$store.state.zrzbsm);
-			this.getlpbData();
+            this.getLpbMenuTree(this.$store.state.zrzbsm);
 		},
 		},
         openPlC(){
         openPlC(){
             if (this.cbsmList.length <= 0) {
             if (this.cbsmList.length <= 0) {

@@ -297,7 +297,7 @@
 		>
 		>
 			<li v-show="rightClickFlag == 'h'" @click="handleAddH">添加</li>
 			<li v-show="rightClickFlag == 'h'" @click="handleAddH">添加</li>
 			<li v-show="rightClickFlag == 'h'" @click="handleMoveH">移动</li>
 			<li v-show="rightClickFlag == 'h'" @click="handleMoveH">移动</li>
-			<li v-show="rightClickFlag == 'h'" @click="handleDeleteH">删除</li>
+			<!-- <li v-show="rightClickFlag == 'h'" @click="handleDeleteH">删除</li> -->
 			<li v-show="rightClickFlag == 'h'" @click="handleSyczh">实预测转换</li>
 			<li v-show="rightClickFlag == 'h'" @click="handleSyczh">实预测转换</li>
 			<li v-show="rightClickFlag == 'c'" @click="handleAddC('up')">
 			<li v-show="rightClickFlag == 'c'" @click="handleAddC('up')">
 				向上添加层
 				向上添加层