From 09132fa0cc6f9d9dba97e12b50700c2ef51a0b6e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 11:30:31 +0800
Subject: [PATCH] 月台屏
---
admin/src/views/platform/queueUp.vue | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 329fef3..6b4a9b1 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -23,7 +23,7 @@
</div>
<el-table 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="160">
+ <el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
<div class="plate_id">
<span>{{ row.carCodeFront.slice(0, 1) }}</span>
@@ -33,10 +33,13 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="200" />
- <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="200" />
- <el-table-column prop="totalNum" label="鎬昏繍杈撻噺(涓囨敮)" min-width="130" />
- <el-table-column prop="driverName" label="椹鹃┒鍛�" min-width="140">
+ <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="totalNum" label="鎬昏繍杈撻噺(涓囨敮)" min-width="110" />
+ <el-table-column prop="driverName" label="椹鹃┒鍛�" min-width="130">
<template slot-scope="{ row }">
<span class="mr10">{{ row.driverName }}</span>
<span>{{ row.drivierPhone }}</span>
@@ -45,7 +48,8 @@
<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="row.type != 4" type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
+ <el-button v-if="activeGroup != 2" type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
+ <el-button v-if="activeGroup == 2" type="text" @click="subDetail(row)" v-permissions="['business:company:update']">棰勭害璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -55,12 +59,14 @@
<PlatformSign ref="PlatformSignRef" v-if="isPlatformSign" @success="getPlatGroupList"
@close="isPlatformSign = false" />
<WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
+ <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import DriverDetail from "@/views/task/driverDetail.vue"
import {
getPlatformGroupList,
platformLineUpPage,
@@ -74,7 +80,8 @@
Pagination,
QueryForm,
PlatformSign,
- WaybillDetail
+ WaybillDetail,
+ DriverDetail
},
data() {
return {
@@ -84,6 +91,7 @@
staticParam: {},
dataList: [],
loading: false,
+ isShowDriver: false,
isPlatformSign: false,
pagination: {
pageSize: 10,
@@ -165,6 +173,15 @@
this.filters = {}
this.getList()
},
+ subDetail(row) {
+ this.isShowDriver = true
+ this.$nextTick(() => {
+ this.$refs.DriverDetailRef.id = row.objId
+ this.$refs.DriverDetailRef.type = row.objType
+ this.$refs.DriverDetailRef.getDetail()
+ this.$refs.DriverDetailRef.isShowModal = true
+ })
+ },
handleDetail(row) {
this.isShowDetail = true
this.$nextTick(() => {
@@ -206,7 +223,7 @@
.plate_id {
display: flex;
- width: 111px;
+ width: 110px;
font-weight: 600;
height: 30px;
line-height: 30px;
--
Gitblit v1.9.3