Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

src/pages/eashier/service/service.vue

@@ -1898,6 +1898,7 @@ export default {
         let total = eval(this.$refs.payment.payLists.map(item=>{return item.payMoney?item.payMoney*1:0}).join("+"))
         if(this.appearPrices*1 || total){
           if(total>this.appearPrices*1){
+              this.formData = new FormData();
               return this.$alert(`现金金额多出${total-this.appearPrices*1}元`, "提示", {
               confirmButtonText: "确定",
               confirmButtonClass: "confirmbtnFalses",
@@ -1906,6 +1907,7 @@ export default {
               callback: action => {}
             });
           }else if(total<this.appearPrices*1){
+              this.formData = new FormData();
               return this.$alert(`现金金额还需支付${this.appearPrices*1 - total}`, "提示", {
               confirmButtonText: "确定",
               confirmButtonClass: "confirmbtnFalses",
@@ -2479,9 +2481,9 @@ export default {
             ).toFixed(2) * 1;
           money += debtMoney;
         }
-        collectionRechargeAmountg =
+        collectionRechargeAmountg =collectionRechargeAmountg+
-          collectionRechargeAmountg +
+          (item.collectionRechargeAmount.toFixed(2) * 1);
-          item.collectionRechargeAmount.toFixed(2) * 1;
+        
       });
 
       // 总付金额计算