From e48cdc7f2fecb27465d350bb98efdc4c1427d3a6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 8 Jan 2024 18:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=81=E4=B8=80=E9=94=AE=E7=AD=BE=E6=94=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryListedt.vue     | 12 +++++++-----
 .../signfor/distributionSignfortreat.vue             |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index ac953b09..4fad08f6 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -174,7 +174,7 @@
               >
                 一键装车
               </el-text>
-            
+
               <el-text
                 type="primary"
                 text
@@ -484,11 +484,13 @@
               <template #default="slotProps">
                 <template v-if="slotProps.scope.column.label === '操作'">
                   <el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text>
+<!--                  slotProps.scope.row.orderPackageStatus !== '70' ||-->
+<!--                  slotProps.scope.row.orderPackageStatusName !== '已签收'||-->
                   <el-text
                           v-if="
 
-                  slotProps.scope.row.orderPackageStatus !== '70' ||
-                  slotProps.scope.row.orderPackageStatusName !== '已签收'
+                  slotProps.scope.row.orderPackageLoadingStatus !== '20'||
+                  slotProps.scope.row.orderPackageLoadingStatusName !== '已装车'
                 "
                           size="small"
                           @click="cancelReservationPackage(slotProps.scope.row)"
@@ -496,8 +498,8 @@
                   >
                   <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="signingReservationPackage(slotProps.scope.row)"
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 6c772db2..f836594f 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -194,7 +194,7 @@
 
               <el-text
                 size="small"
-                v-if="slotProps.scope.row.isHaveAbnormalPackage === 2"
+                v-if="slotProps.scope.row.abnormalLoadedNumber > 0"
                 @click="viewAbnormalLoading(slotProps.scope)"
                 >异 常 审 核</el-text
               >