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/index.vue |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/admin/src/views/platform/index.vue b/admin/src/views/platform/index.vue
index 8f4bacf..8ecaeba 100644
--- a/admin/src/views/platform/index.vue
+++ b/admin/src/views/platform/index.vue
@@ -62,13 +62,13 @@
               </div>
             </div>
             <div class="line">
-              <div v-if="task.type == 4" class="ite">
-                <span>鍚堝悓鍗曞彿锛�</span>
-                <span>{{ task.contractNum }}</span>
-              </div>
-              <div v-else class="ite">
+              <div v-if="task.billCode" class="ite">
                 <span>杩愯緭鍗曞彿锛�</span>
                 <span>{{ task.billCode }}</span>
+              </div>
+              <div v-else class="ite">
+                <span>鍚堝悓鍗曞彿锛�</span>
+                <span>{{ task.contractNum }}</span>
               </div>
               <div class="ite siji">
                 <span>椹鹃┒鍛橈細</span>
@@ -82,25 +82,25 @@
                 <span>鎬昏繍杈撻噺锛�</span>
                 <span>{{ task.totalNum }}涓囨敮</span>
               </div>
-              <div v-if="task.type != 4" class="ite" style="width: 66.6%">
+              <div v-if="task.billCode" class="ite" style="width: 66.6%">
                 <span>杩愯緭鍏徃锛�</span>
                 <span>{{ task.carrierName }}</span>
               </div>
               <div class="ite"></div>
             </div>
             <div class="line">
-              <div v-if="task.type != 4" class="left">
-                <span class="primaryColor pointer" @click="handleDetail(task)">杩愬崟璇︽儏</span>
+              <div class="left">
+                <span v-if="task.billCode" class="primaryColor pointer" @click="handleDetail(task)">杩愬崟璇︽儏</span>
+                <span v-else class="primaryColor pointer" @click="subDetail(task)">棰勭害璇︽儏</span>
               </div>
-              <div v-else></div>
               <div class="right">
                 <el-button v-if="task.status == 5" plain @click="handleErr(task)">寮傚父鎸傝捣</el-button>
                 <el-button v-if="task.status == 5 || task.status == 8" plain
                   @click="handleTransform(item, task)">杞Щ鏈堝彴</el-button>
                 <el-button v-if="task.status == 4" plain @click="handlePass(task)">杩囧彿</el-button>
-                <el-button v-if="task.status == 5 || task.status == 8" type="primary"
+                <el-button v-preventReClick :loading="loadingFinish" v-if="task.status == 5 || task.status == 8" type="primary"
                   @click="handleFinish(task)">浣滀笟瀹屾垚</el-button>
-                <el-button v-if="task.status == 4" type="primary" @click="handleWork(task)">寮�濮嬩綔涓�</el-button>
+                <el-button v-preventReClick :loading="loadingOpen" v-if="task.status == 4" type="primary" @click="handleWork(task)">寮�濮嬩綔涓�</el-button>
               </div>
             </div>
           </div>
@@ -135,6 +135,7 @@
     <PlatformQueuing ref="PlatformQueuingRef" v-if="isShowQueuing" @success="getPlatGroupList"
       @close="isShowQueuing = false" />
     <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
+    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
     <el-dialog title="杞Щ鏈堝彴" :visible.sync="isShowTransform" width="500px" style="margin-top: 12vh">
       <div class="df_ac">
         <span>閫夋嫨杞Щ鍒扮殑鏈堝彴锛�</span>
@@ -145,7 +146,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="isShowTransform = false">鍙栨秷</el-button>
-        <el-button type="primary" @click="transformSub">纭畾</el-button>
+        <el-button v-preventReClick type="primary" @click="transformSub">纭畾</el-button>
       </span>
     </el-dialog>
   </div>
@@ -165,16 +166,18 @@
 } from '@/api'
 import PlatformQueuing from './components/PlatformQueuing.vue'
 import WaybillDetail from './components/WaybillDetail.vue'
+import DriverDetail from "@/views/task/driverDetail.vue"
 import GlobalWindow from '@/components/common/GlobalWindow'
 import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
-import { Message } from 'element-ui'
+import { Loading, Message } from 'element-ui'
 import { statusMap } from './config'
 dayjs.extend(duration)
 export default {
   components: {
     PlatformQueuing,
     WaybillDetail,
+    DriverDetail,
     GlobalWindow
   },
   data() {
@@ -194,9 +197,13 @@
 
       setParam: {},
       isShowDetail: false, // 杩愬崟璇︽儏
+      isShowDriver: false, // 棰勭害璇︽儏
       detail: {},
       isShowQueuing: false,
-      timer: null
+      timer: null,
+
+      loadingOpen: false,
+      loadingFinish: false,
     }
   },
   created() {
@@ -207,15 +214,23 @@
   },
   methods: {
     handleWork(item) {
+      this.loadingOpen = true
       platformBeginWork({ jobId: item.id }).then(res => {
+        this.loadingOpen = false
         Message.success('宸插紑濮嬩綔涓�')
         this.getPlatGroupList()
+      }, () => {
+        this.loadingOpen = false
       })
     },
     handleFinish(item) {
+      this.loadingFinish = true
       platformFinishWork({ jobId: item.id }).then(res => {
+        this.loadingFinish = false
         Message.success('瀹屾垚浣滀笟')
         this.getPlatGroupList()
+      },() => {
+        this.loadingFinish = false
       })
     },
     handleTransform(item, task) {
@@ -325,6 +340,15 @@
         this.$refs.PlatformQueuingRef.title = item.name
       })
     },
+    subDetail(row) {
+      this.isShowDriver = true
+      this.$nextTick(() => {
+        this.$refs.DriverDetailRef.id = row.bookId
+        this.$refs.DriverDetailRef.type = 6
+        this.$refs.DriverDetailRef.getDetail()
+        this.$refs.DriverDetailRef.isShowModal = true
+      })
+    },
     handleDetail(row) {
       this.isShowDetail = true
       this.$nextTick(() => {

--
Gitblit v1.9.3