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 | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index a8ef660..0b49a6c 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -11,13 +11,14 @@
filterable
clearable
multiple
+ style="width: 250px"
placeholder="閫夋嫨閮ㄩ棬鎴愬憳"
>
<el-option
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="绂佺敤" /> -->
@@ -67,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>
@@ -84,8 +85,8 @@
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
<!-- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="imgurl" label="浼氳瀹ゅ浘鐗�" min-width="100px"></el-table-column>
--
Gitblit v1.9.3