From 985358a07ef4c262042df2c586be39a2d178fa36 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 29 九月 2024 09:44:45 +0800
Subject: [PATCH] 最新版本

---
 admin/src/views/platform/queueUp.vue |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 9b7f0b2..329fef3 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -8,8 +8,11 @@
         </div>
       </div>
     </div>
-    <QueryForm v-model="filters" :query-form-config="queryQueueUpConfig" @handleQuery="getList(1)" @clear="clear">
-    </QueryForm>
+    <div class="df_sb">
+      <QueryForm v-model="filters" :query-form-config="queryQueueUpConfig" @handleQuery="getList(1)" @clear="clear">
+      </QueryForm>
+      <el-button @click="openSign" type="primary" style="align-self: flex-start;">杞﹁締绛惧埌</el-button>
+    </div>
     <div class="main_content">
       <div class="static_wrap">
         <span>绛夊緟锛�<span class="num">{{ staticParam.waitNum }}</span></span>
@@ -31,7 +34,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="200" />
-      <el-table-column prop="code" 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">
         <template slot-scope="{ row }">
@@ -40,21 +43,18 @@
         </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="row.type != 4" type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
         </template>
       </el-table-column>
     </el-table>
     <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination" />
 
     <!--  -->
-    <WaybillDetail
-      ref="WaybillDetailRef"
-      v-if="isShowDetail"
-      @success="getList"
-      @close="isShowDetail = false"
-    />
+    <PlatformSign ref="PlatformSignRef" v-if="isPlatformSign" @success="getPlatGroupList"
+      @close="isPlatformSign = false" />
+    <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
   </div>
 </template>
 
@@ -68,10 +68,12 @@
 } from '@/api'
 import { queryQueueUpConfig } from './config'
 import WaybillDetail from './components/WaybillDetail.vue'
+import PlatformSign from './components/PlatformSign.vue'
 export default {
   components: {
     Pagination,
     QueryForm,
+    PlatformSign,
     WaybillDetail
   },
   data() {
@@ -82,6 +84,7 @@
       staticParam: {},
       dataList: [],
       loading: false,
+      isPlatformSign: false,
       pagination: {
         pageSize: 10,
         page: 1,
@@ -96,6 +99,14 @@
     this.getPlatGroupList()
   },
   methods: {
+    openSign() {
+      this.isPlatformSign = true
+      this.$nextTick(() => {
+        this.$refs.PlatformSignRef.isShowModal = true
+        this.$refs.PlatformSignRef.activePlat = this.activeGroup
+        this.$refs.PlatformSignRef.getList()
+      })
+    },
     getPlatGroupList() {
       getPlatformGroupList({
         queryData: 1,
@@ -158,6 +169,8 @@
       this.isShowDetail = true
       this.$nextTick(() => {
         this.$refs.WaybillDetailRef.isShowModal = true
+        this.$refs.WaybillDetailRef.id = row.id
+        this.$refs.WaybillDetailRef.getDetail()
       })
     },
   }
@@ -201,6 +214,7 @@
   color: #111111;
   border-radius: 4px;
   border: 1px solid #dfdede;
+
   span {
     &:nth-of-type(1) {
       background: $primary-color;

--
Gitblit v1.9.3