707abb33 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents a56e0a07 a55c2cfb
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2024-01-25 13:40:13
* @LastEditTime: 2024-01-25 14:21:36
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -13,7 +13,7 @@
<div v-if="this.isShowdrawer">
<div class="title">
申请单元列表({{ unitData.length }})
<!-- <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button> -->
<el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1&& isDel">批量删除</el-button>
</div>
<el-menu v-model="activeIndex" :default-active="activeIndex" :key="key" @select="unitClick">
<el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
......@@ -25,7 +25,7 @@
<p v-else class="title-detail">{{ item.qllxmc }}</p>
</el-tooltip>
</div>
<!-- <i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1'" @click.stop="handleDel(item)"></i> -->
<i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1' && isDel" @click.stop="handleDel(item)"></i>
</el-menu-item>
</el-menu>
</div>
......@@ -45,6 +45,12 @@
import { mapGetters } from 'vuex'
import { leftMenu, deleteSlbdcdy, jdcxLeftMenu } from "@/api/workFlow.js"
export default {
props: {
isDel: {
type: Boolean,
default: true
}
},
data () {
return {
key: 0,
......
<!--
* @Description: workFrame左侧菜单列表-分割
* @Autor: renchao
* @LastEditTime: 2024-01-25 13:40:28
* @LastEditTime: 2024-01-25 14:21:44
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -23,7 +23,7 @@
<p class="title-detail">{{ item.zl }}</p>
</el-tooltip>
</div>
<!-- <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item,'around')"></i> -->
<i class="el-icon-delete" v-if="aroundUnitData.length > 1 && isDel" @click.stop="handleDel(item,'around')"></i>
</el-menu-item>
</el-menu>
<!-- 变更后单元 -->
......@@ -39,7 +39,7 @@
<p class="title-detail">{{ item.zl }}</p>
</el-tooltip>
</div>
<!-- <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item, 'after')"></i> -->
<i class="el-icon-delete" v-if="afterUnitData.length > 1 && isDel" @click.stop="handleDel(item, 'after')"></i>
</el-menu-item>
</el-menu>
</div>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-23 10:21:28
* @LastEditTime: 2024-01-25 14:22:07
-->
<template>
<div class="container">
......@@ -26,8 +26,8 @@
<!-- 内容框架 -->
<div class="containerFrame">
<!-- 左侧菜单栏 区分业务-->
<segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" />
<ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
<segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" :isDel="false" @getCurrentSelectProps="getCurrentSelectProps" />
<ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" :isDel="false" />
<div class="leftCon">
<!-- 分屏左侧预览 -->
......