From cf77e6b94c5a2e2d4d992b9222c857bafde0111e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 09:46:51 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index efacbd1..5a0dfa0 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -16,7 +16,11 @@
</div>
<el-table class="mb20" 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>
@@ -27,9 +31,9 @@
</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 /> -->
@@ -100,7 +104,7 @@
label: '鍚堝悓鍙�'
},
{
- filed: 'code',
+ filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
},
@@ -152,7 +156,7 @@
platformJobPage({
model: {
...filters,
- queryStatus: '6,9,10',
+ queryStatus: '6,9,10,2,3,4',
beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
@@ -175,7 +179,7 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
}).then(({ remark }) => {
- platformPowerLevel({ jobId: row.id,remark }).then(res => {
+ platformPowerLevel({ jobId: row.id, remark }).then(res => {
Message.success('绂诲洯鎺堟潈鎴愬姛')
this.getList()
})
--
Gitblit v1.9.3