Procházet zdrojové kódy

fix:修改支付逻辑

ly před 9 měsíci
rodič
revize
2d20b39d2c
1 změnil soubory, kde provedl 8 přidání a 7 odebrání
  1. 8 7
      src/views/business/financial/payment/form.vue

+ 8 - 7
src/views/business/financial/payment/form.vue

@@ -217,11 +217,11 @@
                       <span>{{ rowNum(scope.row.payment) }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="审核支付金额" prop="reviewAmount" width="100" align="center">
-                    <template #default="scope">
-                      <span>{{ rowNum(scope.row.reviewAmount) }}</span>
-                    </template>
-                  </el-table-column>
+<!--                  <el-table-column label="审核支付金额" prop="reviewAmount" width="100" align="center">-->
+<!--                    <template #default="scope">-->
+<!--                      <span>{{ rowNum(scope.row.reviewAmount) }}</span>-->
+<!--                    </template>-->
+<!--                  </el-table-column>-->
                   <el-table-column label="可支出金额" align="center">
                     <template #default="scope">
                       {{rowNum((Number(scope.row.reallyAmount) || 0) - (Number(scope.row.payment) || 0))}}
@@ -614,7 +614,7 @@
       const tempAmount = rowNum((Number(item.reallyAmount) || 0) - (Number(item.payment) || 0)) - (Number(item.reviewAmount || 0));
 
       if (item.paymentAmount !== 0 && tempAmount <  item.paymentAmount) {
-        if(item.reallyAmount < (rowNum((Number(item.paymentAmount) || 0) + (Number(item.reviewAmount || 0)) + (Number(item.payment) || 0))) ){
+        if(item.reallyAmount < (rowNum((Number(item.paymentAmount) || 0) + (Number(item.reviewAmount || 0)) + (Number(item.payment) || 0) -  (Number(item.thisPaymentAmount) || 0))) ){
           proxy.$modal.msgError("当前的" + item.taskTypeName + "本次支出金额超过可支出金额,不可提交,请联系财务人员。");
           return;
         }
@@ -945,7 +945,8 @@
         payment: item.payment,
         reallyAmount: item.reallyAmount,
         explain: item.explain,
-        reviewAmount : item.reviewAmount
+        reviewAmount : item.reviewAmount,
+        thisPaymentAmount : item.thisPaymentAmount
       };
       form.value.details.push(detail);
     });