From 8db235ea53d0909dff13844dcb2aa258fe9e6f7c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 15:47:09 +0800
Subject: [PATCH] ''
---
admin/src/views/operation/serviceCar/apprConfig.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index 4e203a3..c860674 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -32,13 +32,13 @@
<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"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</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 }} {{ item.objIds[0].companyName }}绛�</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <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>
@@ -286,7 +286,7 @@
item.active = true
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
- return i.id + '-' + i.name
+ return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
})
this.$set(this.searchForm, 'objIds', objIds)
} else {
@@ -307,18 +307,19 @@
item.objIds = item.memberList.map(i => {
return {
id: i.id,
- name: i.name
+ name: i.name,
+ companyName: i.companyName
}
})
}
})
this.apprList = arr
+ this.flowClick(0)
+ this.$forceUpdate()
}
// console.log(res);
})
- this.flowClick(0)
- this.$forceUpdate()
},
onSubmit () {
const { apprList, activeType } = this
--
Gitblit v1.9.3