From 9f4d96b920b842ecf7b4149b7c85b980dcbb3613 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 三月 2025 10:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/queueUp.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index eb4b0b1..3ddafb0 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@
<span></span>
</div>
</div>
- <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="index" label="搴忓彿" width="80" />
<el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
@@ -33,7 +33,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="120">
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
<template v-slot="scope">
<span>{{ scope.row.carrierName || '-' }}</span>
</template>
@@ -55,6 +55,13 @@
</template>
</el-table-column>
<el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
+ <el-table-column label="鐘舵��" align="center" width="80">
+ <template slot-scope="{ row }">
+ <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span>
+ <span v-if="row.status == 3" class="primaryColor">鍏ュ洯绛夊緟</span>
+ <span v-if="row.status == 7" class="primaryColor">杞Щ涓�</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template slot-scope="{ row }">
<el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
--
Gitblit v1.9.3