From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/meeting/rooms.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index d75760a..0b49a6c 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -18,7 +18,7 @@
v-for="item in userList"
:key="item.id"
:value="item.id"
- :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+ :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
></el-option>
<!-- :label="`${item.department.name}-${item.realname}`" -->
<!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
@@ -68,7 +68,7 @@
</el-table-column>
<el-table-column prop="limitNum" label="鍙�夋湇鍔￠」" align="center" min-width="140px" show-overflow-tooltip>
<template slot-scope="{row}">
- <div class="long-title-style">{{ row.projectList.map(item => item.projectName).join('|') }}</div>
+ <div class="long-title-style">{{ row.projectList.map(item => item.projectName).join(' | ') }}</div>
</template>
</el-table-column>
--
Gitblit v1.9.3