From 0adb696e7fade5eeb02396e5d4bacf9355ca5e2e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 08 十月 2024 14:28:36 +0800
Subject: [PATCH] ''

---
 admin/src/views/platform/queueUp.vue |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 6b4a9b1..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,8 +44,35 @@
       <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 != 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>
+          <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>
@@ -86,7 +109,9 @@
   data() {
     return {
       filters: {},
-      activeGroup: {},
+      activeGroup: {
+        type: 2
+      },
       PlatGroupList: [],
       staticParam: {},
       dataList: [],
@@ -112,6 +137,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()
       })
     },
@@ -127,6 +158,7 @@
           } else {
             this.activeGroup = res[0]
           }
+
           this.getPlatformGroupWork()
           this.getList()
         }
@@ -174,13 +206,13 @@
       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
-        })
+      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
@@ -223,7 +255,7 @@
 
 .plate_id {
   display: flex;
-  width: 110px;
+  width: 120px;
   font-weight: 600;
   height: 30px;
   line-height: 30px;

--
Gitblit v1.9.3