From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/approvalConfiguration.vue | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index eba5df1..f894e52 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -30,18 +30,57 @@
>
<div class="head">{{ item.remark }}</div>
<div class="content">
- <div v-if="item.objIds && item.objIds.length === 1 ">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
- </div>
- <div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} 绛�</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
- </div>
- <div v-else>璇烽�夋嫨</div>
- <i class="el-icon-arrow-right"></i>
+ <!-- 瀹℃壒 -->
+ <template v-if="item.type == 0">
+ <template v-if="item.memberType == '0'">
+ <div>琚浜�</div>
+ </template>
+ <template v-if="item.memberType == '2'">
+ <div>閮ㄩ棬涓荤</div>
+ </template>
+ <template v-if="item.memberType == '1'">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i class="el-icon-arrow-right"></i>
+ </template>
+ </template>
+ <!-- 鎶勯�� -->
+ <template v-if="item.type == 1">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i
+ v-if="item.memberType == '1'"
+ class="el-icon-arrow-right"
+ ></i>
+ </template>
</div>
</div>
<div class="arrows">
@@ -72,12 +111,12 @@
<template v-if="apprList[activeIndex].type == '1'">
<div class="config_data_item_reviewed_content">
<div
- v-for="mem in apprList[activeIndex].objIds"
+ v-for="mem, memIndex in apprList[activeIndex].objIds"
:key="mem.id"
class="config_data_item_reviewed_content_item"
>
<span>{{ mem.name }}</span>
- <i class="el-icon-close"></i>
+ <i @click="memDel(memIndex)" class="el-icon-close"></i>
</div>
<span class="add" @click="selStaff">+娣诲姞</span>
</div>
@@ -277,6 +316,7 @@
this.apprList.forEach((item, index) => {
if (i === index) {
item.active = true
+ console.log("====================",item.objIds)
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
@@ -304,6 +344,8 @@
companyName: i.companyName
}
})
+ }else{
+ item.objIds = []
}
})
this.apprList = arr
--
Gitblit v1.9.3