From af3434a79c2a096105668273cfa27c09eacf6ff1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 九月 2024 09:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 116e23f..9fdf219 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -27,9 +27,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 /> -->
@@ -47,7 +47,7 @@
<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>
+ @click="handleAuth(scope.row)">绂诲洯鎺堟潈</el-button>
</template>
</el-table-column>
</el-table>
@@ -171,12 +171,11 @@
})
},
handleAuth(row) {
- this.$confirm('鏄惁瀵瑰綋鍓嶈繍鍗曠殑杞﹁締杩涜绂诲洯鎺堟潈锛屾槸鍒欒繘琛岀鍥巿鏉冿紵', '鎻愮ず', {
+ this.$prompt('澶囨敞', '绂诲洯鎺堟潈', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- platformPowerLevel({ jobId: row.id }).then(res => {
+ }).then(({ remark }) => {
+ platformPowerLevel({ jobId: row.id, remark }).then(res => {
Message.success('绂诲洯鎺堟潈鎴愬姛')
this.getList()
})
--
Gitblit v1.9.3