From c7ee67024274f7596da725d8f35ca2e94994e02f Mon Sep 17 00:00:00 2001
From: Wangxubin <wangxubin1999@yeah.net>
Date: Thu, 3 Nov 2022 11:57:31 +0800
Subject: [PATCH] =?UTF-8?q?fixbug:=E6=94=B6=E9=93=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Emain.vue           |    4 +-
 src/pages/eashier/service/copyPayment.vue |  109 ++
 src/pages/eashier/service/mixins.js       |   32 +
 src/pages/eashier/service/payment.vue     |    2 +
 src/pages/eashier/service/service.vue     | 1258 +++++++++++++--------
 5 files changed, 907 insertions(+), 498 deletions(-)
 create mode 100644 src/pages/eashier/service/copyPayment.vue
 create mode 100644 src/pages/eashier/service/mixins.js

diff --git a/src/layout/components/Emain.vue b/src/layout/components/Emain.vue
index 4a5fb98..a587b81 100644
--- a/src/layout/components/Emain.vue
+++ b/src/layout/components/Emain.vue
@@ -24,9 +24,9 @@
     </div>
     <div class="padding-top padding-left padding-right">
       <transition name="fade" mode="out-in">
-        <keep-alive>
+        <!-- <keep-alive> -->
           <router-view />
-        </keep-alive>
+        <!-- </keep-alive> -->
       </transition>
     </div>
   </div>
diff --git a/src/pages/eashier/service/copyPayment.vue b/src/pages/eashier/service/copyPayment.vue
new file mode 100644
index 0000000..5cc3b04
--- /dev/null
+++ b/src/pages/eashier/service/copyPayment.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="flex">
+    <div style="width:100%">
+      <el-table :data="payLists" style="width:280px" class='border' show-summary
+        :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }">
+        <el-table-column align="center" prop="payName" min-width="100" label="支付方式"></el-table-column>
+        <el-table-column align="center" prop="payMoney" min-width="80" label="本次支付 ">
+          <template slot-scope="scope">
+            <div v-if="payIndex != scope.$index" @click="editPay(scope.row, scope.$index)">
+              {{ scope.row.payMoney }}
+              <i class="text-cyan el-icon-edit"></i>
+            </div>
+            <el-input class="form-input-xs" v-else v-focus type="number" @blur="endEdit(scope.row, scope.$index,)"
+              v-model="scope.row.payMoney" size="samll"></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+   props:{
+    form:{
+      type:Object,
+      default:{}
+    },
+    payLists:{
+      type:Array,
+      default:()=>[]
+    }
+  },
+  data() {
+    return {
+      list: [], //主数组
+      rechargeAccountList: [], //卡付列表
+      recIndex: -1,
+      giftIndex: -1,
+      payIndex: -1,
+    };
+  },
+  methods: {
+    //组件传值
+    show(form, list) {
+    },
+    //选择金额.
+    editPay(row, index) {
+      this.payIndex = index;
+      console.log(this.form)
+      if (index = 0) {
+        row.payMoney = (this.form.collectionCashAmounts + row.payMoney).toFixed(2) * 1;
+      }
+      else {
+        let money = 0;
+        var that = this;
+        this.payLists.forEach((item) => {
+          money += item.payMoney * 1;
+        });
+        row.payMoney = (this.form.collectionCashAmounts - money).toFixed(2) * 1;
+      }
+
+    },
+    endEdit(row, index) {
+      this.payIndex = -1;
+      let money = 0;
+      var that = this;
+      this.payLists.forEach((item) => {
+        money += item.payMoney * 1;
+      });
+      if (!row.payMoney) {
+        row.payMoney = 0;
+      } else if (money > this.form.collectionCashAmounts) {
+        this.$alert("输入之和不能大于现付金额", "提示", {
+          confirmButtonText: "确定",
+          confirmButtonClass: "confirmbtnFalses",
+          type: "warning",
+          center: true,
+          callback: (action) => { },
+        });
+        row.payMoney = 0;
+      } else if (row.payMoney < 0) {
+        this.$alert("输入值不能小于0", "提示", {
+          confirmButtonText: "确定",
+          confirmButtonClass: "confirmbtnFalses",
+          type: "warning",
+          center: true,
+          callback: (action) => { },
+        });
+        row.payMoney = 0;
+      } else {
+        row.payMoney = row.payMoney * 1;
+      }
+      this.sumNum();
+    },
+    sumNum() {
+      let payMoney = 0;
+      this.payLists.forEach((item) => {
+        payMoney += item.payMoney * 1;
+      });
+      this.form.collectionCashAmount = payMoney;
+      let form = { form: this.form, list: this.payLists };
+      this.$emit("paymentData", form);
+    },
+  },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/pages/eashier/service/mixins.js b/src/pages/eashier/service/mixins.js
new file mode 100644
index 0000000..e94b3b2
--- /dev/null
+++ b/src/pages/eashier/service/mixins.js
@@ -0,0 +1,32 @@
+export const Mixins = {
+    methods:{
+        handleData(row){
+            if(row){
+                row.rechargeAccountList.forEach(firstItem=>{
+                    let list = []
+                    this.list.forEach(secondItem=>{
+                        secondItem.rechargeAccountList.forEach(thirdItem=>{
+                            if(thirdItem.id === firstItem.id){
+                                list.push(thirdItem)
+                            }
+                        })
+                    })
+                    // 本单使用总和
+                    this.$set(firstItem,'cardSum',eval(list.map(item=>item.spendMoney*1).join("+")))
+                    // 当前行可用
+                    this.$set(firstItem,'CardCurrentUse',firstItem.cardConsumeMoney*1 - firstItem.cardSum*1 + firstItem.spendMoney*1)
+                    // 可用余额
+                    this.$set(firstItem,'cardOvers',firstItem.CardCurrentUse*1 - firstItem.spendMoney*1)
+                    try{
+                        firstItem.cardSum = firstItem.cardSum.toFixed(2) * 1
+                        firstItem.CardCurrentUse = firstItem.CardCurrentUse.toFixed(2) * 1
+                        firstItem.cardOvers = firstItem.cardOvers.toFixed(2) * 1
+                    }catch(err){
+                        
+                    }
+                })
+            }
+            return row
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pages/eashier/service/payment.vue b/src/pages/eashier/service/payment.vue
index 9f39d6e..2f22f99 100644
--- a/src/pages/eashier/service/payment.vue
+++ b/src/pages/eashier/service/payment.vue
@@ -38,10 +38,12 @@ export default {
       that.form = JSON.parse(JSON.stringify(form));
       that.payLists = [];
       that.payLists = JSON.parse(JSON.stringify(list));
+      console.log('form传过来了嘛--->',form)
     },
     //选择金额.
     editPay(row, index) {
       this.payIndex = index;
+      console.log(this.form)
       if (index = 0) {
         row.payMoney = (this.form.collectionCashAmounts + row.payMoney).toFixed(2) * 1;
       }
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index c26be19..5cf5cad 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -406,14 +406,15 @@
                 <el-popover
                   placement="bottom"
                   width="900"
-                  @show="openRec(props.row)"
+                  @show="openRec(props.row,props.$index)"
+                   v-model='props.row.popover'
                 >
                   <div v-if="props.row.courseAccountId == null">
                     <el-table
                       class=" border"
                       v-if="props.row.cashNumber == 1"
                       style="max-width:900px"
-                      :data="rowRecList"
+                      :data="props.row.rechargeAccountList"
                       :summary-method="getSummaries"
                       show-summary
                       max-height="400"
@@ -429,6 +430,35 @@
                         label="卡付名称"
                         width="110"
                       ></el-table-column>
+                      <!-- cardConsumeMoney cardOver -->
+                      <el-table-column
+                        align="center"
+                        prop="cardConsumeMoney"
+                        label="可用金额"
+                        width="70"
+                      ></el-table-column>
+                      <el-table-column
+                        align="center"
+                        prop="CardCurrentUse"
+                        show-overflow-tooltip
+                        label="当前行可用"
+                        width="110"
+                      >
+                      <template slot-scope="scope">
+                        {{ scope.row.CardCurrentUse?scope.row.CardCurrentUse:scope.row.cardOvers }}
+                      </template>
+                      </el-table-column>
+                        <el-table-column
+                        align="center"
+                        prop="cardSum"
+                        show-overflow-tooltip
+                        label="本单使用"
+                        width="110"
+                      >
+                      <template slot-scope="scope">
+                        {{ scope.row.cardSum?scope.row.cardSum:0 }}
+                      </template></el-table-column>
+                      <!-- --- -->
                       <el-table-column align="center" label="类别" width="60">
                         <template slot-scope="scope">
                           <span v-if="scope.row.type == 1">折扣卡</span>
@@ -436,12 +466,6 @@
                           <span v-if="scope.row.type == 2">活动卡</span>
                         </template>
                       </el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="cardOver"
-                        label="可用金额"
-                        width="70"
-                      ></el-table-column>
                       <el-table-column
                         show-overflow-tooltip
                         min-width="70"
@@ -465,25 +489,31 @@
                             {{ scope.row.spendMoney }}
                             <i class="text-cyan el-icon-edit"></i>
                           </div>
+                          <!-- :disabled="scope.row.cardOvers == 0" -->
                           <el-input
-                            :disabled="scope.row.cardOvers == 0"
                             v-else
                             v-focus
                             type="number"
                             size="samll"
+                            onkeyup="value=value.replace(/[^\d]/g,' ')"
                             class="form-input-width"
-                            @blur="endEditcard(scope.row, scope.$index)"
+                            @blur="endEditcard(scope.row, scope.$index,props.$index)"
                             v-model="scope.row.spendMoney"
                           ></el-input>
                         </template>
                       </el-table-column>
                       <!-- <el-table-column align="center" prop="discoutMoney" label="抵扣支付" width="100"></el-table-column> -->
+                      <!-- cardOversActive  cardOvers-->
                       <el-table-column
                         align="center"
                         prop="cardOvers"
                         label="可用余额"
                         width="70"
-                      ></el-table-column>
+                      >
+                      <template slot-scope="scope">
+                        {{ scope.row.cardOvers.toFixed(2) }}
+                      </template>
+                      </el-table-column>
                       <el-table-column
                         align="center"
                         prop="giftConsumeMoney"
@@ -545,7 +575,13 @@
             align="center"
             prop="collectionRechargeAmount"
             label="卡付金额"
-          ></el-table-column>
+          >
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.collectionRechargeAmount?scope.row.collectionRechargeAmount:0 }}
+            </span>
+          </template>
+          </el-table-column>
           <!-- <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额">
           </el-table-column> -->
           <el-table-column
@@ -620,7 +656,7 @@
             </span>
           </div>
         </div>
-        <payment ref="payment" @paymentData="paymentData"></payment>
+        <payment ref="payment" @paymentData="paymentData" :form='form' :payLists='payLists'></payment>
       </div>
     </div>
     <member ref="member" @memberData="memberData"></member>
@@ -660,6 +696,7 @@
   </div>
 </template>
 <script>
+import { Mixins } from './mixins'
 import addmember from "@/components/member/edit/index";
 import message from './detail/message.vue'
 import {
@@ -679,7 +716,7 @@ import project from "@/components/project/index";
 import repayment from "@/components/repayment/index";
 import reccard from "./reccard";
 import course from "./course";
-import payment from "./payment";
+import payment from "./copyPayment";
 import staffratio from "./staffratio";
 import passcode from "./passcode";
 import { propage } from "@/api/storeManage.js";
@@ -687,6 +724,7 @@ import recash from "./recash";
 import orders from "./detail/detail";
 import { partten } from "@/utils/partten/index.js";
 export default {
+  mixins:[Mixins],
   components: {
     member,
     reccard,
@@ -762,7 +800,9 @@ export default {
       card1: 0,
       card2: 0,
       card3: 0,
-      card4: 0
+      card4: 0,
+      copyList:[],
+      spendMoney:null
     };
   },
   computed: {
@@ -773,9 +813,8 @@ export default {
       需要转换下number格式,不然是字符串拼接
       */
       let num = this.list.reduce((pre, item) => {
-        item.transactionPrice = item.transactionPrice
-          ? (item.transactionPrice * 1).toFixed(2) * 1
-          : 0; // 抵扣金额存在,项目金额存在
+        console.log('这是总付金额---->',item)
+        item.transactionPrice = item.transactionPrice? (item.transactionPrice * 1).toFixed(2) * 1: 0; // 抵扣金额存在,项目金额存在
         if (item.courseAccountId == null) {
           item.collectionAmounts = (item.collectionAmounts * 1).toFixed(2) * 1;
         } else {
@@ -790,6 +829,10 @@ export default {
           return pre + 0;
         }
       }, 0);
+      this.$nextTick(()=>{
+        this.form.collectionCashAmounts = num.toFixed(2)*1
+        this.form.cashAmount = this.total
+      })
       return num.toFixed(2)*1;
     },
     appearPrice() {
@@ -814,8 +857,8 @@ export default {
       总价=项目金额-卡付抵扣金额+卡付金额
       需要转换下number格式,不然是字符串拼接
       */
-
-      let total = this.list.reduce((pre, item) => {
+      let list = JSON.parse(JSON.stringify(this.list))
+      let total = list.reduce((pre, item) => {
         item.transactionPrice = item.transactionPrice
           ? (item.transactionPrice * 1).toFixed(2) * 1
           : 0; // 卡付金额/抵扣金额存在
@@ -849,7 +892,6 @@ export default {
       this.projectIndex = index;
     },
     changeMember() {
-      //console.log("-------------------------")
       if (this.cashNumber == 1) {
         Object.assign(this.$data, this.$options.data.call(this));
         this.cashNumber = 0;
@@ -868,396 +910,659 @@ export default {
 
       this.list.splice(row.index, 1, form);
     },
+    // 修改list每行抵扣金额/卡付金额
+    updataList(){
+      let collectionAmounts = 0
+      let collectionRechargeAmount = 0
+      if(this.list[this.projectIndex].noDiscount == 0){
+        // 可以打折的计算
+         this.list[this.projectIndex].rechargeAccountList.forEach(item=>{
+            collectionRechargeAmount += item.spendMoney*1
+            collectionAmounts += ( ( (item.spendMoney*1)/ ((item.discount?item.discount:100)/100) ) + ((item.giftSpendMoney?item.giftSpendMoney*1:0)/(item.discountFreeAmount?item.discountFreeAmount/100:1)))
+        })
+        collectionRechargeAmount = collectionRechargeAmount.toFixed(2)*1
+        collectionAmounts = collectionAmounts.toFixed(2)*1
+        this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount)
+        this.$set(this.list[this.projectIndex],'collectionAmounts',collectionAmounts)
+      }else{
+        // 不能打折的计算
+        this.list[this.projectIndex].rechargeAccountList.forEach(item=>{
+          collectionRechargeAmount += item.spendMoney*1
+          collectionAmounts += ((item.spendMoney*1) + (item.giftSpendMoney?item.giftSpendMoney*1:0))
+        })
+        collectionRechargeAmount = collectionRechargeAmount.toFixed(2)*1
+        collectionAmounts = collectionAmounts.toFixed(2)*1
+        this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount)
+        this.$set(this.list[this.projectIndex],'collectionAmounts',collectionAmounts)
+      }
+    },
     //修改卡付金额
     editcard(row, index) {
-      //console.log("🚀 ~ file: service.vue ~ line 837 ~ editcard ~ row", row);
       this.recIndex = index;
-
-      //console.log("🚀 ~ file: service.vue ~ line 843 ~ editcard ~ this.rowRecList[index].type", this.rowRecList[index].type)
-      if (this.rowRecList[index].type == 1) {
-        if (this.list[this.projectIndex].noDiscount == 1) {
-          this.rowRecList[index].spendMoney = this.appearPrice;
-        } else {
-          this.rowRecList[index].spendMoney =
-            (this.appearPrice * 1 * (row.discount / 100) * 1).toFixed(2) * 1;
-        }
-        this.rowRecList[index].giftSpendMoney = 0;
-      } else {
-        if (this.useRecharge == 2) {
-          if (this.recForm.noDiscount == 0) {
-            //可以打折
-            if (this.rowRecList[index].offsetMoney > this.rowRecList[index]) {
-              //判断充值可用金额是否大于成交价如果大于直接用充值可用金额计算
-              this.rowRecList[index].spendMoney =
-                (
-                  this.appearPrice *
-                  (this.rowRecList[index].discount / 100)
-                ).toFixed(2) * 1;
-            } else {
-              //判断充值可用金额是否大于成交价如果小于选择最大充值金额，剩下的用赠送金额计算
-              this.rowRecList[index].spendMoney = //获取充值金折扣金额
-                (
-                  this.rowRecList[index].cardOver *
-                  (this.rowRecList[index].discount / 100)
-                ).toFixed(2) * 1;
-              this.rowRecList[index].giftSpendMoney =
-                (
-                  (this.appearPrice - this.rowRecList[index].spendMoney) *
-                  this.rowRecList[index].discountFreeAmount
-                ).toFixed(2) * 1; //计算赠送金额
+      // 本次需要支付的金额
+      let appearPrice = this.list[this.projectIndex].transactionPrice - (this.list[this.projectIndex].collectionAmounts?this.list[this.projectIndex].collectionAmounts*1:0)
+      //  卡付抵扣金额collectionAmounts  卡付金额collectionRechargeAmount
+      //  本次支付spendMoney 可用金额cardConsumeMoney  可用余额cardOvers 可用折扣discount  赠送折扣discountFreeAmount  赠送支付giftSpendMoney 赠送剩余cardGiftOvers 
+      //  type:0折扣卡 1赠送卡 2活动卡  noDiscount 0 能打折 1 不打折    appearPrice当前需要支付多少
+      if( row.spendMoney){
+        // 要修改
+        row.spendMoney = 0
+        row.cardOvers =  row.CardCurrentUse 
+        row.cardGiftOvers = row.cardGiftOvers +(row.giftSpendMoney?row.giftSpendMoney*1:0)
+        row.giftSpendMoney = 0
+        this.list.push({})
+        this.list.pop()
+        return this.updataList()
+      }
+      if(this.useRecharge !== 1 && row.cardOvers ==0 && row.giftSpendMoney){ //可用余额不存在并且门店参数不等于1并且赠送支付存在触发
+        row.spendMoney = 0 
+        row.cardGiftOvers = (row.cardGiftOvers?row.cardGiftOvers*1:0) + (row.giftSpendMoney?row.giftSpendMoney*1:0)
+        row.giftSpendMoney = 0
+        // 不知名错误，别删
+        this.$set(this.list[this.projectIndex],'popover',false)
+        this.$set(this.list[this.projectIndex],'popover',true)
+        this.list.push({})
+        this.list.pop()
+        return this.updataList()
+      }
+      if(this.useRecharge == 1){ //门店参数 按比例支付
+        if(this.list[this.projectIndex].noDiscount == 0){
+          // 可以打折
+          if(!row.cardGiftOvers){ //没有赠送金额(赠送剩余)
+            // 获取当前值最大数
+            let total = row.cardOvers/(row.discount*1)*100
+            // 判断是否大于需要支付金额
+            if(appearPrice>total){
+              row.spendMoney = row.cardOvers
+              // this.updataList()
+            }else{
+              // 当前金额大于当前值
+              console.log('当前剩余金额-->',appearPrice,'折扣是多少-->',row.discount)
+              row.spendMoney = appearPrice*(row.discount*1/100).toFixed(2)*1
+              // this.updataList()
             }
-          } else {
-            //不可以打折
-            if (form.offsetMoney > debtMoney) {
-              //判断充值可用金额是否大于成交价如果大于直接用充值可用金额计算
-              this.rowRecList[index].spendMoney = this.appearPrice;
-            } else {
-              //判断充值可用金额是否大于成交价如果小于选择最大充值金额，剩下的用赠送金额计算
-              this.rowRecList[index].spendMoney = this.rowRecList[
-                index
-              ].cardOver;
-              this.rowRecList[index].giftSpendMoney =
-                (this.appearPrice - this.rowRecList[index].spendMoney).toFixed(
-                  2
-                ) * 1;
+          }else{
+            // 有赠送金额
+            let total = (row.cardOvers/(row.discount*1)*100 + ( row.cardGiftOvers/( (row.discountFreeAmount?row.discountFreeAmount:100)*1 )*100 )).toFixed(2)*1
+            let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //可用余额比例
+            let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //赠送金额比例
+            balanceProportion = balanceProportion.toFixed(4)*1
+            giveProportion = giveProportion.toFixed(4)*1
+            console.log('可用比例-->',balanceProportion,'赠送比例--->',giveProportion)
+            if(appearPrice<total){
+              // 够用按比例扣除
+              row.spendMoney = (appearPrice*balanceProportion*((row.discount?row.discount*1:100)/100)).toFixed(2)*1
+              row.giftSpendMoney = (appearPrice*giveProportion*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)
+              row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
+              console.log('来了这里--->')
+              // this.updataList()
+            }else{
+              // 如果总额不够付,扣掉所有的折扣可用余额并且把剩余金额也扣掉
+              console.log('我不够扣',total)
+              row.spendMoney = row.cardConsumeMoney
+              row.giftSpendMoney = row.cardGiftOvers
+              row.cardGiftOvers = 0
+              // this.updataList()
             }
           }
-        } else {
-          let sunRatio =
-            (
-              this.rowRecList[index].cardOver /
-                this.rowRecList[index].discount +
-              this.rowRecList[index].giftConsumeMoney /
-                this.rowRecList[index].discountFreeAmount
-            ).toFixed(2) *
-            1 *
-            1; ///可用余额+赠送余额
-          let recRatio =
-            (
-              this.rowRecList[index].cardOver /
-              this.rowRecList[index].discount /
-              sunRatio
-            ).toFixed(2) * 1; //可用余额比例
-          let recGiftRatio =
-            (
-              this.rowRecList[index].giftConsumeMoney /
-              this.rowRecList[index].discountFreeAmount /
-              sunRatio
-            ).toFixed(2) * 1; //赠送余额比例
-          if (
-            this.rowRecList[index].offsetMoney >
-            this.appearPrice * recRatio
-          ) {
-            if (this.recForm.noDiscount == 0) {
-              //可以打折
-              this.rowRecList[index].discoutMoney =
-                (this.appearPrice * 1 * recRatio).toFixed(2) * 1; //充值卡支付的钱
-              this.rowRecList[index].discoutMoney = Math.trunc(
-                this.rowRecList[index].discoutMoney
-              );
-              //console.log("🚀 ~ file: service.vue ~ line 899 ~ editcard ~ this.appearPrice", this.appearPrice)
-              this.rowRecList[index].discoutGiftMoney =
-                (
-                  this.appearPrice - this.rowRecList[index].discoutMoney
-                ).toFixed(2) * 1; //赠送实际出的钱
-              this.rowRecList[index].discoutGiftMoney = Math.trunc(
-                this.rowRecList[index].discoutGiftMoney
-              );
-              //console.log("🚀 ~ file: service.vue ~ line 897 ~ editcard ~ this.rowRecList[index].discoutGiftMoney", this.rowRecList[index].discoutGiftMoney)
-              this.rowRecList[index].spendMoney =
-                (
-                  this.rowRecList[index].discoutMoney *
-                  (this.rowRecList[index].discount / 100)
-                ).toFixed(2) * 1; //赠送卡抵扣支付的钱
-              this.rowRecList[index].giftSpendMoney =
-                (
-                  this.rowRecList[index].discoutGiftMoney *
-                  (this.rowRecList[index].discountFreeAmount / 100)
-                ).toFixed(2) * 1;
-            } else {
-              //不可以打折
-              this.rowRecList[index].spendMoney =
-                (this.appearPrice * 1 * recRatio).toFixed(2) * 1; //充值卡支付的钱
-              this.rowRecList[index].giftSpendMoney =
-                (this.appearPrice * 1 * recGiftRatio).toFixed(2) * 1; //赠送实际出的钱
+
+        }else{
+          // 不能打折
+          let total = row.cardOvers + row.cardGiftOvers
+          console.log('还需支付多少--->',appearPrice)
+          if(total>appearPrice){ // 总额大于待支付金额
+            // 够付的情况按照比例扣除
+            let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //可用余额比例
+            let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //赠送金额比例
+            balanceProportion = balanceProportion.toFixed(2)*1
+            giveProportion = giveProportion.toFixed(2)*1
+            row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
+            row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
+            row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+          }else{ //
+            row.spendMoney = row.cardOvers
+            row.giftSpendMoney = row.cardGiftOvers
+            row.cardGiftOvers = 0
+            // this.updataList()
+          }
+        }
+      }else{ //先用实冲，再用赠送
+        console.log('来到了门店参数2--->')
+        //做法 扣除本次支付/赠送支付/赠送剩余 
+        if(this.list[this.projectIndex].noDiscount == 0){ //可以打折
+        // 先算出折扣总额够不够支付项目金额
+        let total = ((row.cardOvers/(row.discount?row.discount*1:100))*100) + ((row.cardGiftOvers/(row.discountFreeAmount?row.discountFreeAmount:100))*100) //折后(赠送/可用)总和
+        console.log('总额是多少--->',total,'这个是多少--->',(row.cardOvers/(row.discount?(row.discount*1)/100:1)))
+        // 当可用余额为0并且赠送支付存在并在待支付金额存在触发
+        if(row.cardOvers === 0 && row.cardGiftOvers && appearPrice){ //当可用余额为0并且赠送金额存在时
+        this.$message.warning({ message: "当前卡付余额为0,将自动扣除赠送金额" });
+        if(total>appearPrice){ //当前赠送够支付
+          row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1
+          row.spendMoney = row.giftSpendMoney
+          row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+        }else{ //当前卡不够支付
+          row.spendMoney = row.cardGiftOvers
+          row.giftSpendMoney = row.cardGiftOvers
+          row.cardGiftOvers = 0
+        }
+        return
+        }
+        if( total>appearPrice ){ //折扣总额够支付项目,先扣除可用余额折扣，如果够扣，就只扣他自己，不够扣再扣赠送金额折扣
+          if( (row.cardOvers/(row.discount?(row.discount*1)/100:1)) > appearPrice ){ //自己本身折扣金额够扣,直接扣除本身
+            row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1
+          }else{  //不够扣时,扣光自己的可用余额并且算上差价继续扣赠送金额
+            row.spendMoney = row.cardOvers
+            let remainderCsee = appearPrice - ((row.spendMoney/row.discount)*100) //剩余支付
+            console.log('还需要支付多少--->',remainderCsee)
+            row.giftSpendMoney = remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1) //算出还需支付多少
+            row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+          }
+        }else{ //折后金额总和不够支付项目金额,直接扣除
+          row.spendMoney = row.cardOvers // 支付金额 直接赋值支付金额
+          row.giftSpendMoney = row.cardGiftOvers //赠送支付-- 赋值所有赠送支付
+          row.cardGiftOvers = 0 //清空赠送剩余
+        }
+        }else{ //不能打折
+          let total = (row.cardOvers?row.cardOvers*1:0) + (row.cardGiftOvers?row.cardGiftOvers:0) //赠送跟卡付总和
+          if(row.cardOvers === 0 && row.cardGiftOvers && appearPrice){ //当可用余额为0并且赠送金额存在时
+            this.$message.warning({ message: "当前卡付余额为0,将自动扣除赠送金额" });
+            if( total>appearPrice ){ //当前卡够支付
+              row.spendMoney = appearPrice
+              row.giftSpendMoney = appearPrice
+              row.cardGiftOvers = row.cardGiftOvers - appearPrice
+            }else{ //当前卡剩余余额不够支付
+              row.spendMoney = row.cardGiftOvers
+              row.giftSpendMoney = row.cardGiftOvers
+              row.cardGiftOvers = 0
             }
+            return
+          }
+          if(total>appearPrice){ //当前卡够支付项目金额
+           if(row.cardOvers>appearPrice){ //自己本身余额够支付项目,那就先扣除自己的
+            row.spendMoney = appearPrice
+           }else{ //需要算上差价
+            let remainderCsee = appearPrice - row.cardOvers //赠送还要补充多少
+            row.spendMoney = row.cardOvers
+            row.giftSpendMoney = remainderCsee
+            row.cardGiftOvers = row.cardGiftOvers - remainderCsee
+           }
+          }else{ //当前卡不够支付项目金额
+            row.spendMoney = row.cardOvers
+            row.giftSpendMoney = row.cardGiftOvers
+            row.cardGiftOvers = 0
           }
-          // else {
-          //   form.spendMoney = form.cardOver;
-          //   form.discoutMoney =
-          //     (form.spendMoney * 1 * (form.discount / 100)).toFixed(2) * 1;
-          //   form.giftSpendMoney =
-          //     (((form.spendMoney * 1) / recRatio) * recGiftRatio).toFixed(2) *
-          //     1;
-
-          //   form.discoutGiftMoney = //赠送卡支付的钱
-          //     (form.giftSpendMoney * (form.discount / 100)).toFixed(2) * 1;
-          // }
         }
+        this.spendMoney = row.spendMoney //判断上一次是否改变,只用来门店参数为2时使用
+        console.log('上一次的值是多少呢------>',this.spendMoney)
       }
-      this.card1 = this.rowRecList[index].spendMoney;
-      this.card4 = this.rowRecList[index].spendMoney;
-      this.card2 = this.rowRecList[index].giftSpendMoney;
-      this.card3 = this.rowRecList[index].spendMoney;
-      this.rowRecList[index].cardOvers =
-        (
-          this.rowRecList[index].cardOver - this.rowRecList[index].spendMoney
-        ).toFixed(2) * 1;
-      this.rowRecList[index].cardOver =
-        (
-          this.rowRecList[index].cardOver - this.rowRecList[index].spendMoney
-        ).toFixed(2) * 1;
-      this.rowRecList[index].cardGiftOvers =
-        (
-          this.rowRecList[index].giftConsumeMoney -
-          this.rowRecList[index].giftSpendMoney
-        ).toFixed(2) * 1;
-      this.rowRecList[index].giftConsumeMoney =
-        (
-          this.rowRecList[index].giftConsumeMoney -
-          this.rowRecList[index].giftSpendMoney
-        ).toFixed(2) * 1;
-
-      if (this.rowRecList[index].cardOvers < 0) {
-        this.$message.info({
-          message: "此卡可用余额不足。"
-        });
-        this.rowRecList[index].cardOvers =
-          (
-            this.rowRecList[index].cardOvers + this.rowRecList[index].spendMoney
-          ).toFixed(2) * 1;
-        this.rowRecList[index].spendMoney =
-          this.rowRecList[index].cardOvers.toFixed(2) * 1;
-        this.rowRecList[index].cardOvers = 0;
-      }
-      if (this.rowRecList[index].cardGiftOvers < 0) {
-        this.$message.info({
-          message: "此卡赠送余额不足。"
-        });
-        this.rowRecList[index].cardGiftOvers =
-          (
-            this.rowRecList[index].cardGiftOvers +
-            this.rowRecList[index].gifSpendMoney
-          ).toFixed(2) * 1;
-        this.rowRecList[index].gifSpendMoney =
-          this.rowRecList[index].cardGiftOvers.toFixed(2) * 1;
-        this.rowRecList[index].cardGiftOvers = 0;
-      }
-      // }
-      // this.recIndex = -1;
     },
-    endEditcard(row, index) {
-      this.recForm.cashAmount = 0;
-      //console.log(this.recForm);
 
-      // if(this.projectMomey==this.recForm.amount){
-      //   this.projectMomey=0
-      // }
-      // if(this.projectMomey<0){
-      //   this.projectMomey=this.recForm.amount
-      // }
-      let debtMoney =
-        (this.recForm.amount * 1 - this.recForm.cashAmount * 1).toFixed(2) * 1; //获取成交价
-      let form = { ...row }; //复制row
-      if (form.spendMoney > this.card4) {
-        this.$message.info({
-          message: "卡付金额大于项目金额"
-        });
-        form.spendMoney = this.card4;
-      }
-      if (form.spendMoney < 0) {
-        this.$message.info({
-          message: "卡付金额不能小于0"
-        });
-        form.spendMoney = 0;
-      }
-      if (debtMoney > 0) {
-        //判断成交价是否大于0
-        console.log('成交额大于0--->>',debtMoney,form)
-        if (form.type == 2 || form.type == 0) {
-          //判断卡种2是活动卡，0是赠送卡，两者貌似都有赠送金额
-          if (this.useRecharge == 2) {
-            //先用充值再用赠送
-            if (this.recForm.noDiscount == 0) {
-              //可以打折
-              if (form.offsetMoney > debtMoney) {
-                //判断充值可用金额是否大于成交价如果大于直接用充值可用金额计算
-                form.discoutMoney =
-                  ((form.spendMoney / form.discount) * 100).toFixed(2) * 1;
-              } else {
-                //判断充值可用金额是否大于成交价如果小于选择最大充值金额，剩下的用赠送金额计算
-                form.spendMoney = form.cardOver;
-                form.discoutMoney = //获取充值金折扣金额
-                  (form.cardOver / (form.discount / 100)).toFixed(2) * 1;
-                form.giftSpendMoney =
-                  (debtMoney - form.discoutMoney).toFixed(2) * 1; //计算赠送金额
-                form.discoutGiftMoney =
-                  (
-                    (debtMoney - form.discoutMoney) /
-                    (form.discountFreeAmount / 100)
-                  ).toFixed(2) * 1; ////计算赠送金额折扣金额
+    endEditcard(row, index) { //看不懂别乱改!!!!!! 
+      console.log('测试---二进制--->>>',0.1+0.2)
+      //  卡付抵扣金额collectionAmounts  卡付金额collectionRechargeAmount
+      //  本次支付spendMoney 可用金额cardConsumeMoney  可用余额cardOvers 可用折扣discount  赠送折扣discountFreeAmount  赠送支付giftSpendMoney 赠送剩余cardGiftOvers 
+      //  type:0折扣卡 1赠送卡 2活动卡  noDiscount 0 能打折 1 不打折 
+      this.recIndex = -1
+      if(row.spendMoney === 0)return
+      let appearPrice = this.list[this.projectIndex].transactionPrice - (this.list[this.projectIndex].collectionAmounts?this.list[this.projectIndex].collectionAmounts*1:0) //本次需要支付的钱
+      if(this.useRecharge == 1){ //门店参数 按比例支付
+        if(this.list[this.projectIndex].noDiscount == 0){ //可以打折 0
+        row.spendMoney = row.spendMoney*1 //转化
+          if(row.spendMoney>row.cardOvers){ //如果输入的大于本身余额
+            this.$message.warning({ message: "支付金额大于卡付余额" });
+            // 如果输入金额大于可支付金额，则需要判断当前卡够不够支付，如果够支付，就扣除当前卡跟赠送,如果当前卡不够支付，扣除掉所有的赠送支付跟可用余额
+            // 注意！！！ 需要还原之前的赠送
+            let total =( row.cardOvers*1/row.discount*100 ).toFixed(2)*1 + ( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ) //当前卡总额
+            console.log('当前卡总额--->',total,'还需支付--->',appearPrice)
+            if(total>appearPrice){//当前卡够支付
+              //  够支付，按比例扣除,可能赠送存在或者不存在
+              let balanceProportion = row.cardOvers*1/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))  //可用余额比例
+              let giveProportion =  (row.cardGiftOvers*1 + (row.giftSpendMoney?row.giftSpendMoney*1:0))/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))//赠送金额比例
+              balanceProportion = balanceProportion.toFixed(4)*1
+              giveProportion = giveProportion.toFixed(4)*1
+              row.spendMoney = (appearPrice*balanceProportion*(row.discount/100)).toFixed(2)*1 //得到支付金额
+              row.cardGiftOvers = (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 //还原赠送支付
+              row.giftSpendMoney = ((appearPrice*giveProportion)*(row.discountFreeAmount/100)).toFixed(2)*1 //
+              row.cardGiftOvers = (row.cardGiftOvers*1 - row.giftSpendMoney*1).toFixed(2)*1 // 赠送剩余= 赠送剩余原始值-赠送支付
+              // 有误差
+              if(row.cardGiftOvers<0){
+                row.cardGiftOvers = 0
               }
-            } else {
-              //不可以打折
-              if (form.offsetMoney > debtMoney) {
-                //判断充值可用金额是否大于成交价如果大于直接用充值可用金额计算
-                form.discoutMoney = form.spendMoney;
-              } else {
-                //判断充值可用金额是否大于成交价如果小于选择最大充值金额，剩下的用赠送金额计算
-                form.spendMoney = form.cardOver;
-                form.discoutMoney = form.cardOver.toFixed(2) * 1;
-                form.giftSpendMoney =
-                  (debtMoney - form.discoutMoney).toFixed(2) * 1;
-                form.discoutGiftMoney =
-                  (debtMoney - form.discoutMoney).toFixed(2) * 1;
+              row.cardOvers = (row.cardOvers - row.spendMoney).toFixed(2)*1  //可用余额=原始可用余额-支付金额
+              this.updataList()
+              console.log('可用余额比例-->',balanceProportion,'赠送金额比例-->',giveProportion)
+            }else{ //当前卡不够支付,扣掉所有的可用余额比例跟赠送余额
+              row.spendMoney = row.cardOvers //本次支付等于剩余余额
+              row.cardOvers = 0
+              row.giftSpendMoney = (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers //扣除所有的赠送
+              row.cardGiftOvers = 0
+              this.updataList()
+            }
+          }else{ // 输入的值不大于本卡金额
+            // 输入的金额也要做判断,判断是否大于支付金额,如果大于支付金额,就拿支付金额按比例付款,小于则按输入金额付款 
+            // ！！！这里也需要还原之前的赠送！！！
+            row.cardGiftOvers = (row.cardGiftOvers?row.cardGiftOvers*1:0) + (row.giftSpendMoney?row.giftSpendMoney*1:0) //还原之前赠送金额
+            row.giftSpendMoney = 0 //还原赠送支付
+            let balanceProportion =  row.cardOvers/(row.cardOvers + (row.cardGiftOvers?row.cardGiftOvers*1:0)) //  可用金额比例
+            let giveProportion = (row.cardGiftOvers?row.cardGiftOvers*1:0)/(row.cardOvers + (row.cardGiftOvers?row.cardGiftOvers*1:0)) //  可用赠送比例
+            balanceProportion = balanceProportion.toFixed(4)*1
+            giveProportion = giveProportion.toFixed(4)*1
+            // 先要判断输入金额是否大于项目金额
+            if(row.spendMoney > appearPrice){ // 输入的金额大于项目金额
+              this.$message.warning({ message: "支付金额大于成交金额" });
+              //  当输入金额大于项目金额时（就是比如说输入400的时候,而这个项目总价是350），帮它自动计算（比例扣除）
+              console.log('瞅瞅比例','可用---',balanceProportion,'赠送---',giveProportion)
+              // 自动计算
+              row.spendMoney = (appearPrice*balanceProportion*(row.discount/100)).toFixed(2)*1
+              row.cardOvers = (row.cardOvers - row.spendMoney).toFixed(2)*1
+              console.log('可用余额为--->',row.cardOvers)
+              row.giftSpendMoney = ((appearPrice*giveProportion)*(row.discountFreeAmount?row.discountFreeAmount/100:1)).toFixed(2)*1
+              row.cardGiftOvers =( row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
+              // 有误差
+              if(row.cardGiftOvers<0){
+                row.cardGiftOvers = 0
+              }
+              this.updataList()
+            }else{ //支付金额不大于项目金额
+              // 这里要判断支付的金额加赠送是否大于项目金额，如果大于，帮他自动计算，不大于则扣除
+              console.log('来到了这里---')
+              // 先要判断输入的金额折扣是否大于项目金额,如果大于,帮他自动计算,
+              // 不大于的话，还要判断折扣金额跟折扣赠送是否大于项目金额,
+              let total = ((row.spendMoney/row.discount)*100).toFixed(2)*1 //获取当前输入值折扣
+              console.log('总价--->',total)
+              if(total > appearPrice){ //当前输入值折扣大于支付金额
+               //  按比例自动计算
+               this.$message.warning({ message: "支付金额大于成交金额" });
+               row.spendMoney = ((appearPrice*balanceProportion)*((row.discount?row.discount*1:100)/100)).toFixed(2)*1  //支付金额
+               row.giftSpendMoney = ((appearPrice*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1 //赠送支付
+               row.cardOvers = ( row.cardOvers - row.spendMoney ).toFixed(2)*1 //可用余额
+               row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
+               if(row.cardGiftOvers<0){
+                row.cardGiftOvers = 0
+               }
+               this.updataList()
+              }else{ // 不超过的情况
+              //  判断比例支付是否大于支付金额，如果大于，提示它并且帮它自动计算,不大于则扣除相应比例金额
+              let giveCase = (((row.spendMoney/(row.discount?row.discount/100:1))/balanceProportion)*giveProportion).toFixed(2)*1 //按照比例算出赠送金额为多少
+              console.log('你是多少--->',giveCase,total)
+              if( (giveCase+total)>= appearPrice ){ //如果输入金额折扣跟赠送折扣之和大于待支付金额,重新按照比例计算
+              console.log('误差是多少--->',giveCase+total,'待支付是多少--->',appearPrice)
+                if(((giveCase+total)-appearPrice)>= this.balance*1)this.$message.warning({ message: "输入金额金额跟赠送金额之和大于成交金额" });
+                // 重新帮忙计算
+                row.spendMoney = ((appearPrice*balanceProportion)*((row.discount?row.discount*1:100)/100)).toFixed(2)*1 //支付金额
+                row.giftSpendMoney = ((appearPrice*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1 //赠送支付
+                row.cardOvers = ( row.cardOvers - row.spendMoney ).toFixed(2)*1 //赠送支付
+                row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
+                // 有误差
+                if(row.cardGiftOvers<0){
+                  row.cardGiftOvers = 0
+                }
+                this.updataList()
+              }else{ //按照输入扣除
+                  console.log('我到了这里呀！！！',giveProportion,balanceProportion)
+                  row.cardOvers = ( row.cardOvers - row.spendMoney ).toFixed(2)*1 //可用余额
+                  row.giftSpendMoney = ((((row.spendMoney/(row.discount?row.discount/100:1))/balanceProportion)*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1  //赠送支付(按比例公式--- 支付金额/支付折扣/支付比例*赠送比例*赠送折扣 ---)
+                  console.log('赠送支付为多少---->',row.giftSpendMoney)
+                  row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
+                  // 有误差
+                  if(row.cardGiftOvers<0){
+                    row.cardGiftOvers = 0
+                  }
+                  this.updataList()
+                }
               }
             }
-          } else {
-            console.log('来到了按比例使用')
-            //按比例使用
-            let sunRatio =
-              (form.cardOver + form.giftConsumeMoney).toFixed(2) * 1; ///可用余额+赠送余额
-            let recRatio = (form.cardOver / sunRatio).toFixed(2) * 1; //可用余额比例
-            let recGiftRatio =
-              (form.giftConsumeMoney / sunRatio).toFixed(2) * 1; //赠送余额比例
-            if (form.offsetMoney > debtMoney * recRatio) {
-              console.log('会到这里---|||---',this.recForm.noDiscount)
-              if (this.recForm.noDiscount == 0) {
-                //可以打折
-                form.discoutMoney =
-                  ((form.spendMoney * 1) / (form.discount / 100)).toFixed(2) *
-                  1; //充值卡支付的钱
-                if (form.spendMoney == this.card3) {
-                  form.giftSpendMoney = this.card2; //赠送实际出的钱
-                  form.discoutGiftMoney =
-                    (
-                      (form.giftSpendMoney * 1) /
-                      (form.discountFreeAmount / 100)
-                    ).toFixed(2) * 1;
-                } else {
-                  form.giftSpendMoney =
-                    (((form.spendMoney * 1) / recRatio) * recGiftRatio).toFixed(
-                      2
-                    ) * 1; //赠送实际出的钱
-                  form.discoutGiftMoney =
-                    (
-                      (form.giftSpendMoney * 1) /
-                      (form.discountFreeAmount / 100)
-                    ).toFixed(2) * 1;
+          }
+        }else{ //不能打折
+        // 算出比例
+         let balanceProportion = row.cardOvers*1/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))  //可用余额比例
+         let giveProportion =  (row.cardGiftOvers*1 + (row.giftSpendMoney?row.giftSpendMoney*1:0))/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))//赠送金额比例
+         balanceProportion = balanceProportion.toFixed(4)*1
+         giveProportion = giveProportion.toFixed(4)*1
+         row.cardGiftOvers = (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 //还原赠送支付
+         row.giftSpendMoney = 0 //清空赠送支付
+         console.log('现在的赠送余额是多少----->',row.cardGiftOvers,'比例是多少--->',balanceProportion,'另外一个比例---->',giveProportion)
+        if(row.spendMoney > row.cardOvers){ //  当输入的金额大于自身可用金额时
+          this.$message.warning({ message: "支付金额不能大于可用余额" });
+          // 自动计算
+          let total = row.cardOvers + row.cardGiftOvers
+          console.log('为多少--->',row.cardOvers,row.cardGiftOvers)
+          if(total>appearPrice){ //当（可用余额加上可用赠送）大于项目金额时，按比例自动扣除
+            row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+            row.cardOvers = row.cardOver - row.spendMoney //可用余额= 可用余额-支付金额
+            row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
+            row.cardGiftOvers =( row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余 = 赠送剩余-赠送支付
+            this.updataList()
+          }else{ //（可用余额跟赠送支付）小于项目金额,自动扣除全部
+            row.spendMoney = row.cardOvers //支付金额=可用余额
+            row.cardOvers = 0 //清空可用余额
+            row.giftSpendMoney = row.cardGiftOvers //赠送支付 = 赠送剩余
+            row.cardGiftOvers = 0 //清空赠送剩余
+            this.updataList()
+          }
+        }else{ //输入金额不大于自己可用余额
+            // 需要判断输入金额是否大于项目金额,如果大于项目金额,帮他自动计算,如果不大于，则还需要判断（赠送比例+余额比例）是否够支付项目金额
+            if(row.spendMoney > appearPrice){ //如果支付金额大于项目金额
+              this.$message.warning({ message: "支付金额不能大于成交金额" });
+              // 大于的话自动计算
+              row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+              row.cardOvers = row.cardOvers - row.spendMoney //可用余额=可用余额-支付金额
+              row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
+              row.cardGiftOvers = (row.cardOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余= 赠送剩余-赠送支付
+              this.updataList()
+            }else{ //输入的金额不大于项目金额
+              // 需要判断比例总和是否大于项目金额
+              let giveCase = ((row.spendMoney/balanceProportion)*giveProportion)*1 //按比例算出的赠送支付
+              if(((row.spendMoney*1 + giveCase)*1) > appearPrice){ 
+                // 如果按比例之和大于项目金额，大于的情况一定是够支付的！！！
+                if((((row.spendMoney*1 + giveCase)*1) - appearPrice)>=this.balance*1)this.$message.warning({ message: "按比例支付总和大于成交金额" }); //判断误差
+                // 自动计算
+                console.log('是多少-->',row.spendMoney,'总额-->',row.cardOvers)
+                row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+                row.cardOvers = row.cardOvers - row.spendMoney //可用余额=可用余额-支付金额
+                row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
+                row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余= 赠送剩余-赠送支付
+                this.updataList()
+              }else{ //按比例支付总和不大于项目金额
+                row.spendMoney = row.spendMoney*1
+                row.cardOvers = row.cardOvers - row.spendMoney //可用余额
+                row.giftSpendMoney = ((row.spendMoney/balanceProportion)*giveProportion).toFixed(2)*1 //赠送支付
+                row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
+                this.updataList()
+              }
+            }
+          }
+        }
+        this.list.push({})
+        this.list.pop()
+      }else{ //先用实充，再用赠送
+        if(row.spendMoney === this.spendMoney){ //上一次的值没有改变
+          console.log('现在只执行这里---->!!!')
+          row.cardOvers = (row.cardOvers - row.spendMoney).toFixed(2)*1
+          this.updataList()
+          this.list.push({})
+          this.list.pop()
+          return
+        }
+        if(this.list[this.projectIndex].noDiscount == 0){ //可以打折
+          // 还原原先赠送以及赠送支付
+          row.cardGiftOvers = row.cardGiftOvers + row.giftSpendMoney //还原赠送剩余
+          row.giftSpendMoney = 0 //还原赠送支付
+          // 只有可用余额为0并且赠送金额存在时触发
+          if(row.cardOvers === 0 && row.cardGiftOvers){ //当可用余额为0时，扣除赠送支付
+            let discountGive = (row.cardGiftOvers/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1)).toFixed(2)*1
+            if(row.spendMoney>row.cardGiftOvers){ //当输出金额大于赠送金额时
+              this.$message.warning({ message: "支付金额大于卡付赠送余额" });
+              // 判断够不够支付
+              if(discountGive>appearPrice){ //当前卡够支付
+                row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1
+                row.cardGiftOvers = (row.cardGiftOvers - row.discountFreeAmount).toFixed(2)*1
+                row.spendMoney = 0
+                row.cardOvers = 0
+                // 不知名错误,未展示扣除,需要关闭再打开
+                this.$set(this.list[this.projectIndex],'popover',false)
+                this.$set(this.list[this.projectIndex],'popover',true)
+                this.list.push({})
+                this.list.pop()
+                return this.updataList() 
+              }else{ //当前赠送余额不够支付
+                // 扣除所有
+                row.giftSpendMoney = row.cardGiftOvers
+                row.cardGiftOvers = 0
+                row.spendMoney = 0
+                row.cardOvers = 0
+                // 不知名错误,未展示扣除,需要关闭再打开
+                this.$set(this.list[this.projectIndex],'popover',false)
+                this.$set(this.list[this.projectIndex],'popover',true)
+                this.list.push({})
+                this.list.pop()
+                return this.updataList() 
+              }
+            }else{ //输入金额不大于赠送余额
+              if(row.spendMoney>appearPrice){ //当输入金额大于项目金额时
+                this.$message.warning({ message: "支付金额不能大于项目金额" });
+                let discountGive = (row.cardGiftOvers/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1)).toFixed(2)*1 //赠送折扣总和
+                if(discountGive>appearPrice){ //折扣赠送总和够支付项目金额
+                  row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1
+                  row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 
+                  row.spendMoney = 0
+                  row.cardOvers = 0
+                  // 不知名错误,未展示扣除,需要关闭再打开
+                  this.$set(this.list[this.projectIndex],'popover',false)
+                  this.$set(this.list[this.projectIndex],'popover',true)
+                  this.list.push({})
+                  this.list.pop()
+                  return this.updataList() 
+                }else{ //当前赠送余额不够支付
+                  // 扣除所有
+                  row.giftSpendMoney = row.cardGiftOvers
+                  row.cardGiftOvers = 0
+                  row.spendMoney = 0
+                  row.cardOvers = 0
+                  // 不知名错误,未展示扣除,需要关闭再打开
+                  this.$set(this.list[this.projectIndex],'popover',false)
+                  this.$set(this.list[this.projectIndex],'popover',true)
+                  this.list.push({})
+                  this.list.pop()
+                  return this.updataList() 
                 }
-              } else {
-                //不可以打折
-
-                form.discoutMoney = (form.spendMoney * 1).toFixed(2) * 1; //充值卡支付的钱
-                if (form.spendMoney == this.card3) {
-                  form.giftSpendMoney = this.card2; //赠送实际出的钱
-                  form.discoutGiftMoney =
-                    (this.appearPrice * 1 - form.discoutMoney * 1).toFixed(2) *
-                    1;
-                } else {
-                  form.giftSpendMoney =
-                    (((form.spendMoney * 1) / recRatio) * recGiftRatio).toFixed(
-                      2
-                    ) * 1; //赠送实际出的钱
-                  form.discoutGiftMoney = form.giftSpendMoney.toFixed(2) * 1; //赠送卡抵扣支付的钱
+              }else{ //输入金额不大于项目金额
+                let paymentAmount = row.spendMoney/(row.discountFreeAmount?((row.discountFreeAmount*1)/100):1) //当前输入的值
+                if(paymentAmount>appearPrice){ //当前卡够支付
+                  this.$message.warning({ message: "赠送金额大于项目金额" });
+                  row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1
+                  row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+                  row.spendMoney = 0
+                  row.cardOvers = 0
+                  // 不知名错误,未展示扣除,需要关闭再打开
+                  this.$set(this.list[this.projectIndex],'popover',false)
+                  this.$set(this.list[this.projectIndex],'popover',true)
+                  this.list.push({})
+                  this.list.pop()
+                  return this.updataList() 
+                }else{ //当前输入的值大大于项目金额
+                  row.giftSpendMoney = row.spendMoney
+                  row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+                  row.spendMoney = 0
+                  row.cardOvers = 0
+                  // 不知名错误,未展示扣除,需要关闭再打开
+                  this.$set(this.list[this.projectIndex],'popover',false)
+                  this.$set(this.list[this.projectIndex],'popover',true)
+                  this.list.push({})
+                  this.list.pop()
+                  return this.updataList() 
                 }
               }
-            } else {
-              form.spendMoney = form.cardOver;
-              form.discoutMoney =
-                (form.spendMoney * 1 * (form.discount / 100)).toFixed(2) * 1;
-              form.giftSpendMoney =
-                (((form.spendMoney * 1) / recRatio) * recGiftRatio).toFixed(2) *
-                1;
+            }
+            // 至于为什么不在这里updataList，未排除原因没执行到着
+          }
+          if(row.spendMoney>row.cardOvers){ //如果输入的金额大于本身余额
+            // 提示并且重新计算
+            this.$message.warning({ message: "支付金额不能大于卡付余额" });
+            // 判断折扣总和是否够支付项目金额
+            let total = (row.cardOvers/((row.discount?row.discount*1:100)/100)) + (row.cardGiftOvers/((row.discountFreeAmount?row.discountFreeAmount*1:100)/100))
+            console.log('总额为多少----->',total)
+            if(total>appearPrice){ //两个折后价格够支付项目金额
+              if( (row.cardOvers/(row.discount?(row.discount*1)/100:1)) > appearPrice ){ //再判断自身余额是否够支付项目金额
+                row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1 // 够支付扣除它自身
+                row.cardOvers =( row.cardOvers - row.spendMoney).toFixed(2)*1 //可用余额
+                this.updataList()
+              }else{  //不够扣时,扣光自己的可用余额并且算上差价继续扣赠送金额
+                row.spendMoney = row.cardOvers
+                row.cardOvers = 0
+                let remainderCsee = appearPrice - ((row.spendMoney/row.discount)*100) //剩余支付
+                row.giftSpendMoney = remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1) //算出还需支付多少
+                row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney //赠送剩余
+                this.updataList()
+              }
+            }else{ //两个折扣价格不够支付
+              console.log('两个不够支付---')
+              row.spendMoney = row.cardOvers //支付金额
+              row.cardOvers = 0 //可用余额
+              row.giftSpendMoney = row.cardGiftOvers //赠送支付
+              row.cardGiftOvers = 0 //赠送剩余
+              this.updataList()
+            }
+          }else{ //输入金额不大于本身余额
+            console.log('没超过本身余额--->')
+            // 判断输入金额是否大于项目金额
+            if(row.spendMoney>appearPrice){ //输入金额大于项目金额
+              this.$message.warning({ message: "支付金额大于项目金额" });
+              // 重新计算
+              let total = (row.cardOvers/((row.discount?row.discount*1:100)/100)) + (row.cardGiftOvers/((row.discountFreeAmount?row.discountFreeAmount*1:100)/100))
+              console.log('总额为多少----->',total)
+              if(total>appearPrice){ //两个折后价格够支付项目金额
+                if( (row.cardOvers/(row.discount?(row.discount*1)/100:1)) > appearPrice ){ //再判断自身余额是否够支付项目金额
+                  row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1 // 够支付扣除它自身
+                  row.cardOvers =( row.cardOvers - row.spendMoney).toFixed(2)*1 //可用余额
+                  this.updataList()
+                }else{  //不够扣时,扣光自己的可用余额并且算上差价继续扣赠送金额
+                  row.spendMoney = row.cardOvers
+                  row.cardOvers = 0
+                  let remainderCsee = appearPrice - ((row.spendMoney/row.discount)*100) //剩余支付
+                  row.giftSpendMoney = remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1) //算出还需支付多少
+                  row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney //赠送剩余
+                  this.updataList()
+                }
+              }else{ //两个折扣价格不够支付
+                console.log('两个不够支付---')
+                row.spendMoney = row.cardOvers //支付金额
+                row.cardOvers = 0 //可用余额
+                row.giftSpendMoney = row.cardGiftOvers //赠送支付
+                row.cardGiftOvers = 0 //赠送剩余
+                this.updataList()
+              }              
+            }else{ //输入金额不大于项目金额
+              let discountCase = (row.spendMoney/((row.discount?((row.discount*1)/100):1).toFixed(2)*1)).toFixed(2)*1//折后金额
+              console.log('折后金额是多少--->',discountCase)
+              if(discountCase>appearPrice){ //金额折扣大于项目金额
+                if((discountCase-appearPrice)>=this.balance*1)this.$message.warning({ message: "支付金额大于项目金额" }); //计算误差
+                row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1 
+                row.cardOvers =( row.cardOvers - row.spendMoney).toFixed(2)*1 //可用余额
+                this.updataList()
+              }else{ //折扣不大于项目金额
+                row.cardOvers = row.cardOvers - (row.spendMoney*1)
+                this.updataList()
+              }
+            }
+          }
+        }else{ //不能打折
+        row.cardGiftOvers = row.cardGiftOvers + row.giftSpendMoney //还原赠送剩余
+        row.giftSpendMoney = 0 //还原赠送支付
+        let total = row.cardOvers + row.cardGiftOvers
 
-              form.discoutGiftMoney = //赠送卡支付的钱
-                (form.giftSpendMoney * (form.discount / 100)).toFixed(2) * 1;
+        if(row.cardOvers === 0 && row.cardGiftOvers){ //当可用余额为0,并且可用赠送存在时触发
+          if(row.spendMoney > row.cardGiftOvers){ //支付金额大于赠送金额
+            this.$message.warning({ message: "支付金额大于卡付赠送余额" });
+            // 重新计算
+            if(row.cardGiftOvers>appearPrice){ //当前赠送够支付项目金额
+              row.spendMoney = 0
+              row.giftSpendMoney = appearPrice
+              row.cardGiftOvers = row.cardGiftOvers - appearPrice
+              // 不知名错误,未展示扣除,需要关闭再打开
+              this.$set(this.list[this.projectIndex],'popover',false)
+              this.$set(this.list[this.projectIndex],'popover',true)
+              return this.updataList() 
+            }else{ //当前赠送余额不够支付项目金额
+              row.spendMoney = 0
+              row.giftSpendMoney = row.cardGiftOvers
+              row.cardGiftOvers = 0
+              // 不知名错误,未展示扣除,需要关闭再打开
+              this.$set(this.list[this.projectIndex],'popover',false)
+              this.$set(this.list[this.projectIndex],'popover',true)
+              return this.updataList() 
+            }
+          }else{ //支付金额不大于赠送金额
+            if(row.spendMoney>appearPrice){ //输入金额大于项目金额
+              this.$message.warning({ message: "支付金额不能大于项目金额" });
+              // 重新计算
+              if(row.cardGiftOvers>appearPrice){ //当前赠送够支付项目金额
+                row.spendMoney = 0
+                row.giftSpendMoney = appearPrice
+                row.cardGiftOvers = row.cardGiftOvers - appearPrice
+                // 不知名错误,未展示扣除,需要关闭再打开
+                this.$set(this.list[this.projectIndex],'popover',false)
+                this.$set(this.list[this.projectIndex],'popover',true)
+                return this.updataList() 
+              }else{ //当前赠送余额不够支付项目金额
+                row.spendMoney = 0
+                row.giftSpendMoney = row.cardGiftOvers
+                row.cardGiftOvers = 0
+                // 不知名错误,未展示扣除,需要关闭再打开
+                this.$set(this.list[this.projectIndex],'popover',false)
+                this.$set(this.list[this.projectIndex],'popover',true)
+                return this.updataList() 
+              }
+            }else{ //输入金额不大于项目金额
+              row.giftSpendMoney = row.spendMoney*1
+              row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+              row.spendMoney = 0
+              // 不知名错误,未展示扣除,需要关闭再打开
+              this.$set(this.list[this.projectIndex],'popover',false)
+              this.$set(this.list[this.projectIndex],'popover',true)
+              return this.updataList()               
             }
           }
-        } else {
-          //折扣卡
-          if (this.recForm.noDiscount == 0) {
-            // 可以打折
-            form.discoutMoney =
-              (form.spendMoney / (form.discount / 100)).toFixed(2) * 1;
-          } else {
-            //不可以打折
-            form.discoutMoney = form.spendMoney;
+          // 至于为什么不在这里用return---->未排查原因没执行到这里
+        }
+
+        if(row.spendMoney > row.cardOvers){ //输入金额大于卡付余额
+          this.$message.warning({ message: "支付金额大于卡付余额" });
+          //重新计算
+          if(total > appearPrice){ //当前卡够支付项目金额
+            if(row.cardOvers > appearPrice){ //当前卡余额够支付项目金额
+              row.spendMoney = appearPrice
+              row.cardOvers = row.cardOvers - row.spendMoney
+              this.updataList()
+            }else{ //算上差价
+              row.spendMoney = row.cardOvers
+              row.cardOvers = 0
+              row.giftSpendMoney = appearPrice - row.spendMoney
+              row.cardGiftOvers = row.giftSpendMoney
+              this.updataList()
+            }
+          }else{
+            //当前卡不够支付项目金额
+            row.spendMoney = row.cardOvers 
+            row.cardOvers = 0
+            row.giftSpendMoney = row.cardGiftOvers
+            row.cardGiftOvers = 0
+            this.updataList()
           }
-          form.discoutGiftMoney = 0;
-          form.giftSpendMoney = 0;
+        }else{ //输入金额不大于卡付余额
+          if(row.spendMoney>appearPrice){ //输入金额大于项目金额
+             this.$message.warning({ message: "支付金额大于项目金额" });
+            //  重新计算
+            if(total > appearPrice){ //当前卡够支付项目金额
+              if(row.cardOvers > appearPrice){ //当前卡余额够支付项目金额
+                row.spendMoney = appearPrice
+                row.cardOvers = row.cardOvers - row.spendMoney
+                this.updataList()
+              }else{ //算上差价
+                row.spendMoney = row.cardOvers
+                row.cardOvers = 0
+                row.giftSpendMoney = appearPrice - row.spendMoney
+                row.cardGiftOvers = row.giftSpendMoney
+                this.updataList()
+              }
+            }else{
+              //当前卡不够支付项目金额
+              row.spendMoney = row.cardOvers 
+              row.cardOvers = 0
+              row.giftSpendMoney = row.cardGiftOvers
+              row.cardGiftOvers = 0
+              this.updataList()
+            }
+        }else{ //输入金额不大于项目金额
+          row.spendMoney = row.spendMoney*1
+          row.cardOvers =( row.cardOvers - row.spendMoney ).toFixed(2)*1
+          this.updataList()
         }
-        if (
-          form.discoutGiftMoney + form.discoutMoney >
-          this.list[this.editProIndex].amount
-        ) {
         }
-      } else {
-      }
-      // if (form.spendMoney > form.cardOver) {
-      //   form.spendMoney = form.cardOver;
-      //   form.giftSpendMoney = form.cardGiftOvers;
-      // }
-      form.cardOvers =
-        (form.cardOver + (this.card1 - form.spendMoney)).toFixed(2) * 1;
-      form.cardGiftOvers =
-        (form.giftConsumeMoney + (this.card2 - form.giftSpendMoney)).toFixed(
-          2
-        ) * 1;
-      form.cardOver =
-        (form.cardOver + (this.card1 - form.spendMoney)).toFixed(2) * 1;
-      form.giftConsumeMoney =
-        (form.giftConsumeMoney + (this.card2 - form.giftSpendMoney)).toFixed(
-          2
-        ) * 1;
-      this.card1 = form.spendMoney;
-      this.card2 = form.giftSpendMoney;
-      if (form.cardOvers < 0) {
-        this.$message.info({
-          message: "此卡可用余额不足。"
-        });
-        form.cardOvers = (form.cardOvers + form.spendMoney).toFixed(2) * 1;
-        form.spendMoney = form.cardOvers.toFixed(2) * 1;
-        form.cardOvers = 0;
-      }
-      if (form.cardGiftOvers < 0) {
-        this.$message.info({
-          message: "此卡赠送余额不足。"
-        });
-        form.cardGiftOvers =
-          (form.cardGiftOvers + form.giftSpendMoney).toFixed(2) * 1;
-        form.giftSpendMoney = form.cardGiftOvers.toFixed(2) * 1;
-        form.cardGiftOvers = 0;
+       }
+       this.list.push({})
+       this.list.pop()
       }
-      this.rowRecList.splice(index, 1, form); //将卡付卡的数据替换掉
-      this.list[this.editProIndex].collectionCashAmounts =
-        (
-          this.list[this.editProIndex].amount -
-          (form.discoutMoney + form.discoutGiftMoney)
-        ).toFixed(2) * 1; //计算每一个项目的各自的现付金额
-      let num = 0;
-      this.list.forEach(item => {
-        num = (num + item.collectionCashAmounts).toFixed(2) * 1;
-      });
-      console.log(
-        "🚀 ~ file: service.vue ~ line 1165 ~ endEditcard ~ form.spendMoney",
-        form.spendMoney
-      );
-      console.log(
-        "🚀 ~ file: service.vue ~ line 1165 ~ endEditcard ~ form.giftSpendMoney",
-        form.giftSpendMoney
-      );
-      console.log(
-        "🚀 ~ file: service.vue ~ line 1165 ~ endEditcard ~ form.discoutMoney",
-        form.discoutMoney
-      );
-      console.log(
-        "🚀 ~ file: service.vue ~ line 1165 ~ endEditcard ~ form.discoutGiftMoney",
-        form.discoutGiftMoney
-      );
-      this.form.collectionCashAmounts = num;
-      this.recIndex =-1
-      this.sumNum();
     },
     sumNum() {
       let spendMoney = 0;
@@ -1302,7 +1607,6 @@ export default {
       this.recForm.collectionAmounts = spendMoney
         ? spendMoney.toFixed(2) * 1
         : 0;
-
       this.recForm.rechargeAmount = spendNumber.toFixed(2) * 1;
       this.list.splice(this.recForm.index, 1, this.recForm);
       let rList = [];
@@ -1312,8 +1616,6 @@ export default {
             JSON.stringify(item.rechargeAccountList)
           );
           rechargeAccountList.forEach(item => {
-            // item.cardOver = item.cardOvers;
-            // item.giftConsumeMoney = item.cardGiftOvers;
             item.giftSpendMoney = 0;
             item.spendMoney = 0;
             rList.push(item);
@@ -1338,22 +1640,32 @@ export default {
           });
         }
       });
-
       this.sumAmont();
     },
-    openRec(row) {
-      if (!this.copyAccountList.length) {
-        this.copyAccountList = row.rechargeAccountList;
-      }
-      this.recForm = JSON.parse(JSON.stringify(row));
-      if (!row.rechargeAccountList.length) {
-        // 数据为空,重新赋值浅拷贝一份
-        this.rowRecList = [...this.copyAccountList];
-      } else {
-        // 数组存在直接赋值
-        this.rowRecList = JSON.parse(JSON.stringify(row.rechargeAccountList));
-      }
-      this.editProIndex = row.index;
+    openRec(row,idx) {
+      console.log('这是什么row--->',row)
+      // // 处理多个popover只显示一次
+        this.list.forEach((item,index)=>{
+        if(idx!==index){
+          // item.popover = false
+          this.$set(item,'popover',false)
+        }
+      })
+      this.$nextTick(()=>{
+        row = this.handleData(row)
+        this.recListCopy.forEach((firstItem,index)=>{
+          let list = []
+          this.list.forEach(twoItem=>{
+            twoItem.rechargeAccountList.forEach(threeItem=>{
+              if(threeItem.id === firstItem.id){
+                list.push(threeItem)
+              }
+            })
+          })
+          let total = firstItem.cardGiftOvers - eval(list.map(item=>item.giftSpendMoney?item.giftSpendMoney*1:0).join("+"))
+          row.rechargeAccountList[index].cardGiftOvers = total
+        })
+      })
     },
     recashData(v) {
       this.list = v.list;
@@ -1409,7 +1721,6 @@ export default {
         });
       }
     },
-
     openAddMember() {
       this.$refs.addmember.show("添加");
     },
@@ -1487,7 +1798,6 @@ export default {
     goPayDebt() {
       this.$refs.repayment.show(this.memberForm);
     },
-    // 待会处理
     inputMember() {
       if (partten.phoneNum.test(this.memberForm.mobilePhone)) {
         storeMemberOne({
@@ -1544,6 +1854,7 @@ export default {
       this.$refs.project.show(this.memberForm);
     },
     projectData(v) {
+      console.log('是这里没错了--->')
       if (!v.courseAccountId) {
         v.courseAccountId = null;
         v.courseProjectId = v.id;
@@ -1637,7 +1948,7 @@ export default {
             }
             form.memberId = this.memberForm.id;
             form.integral = this.memberForm.integral;
-            form.rechargeAccountList = this.recListCopy;
+            form.rechargeAccountList = JSON.parse(JSON.stringify(this.recListCopy));
           } else {
             form.amount = res.data.price;
             form.transactionPrice = res.data.price;
@@ -1663,6 +1974,7 @@ export default {
             //   this.czRecList(this.list[this.proIndex]);
             // }
             form.index = this.proIndex;
+            console.log('form.index--->',form.index)
             this.list.splice(this.proIndex, 1, form);
             this.expand.push(this.proIndex);
             this.expandedRows.push(this.list[this.proIndex]);
@@ -1725,7 +2037,7 @@ export default {
     //确定返回方法
     confirm() {
       let flag = true;
-      if (this.list == []) {
+      if (!this.list.length) {
         this.$alert("项目最少需要一个", "提示", {
           confirmButtonText: "确定",
           confirmButtonClass: "confirmbtnFalses",
@@ -1735,41 +2047,6 @@ export default {
         });
         flag = false;
       }
-      let sumMoney = 0;
-      this.list.forEach((item, index) => {
-        if (item.courseAccountId == null) {
-          sumMoney +=
-            (
-              item.amount -
-              item.collRecAmonnt -
-              item.collectionIntegralAmount
-            ).toFixed(2) * 1;
-        } else {
-          item.transactionPrice * 1;
-          console.log(
-            "🚀 ~ file: service.vue ~ line 1649 ~ this.list.forEach ~ item.transactionPrice",
-            item.transactionPrice
-          );
-          console.log(
-            "🚀 ~ file: service.vue ~ line 1649 ~ this.list.forEach ~ this.appearPrices",
-            this.appearPrices
-          );
-        }
-      });
-
-      if (
-        this.balance <= (this.appearPrices * 1 - sumMoney).toFixed(2) * 1 ||
-        (this.appearPrices * 1 - sumMoney).toFixed(2) * 1 < 0
-      ) {
-        flag = false;
-        this.$alert("实付金额不等于项目金额", "提示", {
-          confirmButtonText: "确定",
-          confirmButtonClass: "confirmbtnFalses",
-          type: "warning",
-          center: true,
-          callback: action => {}
-        });
-      }
       if (this.isAddition == 1 && !this.additionDate) {
         flag = false;
         this.$alert("请输入补单日期", "提示", {
@@ -1810,14 +2087,13 @@ export default {
 
     addCashConfirm() {
       let list = [];
-      //console.log("🚀 ~ file: service.vue ~ line 1728 ~ addCashConfirm ~ this.list", this.list)
+      console.log(this.list)
+      
       this.list.forEach(item => {
         if (item.courseAccountId == null) {
           item.collectionCashAmount =
             (
-              item.amount -
-              item.collRecAmonnt -
-              item.collectionIntegralAmount
+              item.amount - item.collectionAmounts
             ).toFixed(2) * 1;
           item.cashAmount =
             (
@@ -1848,10 +2124,6 @@ export default {
         let payLists = [];
         let rechargeAccountList = [];
         this.payLists.forEach(item => {
-          // this.payMoneysum = this.payMoneysum * 1 + item.payMoney * 1;
-
-          // this.payMoneysums = this.payMoneysum / this.list.length;
-
           if (item.payMoney > 0) {
             let items = {
               payMoney: item.payMoney,
@@ -1880,43 +2152,31 @@ export default {
 
       let collectionAmountsum=0
       list.forEach(item => {
-        collectionAmountsum=item.collectionAmount*1+collectionAmountsum*1;
+        collectionAmountsum+=(item.collectionAmount*1+collectionAmountsum*1);
       });
       this.formData.append("cashListRequestList", JSON.stringify(list));
-      // collectionAmount
-      if (collectionAmountsum==0) {
-        this.$alert("还未进行支付", "提示", {
-          confirmButtonText: "确定",
-          confirmButtonClass: "confirmbtnFalses",
-          type: "warning",
-          center: true,
-          callback: action => {}
-        });
-        this.formData = new FormData();
-        }else{
-          // 限制
-        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",
-              type: "warning",
-              center: true,
-              callback: action => {}
-            });
-          }else if(total<this.appearPrices*1){
-              this.formData = new FormData();
-              return this.$alert(`现金金额还需支付${this.appearPrices*1 - total}`, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: action => {}
-            });          
-          }
+      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",
+            type: "warning",
+            center: true,
+            callback: action => {}
+          });
+        }else if(total<this.appearPrices*1){
+            this.formData = new FormData();
+            return this.$alert(`金额还需支付${this.appearPrices*1 - total}`, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: action => {}
+          });          
         }
+      }
         addCash(this.formData).then(res => {
         if (res.code == "000000") {
           this.$message.success({
@@ -1939,10 +2199,7 @@ export default {
           this.formData = new FormData();
         }
       });
-        }
-     
-      
-      
+        // } 
     },
     openStaffRatio(row, index, text) {
       this.editIndex = index;
@@ -1975,6 +2232,7 @@ export default {
       this.projectMomey = 0;
       this.recIndex = -1;
       this.list.push(list);
+      console.log('添加了list---',this.list)
     },
     delPro(row) {
       //console.log("🚀 ~ file: service.vue ~ line 1761 ~ delPro ~ row", row)
@@ -2008,6 +2266,13 @@ export default {
     },
     reccardData(v) {},
     courseData(v) {
+      if (!v.courseAccountId) {
+        v.courseAccountId = null;
+        v.courseProjectId = v.id;
+        v.courseMoney = 0;
+      } else {
+        v.courseMoney = v.courseConsumePrice;
+      }
       this.setProOne(v);
     },
     paymentData(v) {
@@ -2487,9 +2752,11 @@ export default {
       });
 
       // 总付金额计算
-      this.form.cashAmount =
-        money.toFixed(2) * 1 + collectionRechargeAmountg.toFixed(2) * 1;
-      this.form.collectionCashAmounts = money.toFixed(2) * 1;
+      // this.form.cashAmount =
+      //   money.toFixed(2) * 1 + collectionRechargeAmountg.toFixed(2) * 1;
+      // this.form.collectionCashAmounts = money.toFixed(2) * 1;
+      this.form.cashAmount = this.total
+      this.form.collectionCashAmounts = this.appearPrices
       this.list.forEach(item => {
         if (
           this.form.cashAmount == this.form.collectionCashAmount &&
@@ -2518,12 +2785,11 @@ export default {
       });
       this.form.debtMoney =
         (this.form.cashAmount - this.form.collectionCashAmount).toFixed(2) * 1;
+      this.form.cashAmount
       var that = this;
-      setTimeout(() => {
-        that.$nextTick(() => {
-          that.$refs.payment.show(that.form, that.payLists);
-        });
-      }, 500);
+      that.$nextTick(() => {
+        that.$refs.payment.show(that.form, that.payLists);
+      });
     },
     //数组按对应字段合计返回方法
     getSummaries(param) {