From 22c4be57bd51aac52f872e52c4a9a1b4c24ca625 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 10 三月 2025 18:14:21 +0800
Subject: [PATCH] ll

---
 admin/src/views/platform/queueUp.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index eb4b0b1..40d2439 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)"
@@ -112,9 +119,11 @@
 } from '@/api'
 import { queryQueueUpConfig } from './config'
 import WaybillDetail from './components/WaybillDetail.vue'
-import DriverDetail from "@/views/task/driverDetail.vue"
+import DriverDetail from '@/views/task/driverDetail.vue'
 import PlatformSign from './components/PlatformSign.vue'
+import BaseComputHeight from '@/components/base/BaseComputHeight'
 export default {
+  extends: BaseComputHeight,
   components: {
     Pagination,
     QueryForm,

--
Gitblit v1.9.3