From 86e2d02cfdbc478c000bb7fe937d540384224bfa Mon Sep 17 00:00:00 2001
From: "wangxubin@yeah.net" <wangxubin1999@yeah.net>
Date: Fri, 9 Sep 2022 15:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=94=B6=E9=93=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/asider.vue      |  1 +
 src/pages/eashier/service/service.vue | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue
index 0beef5b..1a14b36 100644
--- a/src/layout/components/asider.vue
+++ b/src/layout/components/asider.vue
@@ -107,6 +107,7 @@ export default {
               icon: "el-icon-files",
               route: "/baseProject",
               index: "baseProject",
+              number: "400500",
               id:"2002002",
             },
             {
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index b3a6d02..a1b4192 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -421,14 +421,11 @@ export default {
       //conslole.log(index)
     },
     endEditcard(row, index) {
-      //conslole.log(index)
       let debtMoney =
         (this.recForm.amount * 1 - this.recForm.cashAmount * 1).toFixed(2) * 1;
-        //conslole.log(this.recForm)
       let form = { ...row };
-      
-      //conslole.log(form)
-      ////conslole.log(debtMoney);//套餐价格
+      console.log("🚀 ~ file: service.vue ~ line 427 ~ endEditcard ~ form", form)
+      console.log("🚀 ~ file: service.vue ~ line 429 ~ endEditcard ~ this.recForm.noDiscount", this.recForm.noDiscount)
       if (debtMoney > 0) {
         if (form.type == 2 || form.type == 0) {
           if (this.useRecharge == 2) {
@@ -507,9 +504,11 @@ export default {
             form.discoutMoney =
               (form.spendMoney /( form.discount / 100)).toFixed(2) * 1;
           } else {
-            不可以打折
+            //不可以打折
            form.discoutMoney = form.spendMoney;
+           console.log("🚀 ~ file: service.vue ~ line 511 ~ endEditcard ~ nihao", form.spendMoney)
           }
+           
           form.discoutGiftMoney=0
         }
         if (form.discoutGiftMoney + form.discoutMoney > this.list[this.editProIndex].amount) {
@@ -587,12 +586,15 @@ export default {
       let spendNumber = 0;
       ////conslole.log(this.rowRecList)
       this.rowRecList.forEach((item) => {
-        spendMoney += (item.discoutMoney + item.discoutGiftMoney) * 1;
-        spendNumber += (item.spendMoney * 1 + item.giftSpendMoney) * 1;
+        spendMoney += (item.discoutMoney* 1 + item.discoutGiftMoney* 1) * 1;
+       
+        
+        spendNumber += (item.spendMoney * 1 + item.giftSpendMoney* 1) * 1;
         ////conslole.log(item.discoutMoney);
         ////conslole.log(item.discoutGiftMoney);
       });
-      ////conslole.log(spendMoney);
+      // conslole.log(spendMoney);
+      console.log("🚀 ~ file: service.vue ~ line 595 ~ sumNum ~ spendMoney", spendMoney)
 
       this.recForm.collectionRechargeAmount = spendNumber.toFixed(2) * 1;
       this.recForm.collRecAmonnt = spendMoney.toFixed(2) * 1;
@@ -617,6 +619,7 @@ export default {
         (
           spendMoney
         ).toFixed(2) * 1;
+        console.log("🚀 ~ file: service.vue ~ line 616 ~ sumNum ~ this.recForm.collectionAmounts", this.recForm.collectionAmounts)
       ////conslole.log(this.recForm.collectionAmount)
       this.recForm.rechargeAmount = spendNumber;
       this.list.splice(this.recForm.index, 1, this.recForm);
@@ -967,9 +970,9 @@ export default {
             }
           }
           if (this.proIndex != -1) {
-            if (this.list[this.proIndex].projectName) {
-              this.czRecList(this.list[this.proIndex]);
-            }
+            // if (this.list[this.proIndex].projectName) {
+            //   this.czRecList(this.list[this.proIndex]);
+            // }
             form.index = this.proIndex;
             this.list.splice(this.proIndex, 1, form);
             this.expand.push(this.proIndex);