From 6cfd5d9a0c8f7bacbe2d3d1b1d84511207789ca6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 三月 2025 19:55:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/platform/queueUp.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 149d15d..64659a1 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="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
<template v-slot="scope">
<span>{{ scope.row.carrierName || '-' }}</span>
</template>
@@ -57,7 +57,8 @@
<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 == 2" class="red">鏈堝彴绛夊緟</span> -->
+ <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>
@@ -119,9 +120,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,
@@ -210,7 +213,7 @@
},
handleSizeChange(e) {
this.pagination.pageSize = e
- this.getList()
+ this.getList(1)
},
handlePageChange(e) {
this.pagination.page = e
--
Gitblit v1.9.3