From 8216537b852b393b58342262620d809f48548ff8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Dec 2023 14:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryListedt.vue  | 13 ++++++++++++-
 .../signfor/distributionSignfortreat.vue          | 15 ++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index c79e8bd2..1b2f10a1 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -471,7 +471,14 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
-              <el-button  size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-button>
+              <el-text  size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text>
+
+              <el-text v-if="slotProps.scope.row.orderPackageLoadingStatus === '10'
+              || slotProps.scope.row.orderPackageLoadingStatusName === '待装车'
+              || slotProps.scope.row.orderPackageStatus !== '70'
+              || slotProps.scope.row.orderPackageStatusName !== '已签收'"
+                       size="small"
+                       @click="cancelReservationPackage(slotProps.scope.row)">计划取消</el-text>
             </template>
           </template>
         </tablecmt>
@@ -3295,6 +3302,10 @@ export default {
 
       this.dialogVisibleF = true;
     },
+    cancelReservationPackage(row){
+      console.log("row",row);
+
+    },
     /**
      * 打印
      */
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index b3d5512b..1ea1a0ac 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -454,7 +454,7 @@
     :columnList="columnList"
   ></edittablehead>
   <el-dialog
-    title="异常装车包件列表"
+    title="异常审核列表"
     v-model="abnormalBox"
     width="50%"
     :before-close="beforeClose"
@@ -1424,12 +1424,7 @@ export default {
           //   width: '100px'
           // },
 
-          {
-            label: '包件状态',
-            prop: 'orderPackageStatusName',
-            search: true,
-            width: '100px',
-          },
+
           {
             label: '冻结状态',
             prop: 'orderPackageFreezeStatusName',
@@ -1460,6 +1455,12 @@ export default {
             search: true,
             width: '100px',
           },
+          {
+            label: '签收状态',
+            prop: 'orderPackageStatusName',
+            search: true,
+            width: '100px',
+          },
           // {
           //   label: '配送计划状态',
           //   prop: 'orderPackageDeliveryStatus',