Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -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)"

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
               >