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

@@ -155,8 +155,9 @@ export function choiceBdcdy (data) {
 // 申请列表删除
 export function deleteBdcdy (data) {
     return request({
-        url: 'business/workFlow/deleteBdcdy?sldybsm=' + data,
-        method: 'get',
+        url: 'business/workFlow/deleteBdcdy',
+        method: 'post',
+        data,
         showLoading: true
     })
 }
\ No newline at end of file

@@ -59,9 +59,15 @@ export default {
       if (this.btnShow) { //判断按钮的显影来决定是否需要计算高度
         if (this.height == 'auto') {
           this.contentHeight = (this.$refs.contentRef.offsetHeight - 100) + 'px'
+        }else{
+          this.contentHeight = this.height
         }
       } else {
-        this.contentHeight = (parseInt(this.height) - parseInt('100px')) + 'px';
+        if(this.height=='auto'){
+          this.contentHeight = this.$refs.contentRef.offsetHeight
+        }else{
+          this.contentHeight = this.height
+        }
       }
     }, 500)
   },
@@ -153,9 +159,9 @@ export default {
 
 /deep/.closeStyle {
   position: absolute;
-  top: 17px;
-  right: 12px;
-  font-size: 20px;
+  top: 13px;
+  right: 26px;
+  font-size: 24px;
   cursor: pointer;
   color: #409EFF;
 }

@@ -202,7 +202,7 @@ export default {
   height: 48px;
   line-height: 48px;
   width: 100%;
-  background: #fff;
+  background: #EDF1F7;
   border-bottom: 1px solid #E4EBF4;
   box-shadow: 0 1px 3px 0 rgba(147, 173, 209, 0.12);
 
@@ -216,6 +216,8 @@ export default {
         top: 8px;
         height: 33px;
         z-index: 1;
+        background: #EDF1F7!important;
+
       }
 
       .pane-mask-left {
@@ -237,14 +239,12 @@ export default {
       cursor: pointer;
       height: 31px;
       line-height: 29px;
-      border: 1px solid #e4ebf4;
       color: #686666;
-      background: #fff;
-      padding: 0 10px 0 10px;
+      background: #D8DFE6;
+      padding: 0 20px 0 20px;
       font-size: 16px;
       margin-top: 5px;
-      border-radius: 4px;
-
+      border-radius: 8px 8px 0 0;
       &:first-of-type {
         margin-left: 15px;
       }
@@ -254,8 +254,8 @@ export default {
       }
 
       &.active {
-        border-color: #0f93f6;
-        color: #4a4a4a;
+        color: #0f93f6;
+        background: #ffffff;
         // &::before {
         //   content: '';
         //   background: #0F93F6;
@@ -267,6 +267,7 @@ export default {
         //   margin-right: 2px;
         // }
       }
+    
     }
   }
 

@@ -16,6 +16,7 @@ const service = axios.create({
         //admin:bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO
         //renc:bearer AT-30-KHB4LXc8-CZXwBEyaFJa9lRmMTc5sHVI
         //tianh:bearer AT-33-3zFTGkhQ4eUv4nXvzAmbgN5RPZppzEY6
+        //zhangh:bearer AT-7-Tx8dlZH0LNRc33UjD1CX1xwa-1D7kQmQ
     },
     timeout: 15000
 })

@@ -4,12 +4,12 @@
 -->
 <template>
   <div class='batchDel'>
-    <lb-table :column="columns" :data="dataList" :heightNum="500" :pagination="false">
+    <lb-table :column="columns" :data="formData.dataList" :heightNum="500" :pagination="false"  @selection-change="handleSelectionChange">
     </lb-table>
   </div>
 </template>
 <script>
-
+import { deleteBdcdy } from "@/api/ywbl.js"
 export default {
   components: {},
   props: {
@@ -31,11 +31,36 @@ export default {
           width: '50',
         },
         {
-          prop: "status",
-          label: "状态",
+          prop: "bdcdyh",
+          label: "不动产单元号",
+        },
+        {
+          prop: "zl",
+          label: "坐落",
         },
       ],
-      dataList: []
+      dataList: [],
+      selectBdcdy: [],
+    }
+  },
+  methods:{
+    childFn(){
+      deleteBdcdy({
+        bsmSlsq: this.formData.bsmSlsq,
+        bsmSldyList: this.selectBdcdy
+      }).then(res => {
+        if(res.code == 200){
+          this.$message.success("删除成功");
+        }else{
+          this.$message.error(res.message)
+        }
+      })
+    },
+    handleSelectionChange (e) {
+      this.selectBdcdy = [];
+      e.forEach((item, index) => {
+        this.selectBdcdy.push(item.bsmSldy)
+      })      
     }
   }
 }

@@ -23,7 +23,7 @@
       <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
         <div v-if="this.isShowdrawer">
           <div class="title">申请单元列表({{ unitData.length }})
-            <el-button type="text" class="batchDel" @click="handleBatchDel">批量删除</el-button>
+            <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length>1">批量删除</el-button>
           </div>
           <el-menu :default-active="activeIndex" @select="unitClick">
             <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
@@ -136,19 +136,44 @@ export default {
     },
     // 删除左侧列表
     handleDel (item) {
-      deleteBdcdy(item.sldybsm).then(res => {
-
+      this.$confirm('确定要删除吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteBdcdy({
+          bsmSlsq: this.bsmSlsq,
+          bsmSldyList: item.bsmSldy.split(',')
+        }).then(res => {
+          if(res.code == 200){
+            this.$message.success("删除成功");
+            this.updateDialog();
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },
     handleBatchDel () {
+      let that = this;
       this.$popup({
         title: '批量删除',
         width: '50%',
         btnShow: true,
         editItem: 'workflow/components/batchDel',
-        formData: {},
+        formData: {
+          bsmSlsq: this.bsmSlsq,
+          dataList: this.unitData
+        },
         cancel: function () { }, //取消事件的回调
-        confirm: function () { }, //确认事件的回调
+        confirm: function () { 
+          that.updateDialog();
+        }, //确认事件的回调
       })
     },
     //加载流程初始参数