From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
admin/src/views/platform/queueUp.vue | 148 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 115 insertions(+), 33 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 6b4a9b1..14057e8 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -1,7 +1,7 @@
<template>
<div class="main_app">
- <div class="mb20 main_header">
- <div class="platgroup_tabs">
+ <div class="main_header">
+ <div class="platgroup_tabs pt20">
<div class="tab" :class="{ active: activeGroup.id === item.id }" @click="platgroupClick(item)"
v-for="(item, i) in PlatGroupList" :key="i">
{{ item.name }}
@@ -11,9 +11,11 @@
<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>
+ <el-button @click="openSign" type="primary" style="align-self: flex-start;">杞﹁締绛惧埌</el-button>
+ </div>
</div>
- <div class="main_content">
+ <div class="common-header">
<div class="static_wrap">
<span>绛夊緟锛�<span class="num">{{ staticParam.waitNum }}</span></span>
<span class="mr30">{{ }}</span>
@@ -21,7 +23,7 @@
<span></span>
</div>
</div>
- <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="index" label="搴忓彿" width="80" />
<el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
@@ -33,13 +35,60 @@
</div>
</template>
</el-table-column>
- <el-table-column v-if="activeGroup.type == 2" prop="contractNum" label="鍚堝悓鍗曞彿" min-width="120" />
- <template v-else>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="120" />
- <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="120" />
- </template>
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
+ <template v-slot="scope">
+ <span>{{ scope.row.carrierName || '-' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="contractNum" label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="120">
+ <template v-slot="scope">
+ <span>{{ scope.row.billCode || scope.row.contractNum || '-' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="totalNum" label="鎬昏繍杈撻噺(涓囨敮)" min-width="110">
+ <template v-slot="scope">
+ <span>{{ scope.row.totalNum || '-' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="椹鹃┒鍛�" min-width="130">
+ <template slot-scope="{ row }">
+ <span class="mr10">{{ row.driverName }}</span>
+ <span>{{ row.drivierPhone }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
+ <el-table-column label="鐘舵��" align="center" width="80">
+ <template slot-scope="{ row }">
+ <!-- <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span> -->
+ <span v-if="row.status == 2" class="red">绛夊緟鍙彿</span>
+ <span v-if="row.status == 3" class="primaryColor">鍏ュ洯绛夊緟</span>
+ <span v-if="row.status == 7" class="primaryColor">杞Щ涓�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="200" fixed="right">
+ <template slot-scope="{ row }">
+ <el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
+ v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
+ <el-button v-else type="text" @click="subDetail(row)">棰勭害璇︽儏</el-button>
+ <el-button type="text" @click="jiaji(row.id)">鍔犳��</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <el-table v-else class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table-column type="index" label="搴忓彿" width="80" />
+ <el-table-column label="杞︾墝鍙�" width="130">
+ <template slot-scope="{ row }">
+ <div class="plate_id">
+ <span>{{ row.carCodeFront.slice(0, 1) }}</span>
+ <span>{{ row.carCodeFront.slice(1, 2) }}</span>
+ <span>路</span>
+ <span>{{ row.carCodeFront.slice(2) }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="120" />
<el-table-column prop="totalNum" label="鎬昏繍杈撻噺(涓囨敮)" min-width="110" />
- <el-table-column prop="driverName" label="椹鹃┒鍛�" min-width="130">
+ <el-table-column label="椹鹃┒鍛�" min-width="130">
<template slot-scope="{ row }">
<span class="mr10">{{ row.driverName }}</span>
<span>{{ row.drivierPhone }}</span>
@@ -48,11 +97,12 @@
<el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
<el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template slot-scope="{ row }">
- <el-button v-if="activeGroup != 2" type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
- <el-button v-if="activeGroup == 2" type="text" @click="subDetail(row)" v-permissions="['business:company:update']">棰勭害璇︽儏</el-button>
+ <el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
+ v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
+ <el-button v-else type="text" @click="subDetail(row)">棰勭害璇︽儏</el-button>
</template>
</el-table-column>
- </el-table>
+ </el-table> -->
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination" />
<!-- -->
@@ -66,16 +116,19 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import DriverDetail from "@/views/task/driverDetail.vue"
import {
getPlatformGroupList,
platformLineUpPage,
- getPlatformGroupWork
+ getPlatformGroupWork,
+ jobUrge
} from '@/api'
import { queryQueueUpConfig } from './config'
import WaybillDetail from './components/WaybillDetail.vue'
+import DriverDetail from '@/views/task/driverDetail.vue'
import PlatformSign from './components/PlatformSign.vue'
+import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
+ extends: BaseComputHeight,
components: {
Pagination,
QueryForm,
@@ -86,7 +139,9 @@
data() {
return {
filters: {},
- activeGroup: {},
+ activeGroup: {
+ type: 2
+ },
PlatGroupList: [],
staticParam: {},
dataList: [],
@@ -112,8 +167,24 @@
this.$nextTick(() => {
this.$refs.PlatformSignRef.isShowModal = true
this.$refs.PlatformSignRef.activePlat = this.activeGroup
+ this.$refs.PlatformSignRef.carCodeFront = ''
+ this.$refs.PlatformSignRef.pagination = {
+ total: 0,
+ pageSize: 10,
+ page: 1
+ }
this.$refs.PlatformSignRef.getList()
})
+ },
+ jiaji(id) {
+ this.$dialog.exportConfirm('纭鍔犳�ュ悧锛�')
+ .then(() => {
+ jobUrge({ id })
+ .then(res => {
+ this.getPlatGroupList()
+ })
+ })
+ .catch(() => {})
},
getPlatGroupList() {
getPlatformGroupList({
@@ -127,6 +198,7 @@
} else {
this.activeGroup = res[0]
}
+
this.getPlatformGroupWork()
this.getList()
}
@@ -155,7 +227,7 @@
},
handleSizeChange(e) {
this.pagination.pageSize = e
- this.getList()
+ this.getList(1)
},
handlePageChange(e) {
this.pagination.page = e
@@ -174,13 +246,13 @@
this.getList()
},
subDetail(row) {
- this.isShowDriver = true
- this.$nextTick(() => {
- this.$refs.DriverDetailRef.id = row.objId
- this.$refs.DriverDetailRef.type = row.objType
- this.$refs.DriverDetailRef.getDetail()
- this.$refs.DriverDetailRef.isShowModal = true
- })
+ 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
@@ -197,14 +269,24 @@
<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
-.main_content {
- background-color: #fff;
- position: relative;
- z-index: 999;
- top: -10;
- margin: -20px;
+.main_app {
padding: 0 20px;
+ .doumee-filter {
+ padding-top: 20px;
+ border: 0;
+ }
+}
+
+.common-header {
+ background-color: #fff;
+ /* position: relative; */
+ /* z-index: 999; */
+ /* top: -10; */
+ /* margin: -20px; */
+ padding: 0 20px;
+
+ /* border: 1px solid red; */
.static_wrap {
height: 50px;
line-height: 50px;
@@ -213,7 +295,7 @@
padding: 0 20px;
background: #F4FAFB;
border-radius: 2px 2px 0px 0px;
- margin-bottom: 36px;
+ /* margin-bottom: 36px; */
.num {
color: #111111;
@@ -223,7 +305,7 @@
.plate_id {
display: flex;
- width: 110px;
+ width: 120px;
font-weight: 600;
height: 30px;
line-height: 30px;
--
Gitblit v1.9.3