只能作废待提审或进行中且待入库的数据

src/views/consignmentManagement/consignmentApplication.vue

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