From 10cd77285a9d54b0e889e2917c0a5e3e55e83cf6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 十月 2024 14:48:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/platform/components/PlatformQueuing.vue |   57 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/admin/src/views/platform/components/PlatformQueuing.vue b/admin/src/views/platform/components/PlatformQueuing.vue
index 973220c..a82175c 100644
--- a/admin/src/views/platform/components/PlatformQueuing.vue
+++ b/admin/src/views/platform/components/PlatformQueuing.vue
@@ -20,13 +20,13 @@
             <div class="status">{{ statusMap[item.status] }}</div>
           </div>
           <div class="info">
-            <div v-if="item.type == 4" class="ite">
-              <span>鍚堝悓鍗曞彿锛�</span>
-              <span>{{ item.contractNum }}</span>
-            </div>
-            <div v-else class="ite">
+            <div v-if="item.billCode" class="ite">
               <span>杩愯緭鍗曞彿锛�</span>
               <span>{{ item.billCode }}</span>
+            </div>
+            <div v-else class="ite">
+              <span>鍚堝悓鍗曞彿锛�</span>
+              <span>{{ item.contractNum }}</span>
             </div>
             <div class="ite">
               <span>椹鹃┒鍛橈細</span>
@@ -40,21 +40,24 @@
               <span>鎬昏繍杈撻噺锛�</span>
               <span>{{ item.totalNum }}涓囨敮</span>
             </div>
-            <div v-if="item.type != 4" class="ite" style="width: 66%">
+            <div v-if="item.billCode" class="ite" style="width: 66%">
               <span>杩愯緭鍏徃锛�</span>
               <span>{{ item.carrierName }}</span>
             </div>
           </div>
           <div class="footer df_sb">
-            <div v-if="item.type != 4" class="detail">杩愬崟璇︽儏</div>
-            <div v-else></div>
-            <el-button type="primary" @click="handleCall(item)">鍙彿</el-button>
+            <div v-if="item.billCode" @click="handleDetail(item)" class="detail">杩愬崟璇︽儏</div>
+            <div v-else class="detail"  @click="subDetail(item)">棰勭害璇︽儏</div>
+            <el-button v-preventReClick :loading="loadingCall" type="primary" @click="handleCall(item)">鍙彿</el-button>
           </div>
         </div>
       </div>
       <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination">
       </pagination>
     </div>
+    <!--  -->
+    <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
+    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
   </GlobalWindow>
 </template>
 
@@ -64,10 +67,14 @@
 import { platformCallList, platformCallNumber, platformInPark } from '@/api'
 import { statusMap } from '../config'
 import { Message } from 'element-ui'
+import WaybillDetail from './WaybillDetail.vue'
+import DriverDetail from "@/views/task/driverDetail.vue"
 export default {
   components: {
     GlobalWindow,
-    Pagination
+    Pagination,
+    WaybillDetail,
+    DriverDetail
   },
   data() {
     return {
@@ -83,30 +90,54 @@
       title: '',
       callType: '1',
       activePlat: {},
-      dataList: []
+      dataList: [],
+      isShowDetail: false, // 杩愬崟璇︽儏
+      isShowDriver: false, // 棰勭害璇︽儏
+      loadingCall: false
 
     }
   },
   methods: {
     handleCall(item) {
       const { activePlat, callType } = this
+      this.loadingCall = true
       if (callType == 1) { // 鍏ュ洯鍙彿
         platformInPark({
           jobId: item.id,
           platformId: activePlat.id
         }).then(() => {
+          this.loadingCall = false
           Message.success('鍙彿鎴愬姛')
           this.$emit('success')
           this.getList()
-        })
+        },() => {this.loadingCall = false})
       } else {
+        this.loadingCall = true
         platformCallNumber({ platformId: activePlat.id, jobId: item.id }).then(res => {
+          this.loadingCall = false
           Message.success('鍙彿鎴愬姛')
           this.$emit('success')
           this.getList()
-        })
+        },()=> {this.loadingCall = false})
       }
     },
+    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()
+      })
+    },
     getList() {
       const { activePlat, pagination, carCodeFront, callType } = this
       platformCallList({

--
Gitblit v1.9.3