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

# Conflicts:
#	src/components/tanchuang/index.vue

@@ -142,3 +142,21 @@ export function deleteCollectBiz (bsmSqyw) {
         method: 'post'
     })
 }
+// 国有建设用地使用权/房屋使用权 -选择不动产单元
+export function choiceBdcdy (data) {
+    return request({
+        url: 'business/workFlow/choiceBdcdy',
+        method: 'post',
+        data,
+        showLoading: true
+    })
+}
+
+// 申请列表删除
+export function deleteBdcdy (data) {
+    return request({
+        url: 'business/workFlow/deleteBdcdy?sldybsm=' + data,
+        method: 'get',
+        showLoading: true
+    })
+}
\ No newline at end of file

@@ -56,20 +56,19 @@ export default {
   mounted () {
     //  计算滚动条高度
     setTimeout(() => {
-      if(this.btnShow){ //判断按钮的显影来决定是否需要计算高度
-        if(this.height == 'auto'){
+      if (this.btnShow) { //判断按钮的显影来决定是否需要计算高度
+        if (this.height == 'auto') {
           this.contentHeight = (this.$refs.contentRef.offsetHeight - 100) + 'px'
         }else{
-        this.contentHeight =(parseInt(this.height)-parseInt('100px'))+'px';
+          this.contentHeight = this.height
         }
+      } else {
+        if(this.height=='auto'){
+          this.contentHeight = this.$refs.contentRef.offsetHeight
         }else{
-        if(this.height == 'auto'){
-        this.contentHeight = this.$refs.contentRef.offsetHeight + 'px'
-      }else{
-        this.contentHeight =this.height
+          this.contentHeight = this.height
         }
       }
-      
     }, 500)
   },
   methods: {
@@ -132,7 +131,7 @@ export default {
 .ls-title {
   padding: 16px;
   color: #ffffff;
-  background: linear-gradient(3deg,#409EFF, transparent)
+  background: linear-gradient(-2deg, #409EFF, transparent; background: linear-gradient(3deg, #409EFF, transparent));
 }
 
 .ls-title .svg-icon {

+<!--
+  功能：申请单元列表批量删除
+  作者：calliope
+-->
+<template>
+  <div class='batchDel'>
+    <lb-table :column="columns" :data="dataList" :heightNum="500" :pagination="false">
+    </lb-table>
+  </div>
+</template>
+<script>
+
+export default {
+  components: {},
+  props: {
+    formData: {
+      type: Object,
+      default: {}
+    }
+  },
+  data () {
+    return {
+      columns: [
+        {
+          type: 'selection',
+          label: '全选'
+        },
+        {
+          label: '序号',
+          type: 'index',
+          width: '50',
+        },
+        {
+          prop: "status",
+          label: "状态",
+        },
+      ],
+      dataList: []
+    }
+  }
+}
+</script>
+<style scoped lang='scss'>
+
+</style>
\ No newline at end of file

@@ -6,9 +6,15 @@
   border: 1px solid #ebeef5;
   z-index: 100;
   @include flex;
+
   /deep/.el-tabs__header {
     margin-bottom: 0 !important;
   }
+
+  /deep/.el-menu-item {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .leftmenu {
@@ -24,6 +30,12 @@
     text-align: center;
   }
 
+  .batchDel {
+    float: right;
+    position: relative;
+    top: 3px;
+  }
+
   .title-detail {
     display: flex;
     flex-wrap: wrap;
@@ -115,8 +127,8 @@
 }
 
 .map-drawer {
-  width: 20px;
-  height: 79px;
+  width: 16px;
+  height: 70px;
   position: absolute;
   top: 30%;
   z-index: 99;

@@ -22,11 +22,16 @@
       <!-- 左侧菜单栏 -->
       <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
         <div v-if="this.isShowdrawer">
-          <div class="title">申请单元列表({{ unitData.length }})</div>
+          <div class="title">申请单元列表({{ unitData.length }})
+            <el-button type="text" class="batchDel" @click="handleBatchDel">批量删除</el-button>
+          </div>
           <el-menu :default-active="activeIndex" @select="unitClick">
             <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
+              <div>
                 <p>{{ item.bdcdyh }}</p>
                 <p class="title-detail">{{ item.zl }}</p>
+              </div>
+              <i class="el-icon-delete" v-if="unitData.length>1" @click.stop="handleDel(item)"></i>
             </el-menu-item>
           </el-menu>
         </div>
@@ -56,7 +61,7 @@
         </div>
       </div>
     </div>
-    <fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" />
+    <fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" @updateDialog="updateDialog" />
   </div>
 </template>
 
@@ -72,6 +77,7 @@ import {
   getNextLinkInfo,
   completeTask,
 } from "@/api/fqsq.js"
+import { deleteBdcdy } from "@/api/ywbl.js"
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 import { getForm } from "./flowform.js"
 import fqsqDialog from "@/views/ywbl/ywsq/slectBdc.vue"
@@ -124,6 +130,27 @@ export default {
     this.flowInitParam();
   },
   methods: {
+    // 更新列表
+    updateDialog () {
+      this.loadBdcdylist();
+    },
+    // 删除左侧列表
+    handleDel (item) {
+      deleteBdcdy(item.sldybsm).then(res => {
+
+      })
+    },
+    handleBatchDel () {
+      this.$popup({
+        title: '批量删除',
+        width: '50%',
+        btnShow: true,
+        editItem: 'workflow/components/batchDel',
+        formData: {},
+        cancel: function () { }, //取消事件的回调
+        confirm: function () { }, //确认事件的回调
+      })
+    },
     //加载流程初始参数
     flowInitParam () {
       var formdata = new FormData();
@@ -164,6 +191,7 @@ export default {
             this.imgSrc = URL.createObjectURL(res)
             this.$popup({
               title: '流程图',
+              btnShow: true,
               editItem: 'workflow/components/flowChart',
               formData: this.imgSrc
             })

@@ -171,7 +171,7 @@ export default {
       })
     },
     ywhClick (item) {
-      const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');
+      const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1' + '&sqywbm=' + item.djywbm);
       window.open(href, '_blank');
     }
   }

@@ -45,7 +45,7 @@ import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/fwsyq.js";
 import table from "@/utils/mixin/table";
 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
-import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
+import { selectFwsyq, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
 export default {
   mixins: [table, jump],
   props: {
@@ -96,6 +96,7 @@ export default {
         this.$message.error("请至少选择一条数据");
         return;
       }
+      if (!this.isJump) {
         startBusinessFlow({
           bsmSqyw: Cookies.get("bsmSqyw"),
           bdcdysz: this.bdcdysz,
@@ -108,15 +109,28 @@ export default {
               message: '发起申请成功',
               type: 'success'
             })
-          if (!this.isJump) {
             this.jump(res.result, this.djywbm)
           } else {
-            this.$emit('updateDialog', true)
+            this.$message.error(res.message);
           }
+        })
+      } else {
+        choiceBdcdy({
+          bsmSlsq: this.$route.query.bsmSlsq,
+          bdcdysz: this.bdcdysz
+        }).then(res => {
+          if (res.code == 200) {
+            this.$message({
+              showClose: true,
+              message: '发起申请成功',
+              type: 'success'
+            })
+            this.$emit('updateDialog', true)
           } else {
             this.$message.error(res.message);
           }
         })
+      }
     },
     handleSelectionChange (val) {
       this.bdcdysz = val

@@ -42,7 +42,7 @@ export default {
     },
     updateDialog () {
       this.$emit("input", false)
-      this.key++
+      this.$emit("updateDialog", true)
     }
   }
 }