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 |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 688c2ef..ecc0fa4 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -25,9 +25,10 @@
       <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 />
@@ -52,7 +53,7 @@
         <template v-slot="scope">
           <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>
+          <span v-else>-</span>
         </template>
       </el-table-column>
     </el-table>
@@ -120,9 +121,18 @@
             label: '椹鹃┒鍛�'
           },
           {
+            filed: 'queryStatusForPower',
+            type: 'select',
+            label: '鎺堟潈鐘舵��',
+            options: [
+              { value: '9,10', label: '宸叉巿鏉�' },
+              { value: '6', label: '鏈巿鏉�' }
+            ]
+          },
+          {
             filed: 'selDate',
             type: 'datetimerange',
-            label: '鎿嶄綔鏃堕棿',
+            label: '浣滀笟瀹屾垚鏃堕棿鎼滅储',
             pickerOptions: {}
           },
           {
@@ -158,9 +168,10 @@
         model: {
           ...filters,
           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,
+          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 => {

--
Gitblit v1.9.3