Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -4,7 +4,8 @@
 -->
 <template>
   <div class='batchDel'>
-    <lb-table :column="columns" :data="formData.dataList" :heightNum="500" :pagination="false"  @selection-change="handleSelectionChange">
+    <lb-table :column="columns" :data="formData.dataList" :maxHeight="460" :heightNumSetting="true" :pagination="false"
+      @selection-change="handleSelectionChange">
     </lb-table>
   </div>
 </template>
@@ -43,15 +44,15 @@ export default {
       selectBdcdy: [],
     }
   },
-  methods:{
-    childFn(){
+  methods: {
+    childFn () {
       deleteBdcdy({
         bsmSlsq: this.formData.bsmSlsq,
         bsmSldyList: this.selectBdcdy
       }).then(res => {
-        if(res.code == 200){
+        if (res.code == 200) {
           this.$message.success("删除成功");
-        }else{
+        } else {
           this.$message.error(res.message)
         }
       })
@@ -60,7 +61,7 @@ export default {
       this.selectBdcdy = [];
       e.forEach((item, index) => {
         this.selectBdcdy.push(item.bsmSldy)
-      })      
+      })
     }
   }
 }

@@ -44,6 +44,8 @@
 
   ul {
     position: relative;
+    height: calc(100vh - 120px);
+    overflow-y: scroll;
 
     .xian {
       background: #f2f2f2;
@@ -60,8 +62,11 @@
       font-size: 14px;
       line-height: 20px;
       cursor: pointer;
-      display: flex;
-      flex-direction: column;
+
+      div {
+        display: flex;
+        flex-direction: column;
+      }
     }
 
     li:hover {
@@ -73,6 +78,7 @@
 
 .animation-map-drawer {
   width: 260px;
+  height: calc(100% - 80px);
 }
 
 /deep/.el-menu-item {

@@ -145,9 +145,9 @@ export default {
           bsmSlsq: this.bsmSlsq,
           bsmSldyList: item.bsmSldy.split(',')
         }).then(res => {
-          if(res.code == 200){
+          if (res.code == 200) {
             this.$message.success("删除成功");
-            this.updateDialog();
+            this.loadBdcdylist();
           }else{
             this.$message.error(res.message)
           }
@@ -166,13 +166,14 @@ export default {
         width: '50%',
         btnShow: true,
         editItem: 'workflow/components/batchDel',
+        height: '600px',
         formData: {
           bsmSlsq: this.bsmSlsq,
           dataList: this.unitData
         },
         cancel: function () { }, //取消事件的回调
         confirm: function () { 
-          that.updateDialog();
+          that.loadBdcdylist();
         }, //确认事件的回调
       })
     },

@@ -25,8 +25,10 @@
           <div class="title">申请单元列表({{ unitData.length }})</div>
           <el-menu :default-active="activeIndex" @select="unitClick">
             <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
-              <p>{{ item.bdcdyh }}</p>
-              <p class="title-detail">{{ item.zl }}</p>
+              <div>
+                <p>{{ item.bdcdyh }}</p>
+                <p class="title-detail">{{ item.zl }}</p>
+              </div>
             </el-menu-item>
           </el-menu>
         </div>