Selaa lähdekoodia

合同付款-发起预付款根据条件重新计算合同金额,实际支付金额

l1069030731 2 vuotta sitten
vanhempi
commit
ab6afd22a5

+ 8 - 5
src/view/material-manege/pay/modals/apply-form.vue

@@ -32,7 +32,7 @@
       <div class="row">
         <div class="col">
           <div class="label">合同金额:</div>
-          <div class="value">{{ data.totalAmount || 0 }}元</div>
+          <div class="value">{{ data.accountPeriod == 0 ? data.contractAmount : data.totalAmount || 0 }}元</div>
         </div>
         <div class="col">
           <div class="label">发票金额:</div>
@@ -88,7 +88,9 @@
         <div class="col" style="flex: none">
           <div class="">实际支付金额:</div>
           <div class="value">
-            <div style="width: 95px;color: red;">{{ (data.adjustAmount - data.hisPayAmount).toFixed(2) - data.backAmount - data.expressAmount - data.totalBalance || 0}}元</div>
+            <div style="width: 95px;color: red;">{{ data.accountPeriod == 0 ? 
+              (data.payAmount - data.hisPayAmount).toFixed(2) - data.backAmount - data.expressAmount - data.totalBalance || 0 : 
+              (data.adjustAmount - data.hisPayAmount).toFixed(2) - data.backAmount - data.expressAmount - data.totalBalance || 0}}元</div>
           </div>
           <span style="padding: 0 10px">&nbsp;&nbsp;&nbsp;&nbsp;</span>
         </div>
@@ -162,7 +164,7 @@ export default {
     }
   },
   created(){
-    
+
   },
   methods: {
     getpaymentGetBackAmount(_id){
@@ -193,14 +195,15 @@ export default {
         backAmount: this.data.backAmount,
         balanceAmount: this.data.totalBalance,
         expressAmount: this.data.expressAmount,
-        actAmount: (this.data.adjustAmount - this.data.hisPayAmount).toFixed(2) - this.data.backAmount - this.data.expressAmount - this.data.totalBalance,
+        actAmount: this.data.accountPeriod == 0 ? 
+        (this.data.payAmount - this.data.hisPayAmount).toFixed(2) - this.data.backAmount - this.data.expressAmount - this.data.totalBalance : 
+        (this.data.adjustAmount - this.data.hisPayAmount).toFixed(2) - this.data.backAmount - this.data.expressAmount - this.data.totalBalance,
         bankAccout: this.data.bankAccout,
         bankAccoutName: this.data.bankAccoutName,
         openBank: this.data.openBank,
         applyPayType: this.data.canApplyPay === 0 ? 1 : this.data.canApplyPay === 1 ? 0 : '',
         payAccount: this.data.payAccount
       }
-      
       SavePayContractBill({
         ...obj
       }).then(res => {

+ 1 - 0
src/view/material-manege/pay/pay2.vue

@@ -1123,6 +1123,7 @@ export default {
 								}
 							}),
 						canApplyPay: item.canApplyPay,
+						contractAmount: item.contractAmount,
 					}
 					this.applyShow = true
 				}