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

src/pages/eashier/service/service.vue

@@ -1848,9 +1848,9 @@ export default {
         let payLists = [];
         let rechargeAccountList = [];
         this.payLists.forEach(item => {
-          this.payMoneysum = this.payMoneysum * 1 + item.payMoney * 1;
+          // this.payMoneysum = this.payMoneysum * 1 + item.payMoney * 1;
 
-          this.payMoneysums = this.payMoneysum / this.list.length;
+          // this.payMoneysums = this.payMoneysum / this.list.length;
 
           if (item.payMoney > 0) {
             let items = {
@@ -1878,34 +1878,19 @@ export default {
         }
       });
 
-      // console.log("🚀 ~ file: service.vue ~ line 1796 ~ addCashConfirm ~ list", list)
-      // list.forEach(item => {
-      //   console.log(item.collectionAmount)
-      //   collectionAmountsum=item.collectionAmount*1+collectionAmountsum*1;
-      // });
-      // console.log("🚀 ~ file: service.vue ~ line 1800 ~ addCashConfirm ~ collectionAmountsum", collectionAmountsum)
+      let collectionAmountsum=0
+      list.forEach(item => {
+        collectionAmountsum=item.collectionAmount*1+collectionAmountsum*1;
+      });
       this.formData.append("cashListRequestList", JSON.stringify(list));
       // collectionAmount
-      if (this.payMoneysums != this.appearPrices) {
+      if (collectionAmountsum==0) {
         this.$alert("还未进行支付", "提示", {
           confirmButtonText: "确定",
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
           center: true,
-          callback: action => {
-            this.payMoneysum = 0;
-            this.payMoneysums = 0;
-            this.payLists.forEach(item=>{
-              item.payMoney=0
-            });
-            var that = this;
-            setTimeout(() => {
-              that.$nextTick(() => {
-                that.$refs.payment.show(that.form, that.payLists);
-              });
-            }, 500);
-            
-          }
+          callback: action => {}
         });
         this.formData = new FormData();
         }else{