From 815e2cda769751dec5c1a1a71d0ff61b0d051d76 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 24 十月 2025 14:58:22 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/queueUp.vue | 113 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 34 deletions(-)
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 149d15d..0d92b07 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,7 +35,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
<template v-slot="scope">
<span>{{ scope.row.carrierName || '-' }}</span>
</template>
@@ -57,16 +59,19 @@
<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 == 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="100" fixed="right">
+ <el-table-column label="鎿嶄綔" align="center" width="250" 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>
+ <el-button type="text" class="red" @click="backSignin(row.id)">閫�鍥炵鍒�</el-button>
</template>
</el-table-column>
</el-table>
@@ -115,13 +120,17 @@
import {
getPlatformGroupList,
platformLineUpPage,
- getPlatformGroupWork
+ getPlatformGroupWork,
+ jobUrge,
+ backToWatiSign
} from '@/api'
import { queryQueueUpConfig } from './config'
import WaybillDetail from './components/WaybillDetail.vue'
-import DriverDetail from "@/views/task/driverDetail.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,
@@ -129,7 +138,7 @@
WaybillDetail,
DriverDetail
},
- data() {
+ data () {
return {
filters: {},
activeGroup: {
@@ -144,18 +153,18 @@
pagination: {
pageSize: 10,
page: 1,
- total: 0,
+ total: 0
},
queryQueueUpConfig,
isShowDetail: false, // 杩愬崟璇︽儏
detail: {}
}
},
- created() {
+ created () {
this.getPlatGroupList()
},
methods: {
- openSign() {
+ openSign () {
this.isPlatformSign = true
this.$nextTick(() => {
this.$refs.PlatformSignRef.isShowModal = true
@@ -169,7 +178,34 @@
this.$refs.PlatformSignRef.getList()
})
},
- getPlatGroupList() {
+ jiaji (id) {
+ this.$confirm('纭鍔犳�ュ悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ jobUrge({ id })
+ .then(res => {
+ this.getPlatGroupList()
+ })
+ }).catch(() => {
+
+ })
+ },
+ backSignin (id) {
+ this.$confirm('纭閲嶆柊绛惧埌鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ backToWatiSign({ id })
+ .then(res => {
+ this.getPlatGroupList()
+ })
+ }).catch(() => {
+ })
+ },
+ getPlatGroupList () {
getPlatformGroupList({
queryData: 1,
queryType: 1
@@ -187,13 +223,13 @@
}
})
},
- getList() {
+ getList () {
const { activeGroup, pagination, filters } = this
this.loading = true
platformLineUpPage({
model: { platformGroupId: activeGroup.id, ...filters, callType: 3 },
capacity: pagination.pageSize,
- page: pagination.page,
+ page: pagination.page
}).then(res => {
this.loading = false
this.dataList = res.records || []
@@ -202,33 +238,33 @@
this.loading = false
})
},
- getPlatformGroupWork() {
+ getPlatformGroupWork () {
const { activeGroup } = this
getPlatformGroupWork(activeGroup.id).then(res => {
this.staticParam = res || {}
})
},
- handleSizeChange(e) {
+ handleSizeChange (e) {
this.pagination.pageSize = e
- this.getList()
+ this.getList(1)
},
- handlePageChange(e) {
+ handlePageChange (e) {
this.pagination.page = e
this.getList()
},
- platgroupClick(item) {
+ platgroupClick (item) {
this.activeGroup = { ...item }
this.pagination.page = 1
this.filters = {}
this.getPlatformGroupWork()
this.getList()
},
- clear() {
+ clear () {
this.pagination.page = 1
this.filters = {}
this.getList()
},
- subDetail(row) {
+ subDetail (row) {
this.isShowDriver = true
this.$nextTick(() => {
this.$refs.DriverDetailRef.id = row.bookId
@@ -237,14 +273,14 @@
this.$refs.DriverDetailRef.isShowModal = true
})
},
- handleDetail(row) {
+ handleDetail (row) {
this.isShowDetail = true
this.$nextTick(() => {
this.$refs.WaybillDetailRef.isShowModal = true
this.$refs.WaybillDetailRef.id = row.id
this.$refs.WaybillDetailRef.getDetail()
})
- },
+ }
}
}
</script>
@@ -252,14 +288,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;
@@ -268,7 +314,7 @@
padding: 0 20px;
background: #F4FAFB;
border-radius: 2px 2px 0px 0px;
- margin-bottom: 36px;
+ /* margin-bottom: 36px; */
.num {
color: #111111;
@@ -303,7 +349,6 @@
}
}
}
-
.main_header {
.platgroup_tabs {
--
Gitblit v1.9.3