From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 116e23f..ecc0fa4 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -16,20 +16,25 @@
</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>
<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']"
- @click="handleAuth(scope.row)">绂昏繙鎺堟潈</el-button>
+ <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>
@@ -100,7 +106,7 @@
label: '鍚堝悓鍙�'
},
{
- filed: 'code',
+ filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
},
@@ -115,9 +121,18 @@
label: '椹鹃┒鍛�'
},
{
+ filed: 'queryStatusForPower',
+ type: 'select',
+ label: '鎺堟潈鐘舵��',
+ options: [
+ { value: '9,10', label: '宸叉巿鏉�' },
+ { value: '6', label: '鏈巿鏉�' }
+ ]
+ },
+ {
filed: 'selDate',
type: 'datetimerange',
- label: '鎿嶄綔鏃堕棿',
+ label: '浣滀笟瀹屾垚鏃堕棿鎼滅储',
pickerOptions: {}
},
{
@@ -152,10 +167,11 @@
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',
+ beginDoneDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ beginDoneDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
+ sorts: [{ direction: 'DESC', property: 'DONE_DATE' }],
capacity: pagination.pageSize,
page: page || pagination.page,
}).then(res => {
@@ -171,12 +187,11 @@
})
},
handleAuth(row) {
- this.$confirm('鏄惁瀵瑰綋鍓嶈繍鍗曠殑杞﹁締杩涜绂诲洯鎺堟潈锛屾槸鍒欒繘琛岀鍥巿鏉冿紵', '鎻愮ず', {
+ this.$prompt('澶囨敞', '绂诲洯鎺堟潈', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- platformPowerLevel({ jobId: row.id }).then(res => {
+ }).then(({ value }) => {
+ platformPowerLevel({ jobId: row.id, remark: value }).then(res => {
Message.success('绂诲洯鎺堟潈鎴愬姛')
this.getList()
})
--
Gitblit v1.9.3