From f0a07ef5c374d8fe5519e8ad460ab3d1c85ca776 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 14:52:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/queueUp.vue | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index b19f7ea..20aff75 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 v-if="activeGroup.type == 2" class="mb20" 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,13 +33,9 @@
</div>
</template>
</el-table-column>
- <el-table-column v-if="activeGroup.type == 2" prop="contractNum" label="鍚堝悓鍗曞彿" min-width="120" />
- <template v-else>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="120" />
- <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="120" />
- </template>
+ <el-table-column prop="contractNum" label="鍚堝悓鍗曞彿" min-width="120" />
<el-table-column prop="totalNum" label="鎬昏繍杈撻噺(涓囨敮)" min-width="110" />
- <el-table-column prop="driverName" label="椹鹃┒鍛�" min-width="130">
+ <el-table-column label="椹鹃┒鍛�" min-width="130">
<template slot-scope="{ row }">
<span class="mr10">{{ row.driverName }}</span>
<span>{{ row.drivierPhone }}</span>
@@ -48,12 +44,38 @@
<el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
<el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template slot-scope="{ row }">
- <el-button v-if="activeGroup.type != 2" type="text" @click="handleDetail(row)"
- v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
<el-button v-if="activeGroup.type == 2" type="text" @click="subDetail(row)">棰勭害璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
+ <el-table v-else class="mb20" 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 }">
+ <div class="plate_id">
+ <span>{{ row.carCodeFront.slice(0, 1) }}</span>
+ <span>{{ row.carCodeFront.slice(1, 2) }}</span>
+ <span>路</span>
+ <span>{{ row.carCodeFront.slice(2) }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="120" />
+ <el-table-column prop="totalNum" label="鎬昏繍杈撻噺(涓囨敮)" min-width="110" />
+ <el-table-column label="椹鹃┒鍛�" min-width="130">
+ <template slot-scope="{ row }">
+ <span class="mr10">{{ row.driverName }}</span>
+ <span>{{ row.drivierPhone }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
+ <el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
+ <template slot-scope="{ row }">
+ <el-button type="text" @click="handleDetail(row)"
+ v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination" />
<!-- -->
--
Gitblit v1.9.3