From c5cc7da07c7f202f336468c0cd0d2789b4775b03 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 11:31:15 +0800
Subject: [PATCH] 最新版本

---
 admin/src/views/platform/LogisticsRecord/leaveAuth.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 9fdf219..688c2ef 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>
@@ -46,8 +50,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>
@@ -100,7 +105,7 @@
             label: '鍚堝悓鍙�'
           },
           {
-            filed: 'code',
+            filed: 'billCode',
             type: 'input',
             label: '杩愬崟鍙�'
           },
@@ -152,7 +157,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,
         },
@@ -174,8 +179,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()
         })

--
Gitblit v1.9.3