From 931e45f5f78494c7af4cab75053da49b57f22fbe Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:31:43 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
admin/src/views/platform/components/PlatformSign.vue | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/admin/src/views/platform/components/PlatformSign.vue b/admin/src/views/platform/components/PlatformSign.vue
index bc8558b..a50ca78 100644
--- a/admin/src/views/platform/components/PlatformSign.vue
+++ b/admin/src/views/platform/components/PlatformSign.vue
@@ -4,7 +4,7 @@
<div class="df_ac mb20">
<span>鎼滅储杞﹁締锛�</span>
<el-input class="flex1 mr20" v-model="carCodeFront" placeholder="璇疯緭鍏ヨ溅鐗屽彿"></el-input>
- <el-button type="primary" @click="getList">鏌ユ壘</el-button>
+ <el-button type="primary" @click="getList(1)">鏌ユ壘</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</div>
<div class="list">
@@ -19,13 +19,13 @@
<div class="status" :class="{ red: item.status == 0 }">{{ 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>
@@ -37,7 +37,7 @@
</div>
<div class="ite">
<span>鎬昏繍杈撻噺锛�</span>
- <span>{{ item.totalNum }}涓囨敮</span>
+ <span>{{ item.totalNum || item.ioQty }}涓囨敮</span>
</div>
<div v-if="item.type != 4" class="ite" style="width: 66%">
<span>杩愯緭鍏徃锛�</span>
@@ -45,8 +45,8 @@
</div>
</div>
<div class="footer df_sb">
- <div @click="handleDetail(item)" v-if="item.type != 4" class="detail">杩愬崟璇︽儏</div>
- <div v-else></div>
+ <div @click="handleDetail(item)" v-if="item.billCode" class="detail">杩愬崟璇︽儏</div>
+ <div @click="subDetail(item)" v-else class="detail">棰勭害璇︽儏</div>
<el-button type="primary" @click="handleCall(item)">绛惧埌</el-button>
</div>
</div>
@@ -55,6 +55,7 @@
</pagination>
</div>
<WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
+ <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
</GlobalWindow>
</template>
@@ -62,6 +63,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import Pagination from '@/components/common/Pagination'
import WaybillDetailRef from "./WaybillDetail.vue"
+import DriverDetail from "@/views/task/driverDetail.vue"
import { platformJobPage, platformJobSign } from '@/api'
import { statusMap } from '../config'
import { Message } from 'element-ui'
@@ -69,13 +71,15 @@
components: {
GlobalWindow,
Pagination,
- WaybillDetailRef
+ WaybillDetailRef,
+ DriverDetail
},
data() {
return {
statusMap,
isShowModal: false,
isShowDetail: false,
+ isShowDriver: false,
subLoading: false,
pagination: {
total: 0,
@@ -92,13 +96,16 @@
handleCall(item) {
// const activePlatform = this.activePlat
platformJobSign({ jobId: item.id, signType: '2' }).then(res => {
- Message.success('绛惧埌鎴愬姛')
- this.$emit('success')
- this.getList()
+ this.$message.success('绛惧埌鎴愬姛')
+ this.$emit('success')
+ this.getList()
})
},
- getList() {
+ getList(page) {
const { activePlat, pagination, carCodeFront } = this
+ if (page) {
+ pagination.page = page
+ }
platformJobPage({
model: { platformGroupId: activePlat.id, queryStatus: '0,1', carCodeFront },
page: pagination.page,
@@ -106,6 +113,15 @@
}).then(res => {
this.dataList = res.records
this.pagination.total = res.total
+ })
+ },
+ 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) {
@@ -124,7 +140,7 @@
},
handleSizeChange(e) {
this.pagination.pageSize = e
- this.getList()
+ this.getList(1)
},
handlePageChange(e) {
this.pagination.page = e
@@ -151,7 +167,9 @@
<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
-
+.table-pagination {
+ bottom: 0px !important;
+}
.queuing_modal {
padding: 10px 30px;
--
Gitblit v1.9.3