From 6a2689a44840490a64cf66b37eb09e45eb1da244 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 九月 2024 16:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/queueUp.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 9b7f0b2..4b2d2f3 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 }">
@@ -49,12 +52,9 @@
<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,
@@ -201,6 +212,7 @@
color: #111111;
border-radius: 4px;
border: 1px solid #dfdede;
+
span {
&:nth-of-type(1) {
background: $primary-color;
--
Gitblit v1.9.3