Просмотр исходного кода

fix(财务支付计划): 修正支付条件判断逻辑

liujt 4 месяцев назад
Родитель
Сommit
b7f7b38a1b
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      src/views/financialManage/paymentPlan/index.vue

+ 2 - 2
src/views/financialManage/paymentPlan/index.vue

@@ -535,14 +535,14 @@ export default {
         
         
         const isPaymentFirstThenInvoice = row.transactionMode == 2;
         const isPaymentFirstThenInvoice = row.transactionMode == 2;
         const isNotUnpaid = row.paymentStatus != 0;
         const isNotUnpaid = row.paymentStatus != 0;
-        const paymentCondition = isPaymentFirstThenInvoice && isNotUnpaid;
+        const paymentCondition = (isPaymentFirstThenInvoice && isNotUnpaid) || !isPaymentFirstThenInvoice;
         
         
         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 || (!isPrepayment && isDelivered));
         const deliveryCondition = isCashOnDelivery && (isPrepayment || (!isPrepayment && isDelivered));
         
         
-        return isNotFullInvoiced && (paymentCondition || deliveryCondition);
+        return isNotFullInvoiced && ((deliveryCondition || !isCashOnDelivery) && paymentCondition);
       };
       };
     }
     }
   },
   },