From e02c14b53ecda4912fc93c7f83b1dcb4bb7a3999 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 01 七月 2025 14:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/platformGroup.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/platform/platformGroup.vue b/admin/src/views/platform/platformGroup.vue
index 52fb60f..1abb876 100644
--- a/admin/src/views/platform/platformGroup.vue
+++ b/admin/src/views/platform/platformGroup.vue
@@ -7,6 +7,7 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:platformgroup:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -26,8 +27,10 @@
<span v-if="row.type == 2">甯傚叕鍙稿嵏璐�</span>
</template>
</el-table-column>
- <el-table-column prop="waitCallTime" label="鍙彿绛夊緟鏃堕棿锛堝垎閽燂級" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="waitCallTime" label="鍙彿绛夊緟鏃堕棿锛堝垎閽燂級" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="signInNoticeUserNames" label="绛惧埌閫氱煡浜哄憳" min-width="200px" align="center"></el-table-column>
+ <el-table-column prop="unFinishNoticeUserNames" label="鏈畬鎴愪綔涓氶�氱煡浜哄憳" min-width="200px" align="center"></el-table-column>
+ <el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="150px" align="center"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformgroup:update', 'business:platformgroup:delete'])"
label="鎿嶄綔"
--
Gitblit v1.9.3