From cf77e6b94c5a2e2d4d992b9222c857bafde0111e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 09:46:51 +0800
Subject: [PATCH] 最新版本

---
 admin/src/views/platform/queueUp.vue |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 4b2d2f3..b19f7ea 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,19 +33,24 @@
           </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>
         </template>
       </el-table-column>
       <el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
-      <el-table-column label="鎿嶄綔" width="100" fixed="right">
+      <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>
+          <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>
@@ -55,12 +60,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,16 +81,20 @@
     Pagination,
     QueryForm,
     PlatformSign,
-    WaybillDetail
+    WaybillDetail,
+    DriverDetail
   },
   data() {
     return {
       filters: {},
-      activeGroup: {},
+      activeGroup: {
+        type: 2
+      },
       PlatGroupList: [],
       staticParam: {},
       dataList: [],
       loading: false,
+      isShowDriver: false,
       isPlatformSign: false,
       pagination: {
         pageSize: 10,
@@ -104,6 +115,12 @@
       this.$nextTick(() => {
         this.$refs.PlatformSignRef.isShowModal = true
         this.$refs.PlatformSignRef.activePlat = this.activeGroup
+        this.$refs.PlatformSignRef.carCodeFront = ''
+        this.$refs.PlatformSignRef.pagination = {
+          total: 0,
+          pageSize: 10,
+          page: 1
+        }
         this.$refs.PlatformSignRef.getList()
       })
     },
@@ -119,6 +136,7 @@
           } else {
             this.activeGroup = res[0]
           }
+
           this.getPlatformGroupWork()
           this.getList()
         }
@@ -165,10 +183,21 @@
       this.filters = {}
       this.getList()
     },
+    subDetail(row) {
+      this.isShowDriver = true
+      this.$nextTick(() => {
+        this.$refs.DriverDetailRef.id = row.bookId
+        this.$refs.DriverDetailRef.type = row.objType
+        this.$refs.DriverDetailRef.getDetail()
+        this.$refs.DriverDetailRef.isShowModal = true
+      })
+    },
     handleDetail(row) {
       this.isShowDetail = true
       this.$nextTick(() => {
         this.$refs.WaybillDetailRef.isShowModal = true
+        this.$refs.WaybillDetailRef.id = row.id
+        this.$refs.WaybillDetailRef.getDetail()
       })
     },
   }
@@ -204,7 +233,7 @@
 
 .plate_id {
   display: flex;
-  width: 111px;
+  width: 120px;
   font-weight: 600;
   height: 30px;
   line-height: 30px;

--
Gitblit v1.9.3