|
@@ -540,9 +540,9 @@ export default {
|
|
|
const isCashOnDelivery = row.settlementMode == 3;
|
|
const isCashOnDelivery = row.settlementMode == 3;
|
|
|
const isPrepayment = row.paymentType == 1;
|
|
const isPrepayment = row.paymentType == 1;
|
|
|
const isDelivered = row.deliveryStatus != 0;
|
|
const isDelivered = row.deliveryStatus != 0;
|
|
|
- const deliveryCondition = !isCashOnDelivery || (isPrepayment || isDelivered);
|
|
|
|
|
|
|
+ const deliveryCondition = isCashOnDelivery && (isPrepayment || (!isPrepayment && isDelivered));
|
|
|
|
|
|
|
|
- return isNotFullInvoiced && paymentCondition && deliveryCondition;
|
|
|
|
|
|
|
+ return isNotFullInvoiced && (paymentCondition || deliveryCondition);
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|