707abb33 by renchao@pashanhoo.com

Merge branch 'dev'

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