待提审或进行中且待入库状态为待入库

src/views/consignmentManagement/consignmentApplication.vue

@@ -242,10 +242,14 @@ export default {
             this.$message.warning('不支持批量操作');
             return;
           }
-          // 作废：校验
-          const invalidCancel = this.multipleSelection.filter(item => !([0, 2].includes(item.consignment_status) && item.stock_in_status == 0));
+          // 作废：校验  待提审或进行中且待入库状态为待入库
+          const invalidCancel = this.multipleSelection.filter(item => {
+            const isPendingReview = item.consignment_status === 0;
+            const isInProgressAndPendingStock = item.consignment_status === 2 && item.stock_in_status === 1;
+            return !(isPendingReview || isInProgressAndPendingStock);
+          });
           if (invalidCancel.length) {
-            this.$message.warning('只能作废待提审或进行中且待入库的数据');
+            this.$message.warning('只能作废待提审状态或进行中且未入库的数据');
             return;
           }
           this.consignment_ids = this.multipleSelection.map(item => item.consignment_id).join(',');