From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 73 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index efacbd1..b6691ab 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -14,22 +14,27 @@
<el-button :loading="exLoading" @click="handleEx"
v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column type="index" label="搴忓彿" width="70" show-overflow-tooltip />
- <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="billCode" label="杩愬崟鍙�/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
+ <template v-slot="scope">
+ <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
+ </template>
+ </el-table-column>
<!-- <el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip /> -->
<el-table-column prop="carCodeFront" label="杞︾墝鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeBack" label="鐢靛瓙閿佺姸鎬�" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
- <span class="red" v-if="scope.row.lockStatus == 0">鏈笂閿�</span>
- <span class="red" v-if="scope.row.lockStatus == 1">閮ㄥ垎涓婇攣</span>
- <span v-if="scope.row.lockStatus == 2">鍏ㄩ儴涓婇攣</span>
+ <span class="red" v-if="scope.row.billCode && scope.row.lockStatus == 0">鏈笂閿�</span>
+ <span class="red" v-if="scope.row.billCode && scope.row.lockStatus == 1">閮ㄥ垎涓婇攣</span>
+ <span v-if="scope.row.billCode && scope.row.lockStatus == 2">鍏ㄩ儴涓婇攣</span>
+ <span v-if="!scope.row.billCode">-</span>
</template>
</el-table-column>
<el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="100" show-overflow-tooltip />
- <el-table-column prop="driverName" label="椹鹃┒鍛�" min-width="100" show-overflow-tooltip>
+ <el-table-column prop="driverName" label="椹鹃┒鍛�" min-width="120" show-overflow-tooltip>
<template v-slot="scope">
- <span>{{ scope.row.carrierName }} {{ scope.row.drivierPhone }}</span>
+ <span>{{ scope.row.driverName }} {{ scope.row.drivierPhone }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="drivierPhone" label="鑱旂郴鏂瑰紡" min-width="100" show-overflow-tooltip /> -->
@@ -46,8 +51,9 @@
<el-table-column prop="remark" label="澶囨敞" min-width="150" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" align="center" fixed="right" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
- <el-button type="text" v-permissions="['business:platformbooks:detail']"
+ <el-button v-if="scope.row.status == 6" type="text" v-permissions="['business:platformbooks:detail']"
@click="handleAuth(scope.row)">绂诲洯鎺堟潈</el-button>
+ <span v-else>-</span>
</template>
</el-table-column>
</el-table>
@@ -68,7 +74,9 @@
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
+ extends: BaseComputHeight,
components: {
Pagination,
QueryForm,
@@ -89,7 +97,9 @@
},
filters: {
selDate: [],
- fastdate: 0
+ fastdate: 0,
+ beginDoneDateStart: '',
+ beginDoneDateEnd: ''
},
list: [],
queryFormConfig: {
@@ -100,7 +110,7 @@
label: '鍚堝悓鍙�'
},
{
- filed: 'code',
+ filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
},
@@ -115,10 +125,25 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '鎿嶄綔鏃堕棿',
- pickerOptions: {}
+ filed: 'queryStatusForPower',
+ type: 'select',
+ label: '鎺堟潈鐘舵��',
+ options: [
+ { value: '9,10', label: '宸叉巿鏉�' },
+ { value: '6', label: '鏈巿鏉�' }
+ ]
+ },
+ // {
+ // filed: 'selDate',
+ // type: 'datetimerange',
+ // label: '浣滀笟瀹屾垚鏃堕棿鎼滅储',
+ // pickerOptions: {}
+ // },
+ {
+ filed1: 'beginDoneDateStart',
+ filed2: 'beginDoneDateEnd',
+ type: 'datetime',
+ label: '浣滀笟瀹屾垚鏃堕棿鎼滅储'
},
{
type: 'slot',
@@ -137,8 +162,9 @@
methods: {
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
- this.$set(this.filters, 'selDate', arr)
- this.getList()
+ this.filters.beginDoneDateStart = arr[0]
+ this.filters.beginDoneDateEnd = arr[1]
+ this.getList(1)
},
changeForm(str) {
if (str === 'selDate') {
@@ -152,10 +178,9 @@
platformJobPage({
model: {
...filters,
- queryStatus: '6,9,10',
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ queryStatus: '6,9,10,2,3,4'
},
+ sorts: [{ direction: 'DESC', property: 'DONE_DATE' }],
capacity: pagination.pageSize,
page: page || pagination.page,
}).then(res => {
@@ -174,8 +199,8 @@
this.$prompt('澶囨敞', '绂诲洯鎺堟潈', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
- }).then(({ remark }) => {
- platformPowerLevel({ jobId: row.id,remark }).then(res => {
+ }).then(({ value }) => {
+ platformPowerLevel({ jobId: row.id, remark: value }).then(res => {
Message.success('绂诲洯鎺堟潈鎴愬姛')
this.getList()
})
@@ -188,7 +213,7 @@
platformJobExport({
page: this.pagination.page,
capacity: 1000000,
- queryStatus: '6,9,10',
+ queryStatus: '6,9,10,2,3,4',
model: this.filters
})
.then(response => {
@@ -206,7 +231,6 @@
this.pagination.page = 1
this.filters = {
selDate: [],
- fastdate: 0
}
this.getList()
},
@@ -221,6 +245,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList(1)
}
}
}
@@ -232,4 +257,4 @@
color: #000000;
margin-bottom: 15px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3