diff --git a/aircraft/server/order/add.vue b/aircraft/server/order/add.vue index 32f41b7..26d4441 100644 --- a/aircraft/server/order/add.vue +++ b/aircraft/server/order/add.vue @@ -220,7 +220,7 @@ export default { return orderId&&(!mainOrderStatus||mainOrderStatus!=='未进行')&& (this.isPilot&&orderInitiatorId==this.userMessage.id&&mainOrderStatus!=='待确认'|| !this.isPilot&&customerId==userMessage.id)&&(!orderTaskDetailList|| - orderTaskDetailList.some(item=>item.orderItemStatus!=='未进行'&&item.orderItemStatus!=='进行中')); + !orderTaskDetailList.some(item=>item.orderItemStatus==='未进行'||item.orderItemStatus==='进行中')); }, // 判断是否可以删除 canDelete(){ diff --git a/aircraft/server/order/detail.vue b/aircraft/server/order/detail.vue index 5031497..39ae8bd 100644 --- a/aircraft/server/order/detail.vue +++ b/aircraft/server/order/detail.vue @@ -255,7 +255,7 @@ export default { canAddAction(){ return !this.orderDetail.orderTaskDetailList||!this.orderDetail.orderTaskDetailList.some( item=>item.operatorId&&item.operatorId===this.userMessage.id&& - item.orderItemStatus === '未进行'); + (item.orderItemStatus === '未进行'|| item.orderItemStatus === '进行中')); } }, data(){