From 466def84cc856cf418816fce9623dd30fca5389e Mon Sep 17 00:00:00 2001
From: Wangxubin <wangxubin1999@yeah.net>
Date: Fri, 23 Sep 2022 11:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=A9=E6=87=BF=E8=BE=BE(?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=94=B6=E9=93=B6=E8=BF=98=E5=8E=9F9-9?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/eashier/reatment/reatment.vue       |    2 +-
 .../refundRecharge/service/service.vue        | 1397 +++++------------
 2 files changed, 432 insertions(+), 967 deletions(-)

diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index 7d7398a..eb65bc2 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -1722,7 +1722,7 @@ export default {
             } else {
               sums[index] = "--";
             }
-          }, 0);
+          }, 0).toFixed(2);
           sums[index] += " ";
         } else if (column.property == "payMoney") {
           sums[index] = values.reduce((prev, curr) => {
diff --git a/src/pages/eashier/refundRecharge/service/service.vue b/src/pages/eashier/refundRecharge/service/service.vue
index ed6f03e..80793a1 100644
--- a/src/pages/eashier/refundRecharge/service/service.vue
+++ b/src/pages/eashier/refundRecharge/service/service.vue
@@ -3,432 +3,189 @@
     <el-form inline lable-width="100px" :modal="memberForm">
       <el-form-item label="手机号码:">
         <div class="form-width text-cyan flex justify-start align-center">
-          <el-input
-            maxlength="11"
-            v-model="memberForm.mobilePhone"
-            @change="inputMember"
-            @blur="inputMember"
-          >
-            <el-button
-              size="mini"
-              slot="append"
-              maxlength="11"
-              icon="el-icon-search"
-              @click="openMember"
-            ></el-button>
+          <el-input maxlength="11" v-model="memberForm.mobilePhone" @change="inputMember" @blur="inputMember">
+            <el-button size="mini" slot="append" maxlength="11" icon="el-icon-search" @click="openMember"></el-button>
           </el-input>
-          <el-button
-            icon="el-icon-circle-plus-outline"
-            type="text"
-            @click="openAddMember"
-          ></el-button>
+          <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
         </div>
       </el-form-item>
       <el-form-item :label="cashNumber == 1 ? '会员名字' : '散客名字'">
         <div class="form-width-sm text-cyan">
           <el-input v-model="memberForm.memberName">
-            <el-button
-              title="切换"
-              size="mini"
-              slot="append"
-              icon="el-icon-sort"
-              @click="changeMember()"
-            ></el-button>
+            <el-button title="切换" size="mini" slot="append" icon="el-icon-sort" @click="changeMember()"></el-button>
           </el-input>
         </div>
       </el-form-item>
       <el-form-item label="性别">
         <div class="text-bold flex justify-start align-center text-xss">
-          男:
-          <el-input
-            class="form-width-xss"
-            v-model="memberForm.man"
-            type="number"
-          ></el-input>
-          女:
-          <el-input
-            class="form-width-xss"
-            v-model="memberForm.woman"
-            type="number"
-          ></el-input>
+          男: <el-input class="form-width-xss" v-model="memberForm.man" type="number"></el-input>
+          女: <el-input class="form-width-xss" v-model="memberForm.woman" type="number"></el-input>
         </div>
       </el-form-item>
-      <el-form-item
-        label="会员积分"
-        v-if="cashNumber == 1 && memberForm.integral > 0 && memberIntegral"
-      >
+      <el-form-item label="会员积分" v-if="cashNumber == 1 && memberForm.integral > 0 && memberIntegral">
         <div class="text-cyan">
           {{ memberForm.integral }}
         </div>
       </el-form-item>
-      <el-form-item
-        label="以往欠款"
-        v-if="cashNumber == 1 && memberForm.debtMoney > 0"
-      >
+      <el-form-item label="以往欠款" v-if="cashNumber == 1 && memberForm.debtMoney > 0">
         <div class="form-width-sm text-red text-price ">
           {{ memberForm.debtMoney }}
           <el-button type="text" @click="goPayDebt">去还款</el-button>
         </div>
       </el-form-item>
-      <el-popover
-        placement="bottom"
-        width="800"
-        trigger="hover"
-        v-if="cashNumber == 1"
-      >
+      <el-popover placement="bottom" width="800" trigger="hover" v-if="cashNumber == 1">
         <reccard ref="reccard" @reccardData="reccardData"></reccard>
         <el-button slot="reference">充值卡</el-button>
       </el-popover>
-      <el-popover
-        placement="bottom"
-        width="700"
-        trigger="hover"
-        v-if="cashNumber == 1"
-      >
+      <el-popover placement="bottom" width="700" trigger="hover" v-if="cashNumber == 1">
         <course ref="course" @courseData="courseData"></course>
         <el-button slot="reference">项目包</el-button>
       </el-popover>
       <el-form-item label="补单日期:" v-if="isAddition == 1">
         <div class="activeFormDiv">
-          <el-date-picker
-            v-model="additionDate"
-            type="date"
-            :picker-options="pickerOptions"
-            format="yyyy-MM-dd"
-            placeholder="选择日期"
-          >
+          <el-date-picker v-model="additionDate" type="date" :picker-options="pickerOptions" format="yyyy-MM-dd"
+            placeholder="选择日期">
           </el-date-picker>
         </div>
       </el-form-item>
     </el-form>
     <div class="flex justify-start align-start ">
       <div class="into-table-width">
-        <el-table
-          style="margin-top:3px;"
-          :data="list"
-          max-height="650"
-          ref="list"
-          @row-click="rowClick"
-          :row-class-name="rowClassName"
-          :row-key="getRowKeys"
-          @expand-change="expandSelect"
-          :expand-row-keys="expand"
-          stripe
-          :header-cell-style="{
-            background: 'linear-gradient(#6cb3ff, #1873d4)',
-            color: '#eeeeee'
-          }"
-        >
+        <el-table style="margin-top:3px;" :data="list" max-height="650" ref="list" @row-click="rowClick"
+          :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" stripe
+          :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee', }">
           <el-table-column type="expand">
             <template slot-scope="scope">
               <div class="flex justify-start align-center  flex-wrap ">
                 <el-form inline class="margin-top-xs margin-left-xs">
-                  <el-form-item label="美发师">
+                  <el-form-item label='美发师'>
                     <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'zhonggongList')"
-                        v-model="scope.row.zhonggongLists"
-                        placeholder="请选择"
-                        @change="
-                          handleChange($event, scope.row, 'zhonggongList')
-                        "
-                      >
-                        <el-option
-                          v-for="(item, index) in options"
-                          :key="index"
-                          :label="item.label"
-                          :value="item.id"
-                        >
+                      <el-select filterable default-first-option clearable @clear="clear(scope.row, 'zhonggongList')"
+                        v-model="scope.row.zhonggongLists" placeholder="请选择"
+                        @change="handleChange($event, scope.row, 'zhonggongList')">
+                        <el-option v-for="(item, index) in options" :key="index" :label="item.label" :value="item.id">
                         </el-option>
                       </el-select>
                       <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.zhonggongLists=null,scope.row.zhonggongList.splice(0,1)"></div> -->
-                      <div
-                        class="el-icon-edit-outline text-xs text-cyan"
-                        @click.stop="
-                          openStaffRatio(
-                            scope.row,
-                            scope.$index,
-                            'zhonggongList'
-                          )
-                        "
-                      ></div>
+                      <div class="el-icon-edit-outline text-xs text-cyan"
+                        @click.stop="openStaffRatio(scope.row, scope.$index, 'zhonggongList')"></div>
                     </div>
                   </el-form-item>
-                  <el-form-item label="美容师">
+                  <el-form-item label='美容师'>
                     <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'largeList')"
-                        v-model="scope.row.largeLists"
-                        placeholder="请选择"
-                        @change="handleChange($event, scope.row, 'largeList')"
-                      >
-                        <el-option
-                          v-for="(item, index) in options"
-                          :key="index"
-                          :label="item.label"
-                          :value="item.id"
-                        >
+                      <el-select filterable default-first-option clearable @clear="clear(scope.row, 'largeList')"
+                        v-model="scope.row.largeLists" placeholder="请选择"
+                        @change="handleChange($event, scope.row, 'largeList')">
+                        <el-option v-for="(item, index) in options" :key="index" :label="item.label" :value="item.id">
                         </el-option>
                       </el-select>
                       <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.largeLists=null,scope.row.largeList.splice(0,1)"></div> -->
-                      <div
-                        class="el-icon-edit-outline text-xs text-cyan"
-                        @click.stop="
-                          openStaffRatio(scope.row, scope.$index, 'largeList')
-                        "
-                      ></div>
+                      <div class="el-icon-edit-outline text-xs text-cyan"
+                        @click.stop="openStaffRatio(scope.row, scope.$index, 'largeList')"></div>
                     </div>
                   </el-form-item>
-                  <el-form-item label="技师">
+                  <el-form-item label='技师'>
                     <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'technicianLists')"
-                        v-model="scope.row.technicianLists"
-                        placeholder="请选择"
-                        @change="
-                          handleChange($event, scope.row, 'technicianList')
-                        "
-                      >
-                        <el-option
-                          v-for="(item, index) in options"
-                          :key="index"
-                          :label="item.label"
-                          :value="item.id"
-                        >
+                      <el-select filterable default-first-option clearable @clear="clear(scope.row, 'technicianLists')"
+                        v-model="scope.row.technicianLists" placeholder="请选择"
+                        @change="handleChange($event, scope.row, 'technicianList')">
+                        <el-option v-for="(item, index) in options" :key="index" :label="item.label" :value="item.id">
                         </el-option>
                       </el-select>
                       <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.technicianLists=null,scope.row.technicianList.splice(0,1)"></div> -->
-                      <div
-                        class="el-icon-edit-outline text-xs text-cyan"
-                        @click.stop="
-                          openStaffRatio(
-                            scope.row,
-                            scope.$index,
-                            'technicianList'
-                          )
-                        "
-                      ></div>
+                      <div class="el-icon-edit-outline text-xs text-cyan"
+                        @click.stop="openStaffRatio(scope.row, scope.$index, 'technicianList')"></div>
                     </div>
                   </el-form-item>
-                  <el-form-item label="助理">
+                  <el-form-item label='助理'>
                     <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'smallLists')"
-                        v-model="scope.row.smallLists"
-                        placeholder="请选择"
-                        @change="handleChange($event, scope.row, 'smallList')"
-                      >
-                        <el-option
-                          v-for="(item, index) in options"
-                          :key="index"
-                          :label="item.label"
-                          :value="item.id"
-                        >
+                      <el-select filterable default-first-option clearable @clear="clear(scope.row, 'smallLists')"
+                        v-model="scope.row.smallLists" placeholder="请选择"
+                        @change="handleChange($event, scope.row, 'smallList')">
+                        <el-option v-for="(item, index) in options" :key="index" :label="item.label" :value="item.id">
                         </el-option>
                       </el-select>
                       <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.smallLists=null,scope.row.smallList.splice(0,1)"></div> -->
-                      <div
-                        class="el-icon-edit-outline text-xs text-cyan"
-                        @click.stop="
-                          openStaffRatio(scope.row, scope.$index, 'smallList')
-                        "
-                      ></div>
+                      <div class="el-icon-edit-outline text-xs text-cyan"
+                        @click.stop="openStaffRatio(scope.row, scope.$index, 'smallList')"></div>
                     </div>
                   </el-form-item>
-                  <el-form-item label="高管">
+                  <el-form-item label='高管'>
                     <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'managerLists')"
-                        v-model="scope.row.managerLists"
-                        placeholder="请选择"
-                        @change="handleChange($event, scope.row, 'managerList')"
-                      >
-                        <el-option
-                          v-for="(item, index) in managerOptions"
-                          :key="index"
-                          :label="item.label"
-                          :value="item.id"
-                        >
+                      <el-select filterable default-first-option clearable @clear="clear(scope.row, 'managerLists')"
+                        v-model="scope.row.managerLists" placeholder="请选择"
+                        @change="handleChange($event, scope.row, 'managerList')">
+                        <el-option v-for="(item, index) in managerOptions" :key="index" :label="item.label"
+                          :value="item.id">
                         </el-option>
                       </el-select>
                       <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.managerLists=null,scope.row.managerList.splice(0,1)"></div> -->
-                      <div
-                        class="el-icon-edit-outline text-xs text-cyan"
-                        @click.stop="
-                          openStaffRatio(scope.row, scope.$index, 'managerList')
-                        "
-                      ></div>
+                      <div class="el-icon-edit-outline text-xs text-cyan"
+                        @click.stop="openStaffRatio(scope.row, scope.$index, 'managerList')"></div>
                     </div>
                   </el-form-item>
-                  <el-form-item label="管理层">
+                  <el-form-item label='管理层'>
                     <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'adminLists')"
-                        v-model="scope.row.adminLists"
-                        placeholder="请选择"
-                        @change="handleChange($event, scope.row, 'adminList')"
-                      >
-                        <el-option
-                          v-for="(item, index) in adminOptions"
-                          :key="index"
-                          :label="item.label"
-                          :value="item.id"
-                        >
+                      <el-select filterable default-first-option clearable @clear="clear(scope.row, 'adminLists')"
+                        v-model="scope.row.adminLists" placeholder="请选择"
+                        @change="handleChange($event, scope.row, 'adminList')">
+                        <el-option v-for="(item, index) in adminOptions" :key="index" :label="item.label"
+                          :value="item.id">
                         </el-option>
                       </el-select>
                       <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.adminLists=null,scope.row.adminList.splice(0,1)"></div> -->
-                      <div
-                        class="el-icon-edit-outline text-xs text-cyan"
-                        @click.stop="
-                          openStaffRatio(scope.row, scope.$index, 'adminList')
-                        "
-                      ></div>
+                      <div class="el-icon-edit-outline text-xs text-cyan"
+                        @click.stop="openStaffRatio(scope.row, scope.$index, 'adminList')"></div>
                     </div>
                   </el-form-item>
-                  <br />
+                  <br>
                 </el-form>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="140"
-            align="center"
-            label="项目选项"
-          >
+          <el-table-column show-overflow-tooltip min-width="140" align="center" label="项目选项">
             <template slot-scope="scope">
               <div class="flex justify-between align-center" @click.stop="">
-                <el-input
-                  v-model="scope.row.projectNum"
-                  placeholder="编码"
-                  @blur="proBlur(scope.row, (proIndex = scope.$index))"
-                  @change="proBlur(scope.row, (proIndex = scope.$index))"
-                >
-                  <el-button
-                    title="门店项目"
-                    size="mini"
-                    slot="append"
-                    icon="el-icon-tickets"
-                    @click.stop="openPro((proIndex = scope.$index))"
-                  ></el-button>
+                <el-input v-model="scope.row.projectNum" placeholder="编码"
+                  @blur="proBlur(scope.row, proIndex = scope.$index)"
+                  @change="proBlur(scope.row, proIndex = scope.$index)">
+                  <el-button title="门店项目" size="mini" slot="append" icon="el-icon-tickets"
+                    @click.stop="openPro(proIndex = scope.$index)"></el-button>
                 </el-input>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="120"
-            align="center"
-            prop="projectName"
-            label="项目名称"
-          >
+          <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="项目名称">
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="noDiscount"
-            label="卡付打折"
-            width="50"
-          >
+          <el-table-column align="center" prop="noDiscount" label="卡付打折" width="50">
             <template slot-scope="scope">{{
-              scope.row.noDiscount == 0
-                ? "是"
-                : scope.row.noDiscount == 1
-                ? "否"
-                : "未设"
+                scope.row.noDiscount == 0 ? "是" : scope.row.noDiscount == 1 ? '否' : "未设"
             }}</template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="80"
-            align="center"
-            prop="transactionPrice"
-            label="项目金额"
-          >
+          <el-table-column show-overflow-tooltip min-width="80" align="center" prop="transactionPrice" label="项目金额">
             <template slot-scope="scope">
-              <div
-                @click.stop="transactionPrice = scope.row.transactionPrice"
-                v-if="scope.row.courseAccountId == null"
-              >
-                <el-input
-                  @focus="transactionPrice = scope.row.transactionPrice"
-                  type="number"
-                  v-model="scope.row.transactionPrice"
-                  @blur="endEditMoney(scope.row)"
-                  placeholder="¥"
-                ></el-input>
+              <div @click.stop="transactionPrice = scope.row.transactionPrice" v-if="scope.row.courseAccountId == null">
+                <el-input @focus="transactionPrice = scope.row.transactionPrice" type="number"
+                  v-model="scope.row.transactionPrice" @blur="endEditMoney(scope.row)" placeholder="¥"></el-input>
               </div>
               <div v-else>{{ scope.row.transactionPrice }}</div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="80"
-            align="center"
-            prop=""
-            label="支付类型"
-          >
+          <el-table-column show-overflow-tooltip min-width="80" align="center" prop="" label="支付类型">
             <template slot-scope="scope">
-              <div>
-                {{ scope.row.courseAccountId != null ? "疗程付" : "卡付/现付" }}
-              </div>
+              <div>{{ scope.row.courseAccountId != null ? '疗程付' : '卡付/现付' }}</div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="120"
-            align="center"
-            prop=""
-            label="充值卡付"
-          >
+          <el-table-column show-overflow-tooltip min-width="120" align="center" prop="" label="充值卡付">
             <template slot-scope="props">
-              <div
-                @click.stop="projectindex(props.$index)"
-                v-if="props.row.isCardPay == 0"
-              >
-                <el-popover
-                  placement="bottom"
-                  width="900"
-                  @show="openRec(props.row)"
-                >
+              <div @click.stop="" v-if="props.row.isCardPay == 0">
+                <el-popover placement="bottom" width="900" @show="openRec(props.row)">
                   <div v-if="props.row.courseAccountId == null">
-                    <el-table
-                      class=" border"
-                      v-if="props.row.cashNumber == 1"
-                      style="max-width:900px"
-                      :data="rowRecList"
-                      :summary-method="getSummaries"
-                      show-summary
-                      max-height="400"
-                      :header-cell-style="{
-                        background: 'linear-gradient(#6cb3ff, #1873d4)',
-                        color: '#eeeeee'
-                      }"
-                    >
-                      <el-table-column
-                        align="center"
-                        prop="rechargeTypeName"
-                        show-overflow-tooltip
-                        label="卡付名称"
-                        width="110"
-                      ></el-table-column>
+                    <el-table class=" border" v-if="props.row.cashNumber == 1" style="max-width:900px"
+                      :data="rowRecList" :summary-method="getSummaries" show-summary max-height="400"
+                      :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }">
+                      <el-table-column align="center" prop="rechargeTypeName" show-overflow-tooltip label="卡付名称"
+                        width="110"></el-table-column>
                       <el-table-column align="center" label="类别" width="60">
                         <template slot-scope="scope">
                           <span v-if="scope.row.type == 1">折扣卡</span>
@@ -436,119 +193,46 @@
                           <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"
-                        align="center"
-                        prop="discount"
-                        label="折扣(%)"
-                      ></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" align="center" prop="discount"
+                        label="折扣(%)"></el-table-column>
                       <!-- <el-table-column align="center" prop="offsetMoney" label="可抵扣额" width="100"></el-table-column> -->
-                      <el-table-column
-                        align="center"
-                        prop="spendMoney"
-                        label="本次支付"
-                        width="90"
-                      >
+                      <el-table-column align="center" prop="spendMoney" label="本次支付" width="90">
                         <template slot-scope="scope">
-                          <div
-                            class="form-input-width"
-                            v-if="recIndex != scope.$index"
-                            @click="editcard(scope.row, scope.$index)"
-                          >
+                          <div class="form-input-width" v-if="recIndex != scope.$index"
+                            @click="editcard(scope.row, scope.$index)">
                             {{ scope.row.spendMoney }}
                             <i class="text-cyan el-icon-edit"></i>
                           </div>
-                          <el-input
-                            v-else
-                            v-focus
-                            type="number"
-                            size="samll"
-                            class="form-input-width"
-                            @blur="endEditcard(scope.row, scope.$index)"
-                            v-model="scope.row.spendMoney"
-                          ></el-input>
+                          <el-input v-else v-focus type="number" size="samll" class="form-input-width"
+                            @blur="endEditcard(scope.row, scope.$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> -->
-                      <el-table-column
-                        align="center"
-                        prop="cardOvers"
-                        label="可用余额"
-                        width="70"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="giftConsumeMoney"
-                        label="赠送可用"
-                        width="70"
-                      ></el-table-column>
-                      <el-table-column
-                        show-overflow-tooltip
-                        min-width="70"
-                        align="center"
-                        prop="discountFreeAmount"
-                        label="折扣(%)"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="giftSpendMoney"
-                        label="赠送支付"
-                        width="70"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="cardGiftOvers"
-                        label="赠送剩余"
-                        width="70"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="storeName"
-                        label="所属门店"
-                        width="110"
-                        show-overflow-tooltip
-                      >
+                      <el-table-column align="center" prop="cardOvers" label="可用余额" width="70"></el-table-column>
+                      <el-table-column align="center" prop="giftConsumeMoney" label="赠送可用" width="70"></el-table-column>
+                      <el-table-column show-overflow-tooltip min-width="70" align="center" prop="discountFreeAmount"
+                        label="折扣(%)"></el-table-column>
+                      <el-table-column align="center" prop="giftSpendMoney" label="赠送支付" width="70"></el-table-column>
+                      <el-table-column align="center" prop="cardGiftOvers" label="赠送剩余" width="70"></el-table-column>
+                      <el-table-column align="center" prop="storeName" label="所属门店" width="110" show-overflow-tooltip>
                       </el-table-column>
                     </el-table>
                   </div>
                   <!-- <recash ref="recash" @recashData="recashData"></recash> -->
-                  <el-button slot="reference">充值卡</el-button>
+                  <el-button slot="reference" @click="selectindex(props.row)">充值卡</el-button>
                 </el-popover>
               </div>
               <div v-else>不允许卡付</div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="75"
-            align="center"
-            prop="collectionAmounts"
-            label="卡付抵扣金额"
-          >
+          <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionAmounts" label="卡付抵扣金额">
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="75"
-            align="center"
-            prop="collectionRechargeAmount"
-            label="卡付金额"
-          ></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount"
+            label="卡付金额"></el-table-column>
           <!-- <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额">
           </el-table-column> -->
-          <el-table-column
-            show-overflow-tooltip
-            width="75"
-            align="center"
-            prop="sex"
-            label="性别"
-          >
+          <el-table-column show-overflow-tooltip width="75" align="center" prop="sex" label="性别">
             <template slot-scope="scope">
               <el-select v-model="scope.row.sex" placeholder="">
                 <el-option label="男" :value="0"></el-option>
@@ -556,61 +240,37 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="120"
-            align="center"
-            prop="remark"
-            label="备注"
-          >
+          <el-table-column show-overflow-tooltip min-width="120" align="center" prop="remark" label="备注">
             <template slot-scope="scope">
               <div @click.stop="">
                 <el-input v-model="scope.row.remark"></el-input>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="120"
-            align="center"
-            prop="storeName"
-            label="所属门店"
-          >
+          <el-table-column show-overflow-tooltip min-width="120" align="center" prop="storeName" label="所属门店">
           </el-table-column>
           <el-table-column width="80" align="center" label="操作">
             <!-- fixed="right" -->
             <template slot-scope="scope">
-              <el-button
-                :disabled="scope.row.editNumber == 1"
-                icon="el-icon-delete"
-                circle
-                size="mini"
-                type="primary"
-                @click.stop="delPro(scope.row)"
-              ></el-button>
+              <el-button :disabled="scope.row.editNumber == 1" icon="el-icon-delete" circle size="mini" type="primary"
+                @click.stop="delPro(scope.row)"></el-button>
+ 
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div
-        class="border-radius-10 border margin-left-xs  bg-white padding-xs"
-        style="margin-right:2%"
-      >
-        <div
-          class="flex justify-center align-center text-bold padding-bottom-xs"
-        >
+      <div class="border-radius-10 border margin-left-xs  bg-white padding-xs" style="margin-right:2%">
+        <div class="flex justify-center align-center text-bold padding-bottom-xs">
           <div class="form-width-m ">
             <span class=" ">总付金额:</span>
             <span class="text-red text-price">
-              <!-- {{ form.cashAmount.toFixed(2)*1 }} -->
-              {{ total }}
+              {{ form.cashAmount }}
             </span>
           </div>
           <div class="form-width-m">
             <span class=" ">现付金额:</span>
             <span class="text-red text-price">
-              <!-- {{ form.collectionCashAmounts }} -->
-              {{ appearPrice }}
+              {{ form.collectionCashAmounts }}
             </span>
           </div>
         </div>
@@ -623,37 +283,21 @@
     <project ref="project" @projectData="projectData"></project>
     <div class="flex justify-start padding-right padding-top">
       <div class="into-table-width flex justify-center" style="height:45px">
-        <el-button
-          size="samll"
-          icon="el-icon-add"
-          type="primary"
-          @click="addPro"
-          >添加项目</el-button
-        >
-        <el-button size="samll" type="primary" plain @click="openList"
-          >收银列表</el-button
-        >
-        <el-button size="samll" type="primary" plain @click="goBack">{{
-          isAddition == 1 ? "收银" : "补单"
-        }}</el-button>
-        <el-button size="samll" type="primary" plain @click="notData"
-          >清空页面</el-button
-        >
+        <el-button size="samll" icon="el-icon-add" type="primary" @click="addPro">添加项目</el-button>
+        <el-button size="samll" type="primary" plain @click="openList">收银列表</el-button>
+        <el-button size="samll" type="primary" plain @click="goBack">{{ isAddition == 1 ? '收银' : '补单' }}</el-button>
+        <el-button size="samll" type="primary" plain @click="notData">清空页面</el-button>
         <div class="padding-left padding-right"></div>
-        <el-button size="samll" type="primary" @click="confirm()"
-          >确认收银</el-button
-        >
+        <el-button size="samll" type="primary" @click="confirm()">确认收银</el-button>
       </div>
       <div></div>
     </div>
     <repayment ref="repayment" @repaymentData="inputMember"></repayment>
     <addmember ref="addmember"></addmember>
     <orders ref="orders"></orders>
-    <!-- <Coupons ref="Coupons" /> -->
   </div>
 </template>
 <script>
-import Coupons from "@/components/Coupons";
 import addmember from "@/components/member/edit/index";
 import {
   selectList,
@@ -665,7 +309,7 @@ import {
   proOne,
   addCash,
   recAccountCashList,
-  QuerCompetent
+  QuerCompetent,
 } from "@/api/eashier.js";
 import member from "@/components/member/index";
 import project from "@/components/project/index";
@@ -692,14 +336,13 @@ export default {
     repayment,
     recash,
     orders,
-    Coupons
   },
   data() {
     return {
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
-        }
+        },
       },
       useRecharge:
         JSON.parse(sessionStorage.getItem("sessionStorageData")).useRecharge *
@@ -717,9 +360,8 @@ export default {
         collectionCashAmount: 0,
         collectionCashAmounts: 0,
         cashAmount: 0,
-        debtMoney: 0
+        debtMoney: 0,
       },
-      projectIndex: 0,
       recListCopy: [], //当前会员的最初充值卡包
       recForm: {},
       projectList: [],
@@ -747,71 +389,11 @@ export default {
       rowRecList: [],
       copyPayList: [],
       routeNumber: null,
-      copyAccountList: [],
-      projectMomey: 0
     };
   },
-
-  computed: {
-    // 现付金额
-    appearPrice() {
-      /*
-      现付金额 = 项目金额transactionPrice - 卡付抵扣金额collectionAmounts
-      需要转换下number格式,不然是字符串拼接
-      */
-
-      let num = this.list.reduce((pre, item) => {
-        item.transactionPrice = item.transactionPrice
-          ? parseInt(item.transactionPrice)
-          : 0; // 抵扣金额存在,项目金额存在
-        if (item.collectionAmounts) {
-          item.collectionAmounts = parseInt(item.collectionAmounts);
-          return pre + (item.transactionPrice - item.collectionAmounts);
-        } // 抵扣金额不存在,项目金额存在
-        else if (!item.collectionAmounts && item.transactionPrice) {
-          return item.transactionPrice + pre; // 项目金额不存在
-        } else {
-          return pre + 0;
-        }
-      }, 0);
-      return num.toFixed(2);
-    }, // 总价金额
-    total() {
-      /*
-      项目金额transactionPrice   卡付抵扣金额collectionAmounts  卡付金额collectionRechargeAmount
-      总价=项目金额-卡付抵扣金额+卡付金额
-      需要转换下number格式,不然是字符串拼接
-      */
-
-      let total = this.list.reduce((pre, item) => {
-        item.transactionPrice = item.transactionPrice
-          ? parseInt(item.transactionPrice)
-          : 0; // 卡付金额/抵扣金额存在
-        if (item.transactionPrice && item.collectionAmounts) {
-          item.collectionRechargeAmount = item.collectionRechargeAmount
-            ? parseInt(item.collectionRechargeAmount)
-            : 0;
-          item.collectionAmounts = item.collectionAmounts
-            ? parseInt(item.collectionAmounts)
-            : 0;
-          return (
-            pre +
-            (item.transactionPrice -
-              item.collectionAmounts +
-              item.collectionRechargeAmount)
-          ); // 项目金额存在
-        } else if (item.transactionPrice) {
-          return pre + item.transactionPrice; // 项目金额不存在
-        } else {
-          return pre + 0;
-        }
-      }, 0);
-      return total.toFixed(2);
-    }
-  },
   methods: {
-    projectindex(index) {
-      this.projectIndex = index;
+    selectindex(row) {
+      //conslole.log(row)
     },
     changeMember() {
       if (this.cashNumber == 1) {
@@ -825,162 +407,90 @@ export default {
     openList() {
       this.$refs.orders.show();
     },
-
+ 
     clear(row, text) {
+      ////conslole.log(text);
       let form = { ...row };
       form[text] = [];
-
+      ////conslole.log(form);
       this.list.splice(row.index, 1, form);
     },
     //修改卡付金额
     editcard(row, index) {
-      console.log("🚀 ~ file: service.vue ~ line 837 ~ editcard ~ row", row)
       this.recIndex = index;
-      console.log(
-        "--------------------------------------------------------------------------------------"
-      );
-      console.log("🚀 ~ file: service.vue ~ line 843 ~ editcard ~ this.list[this.projectIndex]", this.list[this.projectIndex])
-      console.log("🚀 ~ file: service.vue ~ line 843 ~ editcard ~ this.rowRecList", this.rowRecList)
-      var num=0;
-      this.rowRecList.forEach((item)=>{
-        num=item.spendMoney+num
-       })
-      
-       console.log("🚀 ~ file: service.vue ~ line 845 ~ editcard ~ num", num)
-      if (this.list[this.projectIndex].noDiscount == 1) {
-        this.rowRecList[index].spendMoney = this.list[this.projectIndex].amount-num;
-      } else {
-        this.rowRecList[index].spendMoney =((this.list[this.projectIndex].amount-num) * 1 * (row.discount / 100) * 1).toFixed(2) * 1;
-      }
-      
-      // }
+      //conslole.log(index)
     },
     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
+        (this.recForm.amount * 1 - this.recForm.cashAmount * 1).toFixed(2) * 1;
+      let form = { ...row };
+      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) {
-        //判断成交价是否大于0
         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;
-                this.projectMomey =
-                  (this.projectMomey + form.discoutMoney).toFixed(2) * 1;
+                form.spendMoney =
+                  ((debtMoney * form.discount) / 100).toFixed(2) * 1;
               } else {
-                //判断充值可用金额是否大于成交价如果小于选择最大充值金额，剩下的用赠送金额计算
                 form.spendMoney = form.cardOver;
-                form.discoutMoney = //获取充值金折扣金额
-                  (form.cardOver / (form.discount / 100)).toFixed(2) * 1;
+                form.discoutMoney =
+                  (form.cardOver * (form.discount / 100)).toFixed(2) * 1;
+ 
                 form.giftSpendMoney =
-                  (debtMoney - form.discoutMoney).toFixed(2) * 1; //计算赠送金额
-                form.discoutGiftMoney =
                   (
-                    (debtMoney - form.discoutMoney) /
+                    (debtMoney - form.discoutMoney) *
                     (form.discountFreeAmount / 100)
-                  ).toFixed(2) * 1; ////计算赠送金额折扣金额
-                this.projectMomey =
-                  (
-                    this.projectMomey +
-                    form.discoutMoney +
-                    form.discoutGiftMoney
                   ).toFixed(2) * 1;
+                form.discoutGiftMoney =
+                  (debtMoney - form.discoutMoney).toFixed(2) * 1;
               }
             } else {
-              //不可以打折
               if (form.offsetMoney > debtMoney) {
-                //判断充值可用金额是否大于成交价如果大于直接用充值可用金额计算
-                form.discoutMoney = form.spendMoney;
-                this.projectMomey =
-                  (this.projectMomey + form.discoutMoney).toFixed(2) * 1;
+                form.spendMoney = debtMoney;
               } 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;
-                this.projectMomey =
-                  (
-                    this.projectMomey +
-                    form.discoutMoney +
-                    form.discoutGiftMoney
-                  ).toFixed(2) * 1;
               }
             }
           } else {
             //按比例使用
             let sunRatio =
-              (form.cardRestMoney + form.cardGiftOvers).toFixed(2) * 1; ///可用余额+赠送余额
-            let recRatio = (form.cardRestMoney / sunRatio).toFixed(2) * 1; //可用余额比例
-            let recGiftRatio = (form.cardGiftOvers / sunRatio).toFixed(2) * 1; //赠送余额比例
-            if (form.offsetMoney > debtMoney * recRatio) {
+              (form.cardRestMoney + form.cardGiftOvers).toFixed(2) * 1;///可用余额+赠送余额
+            let recRatio = (form.cardRestMoney / sunRatio).toFixed(2) * 1;//可用余额比例
+            let recGiftRatio = (form.cardGiftOvers / sunRatio).toFixed(2) * 1;//赠送余额比例
+            if (form.offsetMoney > debtMoney * recRatio) {//
               if (this.recForm.noDiscount == 0) {
-                //可以打折
-                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.discountFreeAmount / 100)
-                  ).toFixed(2) * 1; //赠送卡抵扣支付的钱
-                this.projectMomey =
-                  (
-                    this.projectMomey +
-                    form.discoutMoney +
-                    form.discoutGiftMoney
-                  ).toFixed(2) * 1;
+                form.discoutMoney =//充值卡支付的钱
+                  ((form.spendMoney * 1) / (form.discount / 100)).toFixed(2) * 1;
+                form.giftSpendMoney = ((form.spendMoney * 1) / recRatio * recGiftRatio).toFixed(2) * 1;
+                //conslole.log("这个是赠送金额" + form.giftSpendMoney)
+                form.discoutGiftMoney =//赠送卡支付的钱
+                  (form.giftSpendMoney / (form.discountFreeAmount / 100)).toFixed(2) * 1;
+                ////conslole.log(form.discoutGiftMoney)
               } else {
-                //不可以打折
-                form.discoutMoney = form.spendMoney.toFixed(2) * 1; //充值卡支付的钱
-                form.giftSpendMoney =
-                  (((form.spendMoney * 1) / recRatio) * recGiftRatio).toFixed(
-                    2
-                  ) * 1; //赠送实际出的钱
-                form.discoutGiftMoney = giftSpendMoney.toFixed(2) * 1; //赠送卡抵扣支付的钱
-                this.projectMomey =
-                  (
-                    this.projectMomey +
-                    form.discoutMoney +
-                    form.discoutGiftMoney
-                  ).toFixed(2) * 1;
+                ////conslole.log(debtMoney);
+                form.spendMoney = (debtMoney * recRatio).toFixed(2) * 1;
+                form.discoutMoney = (debtMoney * recRatio).toFixed(2) * 1;
+                form.giftSpendMoney = (debtMoney * recGiftRatio).toFixed(2) * 1;
+                form.discoutGiftMoney =
+                  (debtMoney * recGiftRatio).toFixed(2) * 1;
               }
+ 
             } 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.spendMoney * 1) * (form.discount / 100)).toFixed(2) * 1;
+              form.giftSpendMoney = ((form.spendMoney * 1) / recRatio * recGiftRatio).toFixed(2) * 1;
+              //conslole.log("这个是赠送金额" + form.giftSpendMoney)
+              form.discoutGiftMoney =//赠送卡支付的钱
                 (form.giftSpendMoney * (form.discount / 100)).toFixed(2) * 1;
-              this.projectMomey =
-                (
-                  this.projectMomey +
-                  form.discoutMoney +
-                  form.discoutGiftMoney
-                ).toFixed(2) * 1;
             }
           }
           if (form.spendMoney == 0) {
@@ -989,199 +499,106 @@ export default {
             form.discoutGiftMoney = 0;
           }
         } else {
-          //折扣卡
           if (this.recForm.noDiscount == 0) {
             // 可以打折
             form.discoutMoney =
-              (form.spendMoney / (form.discount / 100)).toFixed(2) * 1;
-            this.projectMomey =
-              (this.projectMomey + form.discoutMoney).toFixed(2) * 1;
-            console.log(
-              "🚀 ~ file: service.vue ~ line 557 ~ endEditcard ~ form.spendMoney",
-              form.spendMoney
-            );
-
-            console.log(
-              "🚀 ~ file: service.vue ~ line 556 ~ endEditcard ~ form.discoutMoney",
-              form.discoutMoney
-            );
+              (form.spendMoney /( form.discount / 100)).toFixed(2) * 1;
           } else {
             //不可以打折
-            form.discoutMoney = form.spendMoney;
-            this.projectMomey =
-              this.projectMomey + form.discoutMoney
+           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
-        ) {
-          //卡付金额不能大于套餐的金额
-          // console.log("🚀 ~ file: service.vue ~ line 592 ~ endEditcard ~ this.list[this.editProIndex]", this.list[this.editProIndex])
-          // this.$message.info({
-          //   message: "卡付金额不能大于套餐金额",
-          // });
-          if (form.type == 2 || form.type == 0) {
-            //活动卡与赠送卡
-            if (this.useRecharge == 2) {
-              //先充值再赠送
-              if (this.recForm.noDiscount == 0) {
-                //可以打折
-                if (form.offsetMoney > debtMoney) {
-                  form.spendMoney =
-                    (
-                      this.list[this.editProIndex].amount *
-                      (form.discount / 100)
-                    ).toFixed(2) * 1;
-                  form.discoutMoney = this.list[this.editProIndex].amount;
-                  form.discoutGiftMoney = 0;
-                  form.giftSpendMoney = 0;
-                } else {
-                  form.spendMoney = form.cardOver;
-                  form.discoutMoney =
-                    (form.spendMoney / (form.discount / 100)).toFixed(2) * 1;
-                  form.discoutGiftMoney =
-                    (
-                      this.list[this.editProIndex].amount - form.discoutMoney
-                    ).toFixed(2) * 1;
-                  form.giftSpendMoney =
-                    (
-                      form.discoutGiftMoney *
-                      (form.discountFreeAmount / 100)
-                    ).toFixed(2) * 1;
-                }
-              } else {
-                if (form.offsetMoney > debtMoney) {
-                  form.spendMoney = this.list[this.editProIndex].amount;
-                  form.discoutMoney = this.list[this.editProIndex].amount;
-                  form.discoutGiftMoney = 0;
-                  form.giftSpendMoney = 0;
-                } else {
-                  form.spendMoney = form.cardOver;
-                  form.discoutMoney = form.spendMoney;
-                  form.discoutGiftMoney = this.list[this.editProIndex].amount;
-                  form.giftSpendMoney = form.discoutGiftMoney;
-                }
-              }
-            } else {
-              //按比例使用
-            let sunRatio =
-              (form.cardRestMoney + form.cardGiftOvers).toFixed(2) * 1; ///可用余额+赠送余额
-            let recRatio = (form.cardRestMoney / sunRatio).toFixed(2) * 1; //可用余额比例
-            let recGiftRatio = (form.cardGiftOvers / sunRatio).toFixed(2) * 1; //赠送余额比例
-            if (form.offsetMoney > debtMoney * recRatio) {
-              if (this.recForm.noDiscount == 0) {
-                //可以打折
-              
-                form.discoutMoney =(this.list[this.editProIndex].amount*recRatio).toFixed(2) * 1;
-                form.discoutGiftMoney =(this.list[this.editProIndex].amount- form.discoutMoney).toFixed(2) * 1;
-                form.giftSpendMoney =(discoutGiftMoney* (form.discountFreeAmount / 100)).toFixed(2) * 1;
-                form.SpendMoney =(discoutMoney* (form.discount / 100)).toFixed(2) * 1;
-              } else {
-                //不可以打折
-                form.discoutMoney =(this.list[this.editProIndex].amount*recRatio).toFixed(2) * 1;
-                form.discoutGiftMoney =(this.list[this.editProIndex].amount- form.discoutMoney).toFixed(2) * 1;
-                form.giftSpendMoney =discoutGiftMoney
-                form.SpendMoney =form.discoutMoney
-              }
-            } 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.projectMomey =
-                (
-                  this.projectMomey +
-                  form.discoutMoney +
-                  form.discoutGiftMoney
-                ).toFixed(2) * 1;
-            }
-          
-            }
-          } else {
-            //折扣卡
-            if (this.recForm.noDiscount == 0) {
-            // 可以打折
-            form.discoutMoney =this.list[this.editProIndex].amount
-            form.spendMoney=(form.discoutMoney * (form.discount / 100)).toFixed(2) * 1;
-          } else {
-            //不可以打折
-            form.discoutMoney = this.list[this.editProIndex].amount
-            form.spendMoney=this.list[this.editProIndex].amount
            
-          form.discoutGiftMoney = 0;
-          }
+          form.discoutGiftMoney=0
+        }
+        if (form.discoutGiftMoney + form.discoutMoney > this.list[this.editProIndex].amount) {
+          this.$message.info({
+            message: "卡付金额不能大于套餐金额",
+          });
+          form.spendMoney = 0
+          form.discoutMoney = 0
+          form.discoutGiftMoney = 0
+          form.giftSpendMoney = 0
         }
-      }
       } else {
+        form.spendMoney = 0;
+        form.giftSpendMoney = 0;
         if (0 <= row.spendMoney * 1 > row.cardOver * 1) {
           this.$message.info({
-            message: "支付金额不能大于可用金额!"
+            message: "支付金额不能大于可用金额!",
           });
-          row.spendMoney = 0;
-          row.giftSpendMoney = 0;
         }
       }
-      // if (form.spendMoney > form.cardOver) {
-      //   form.spendMoney = form.cardOver;
-      //   form.giftSpendMoney = form.cardGiftOvers;
-      // }
-
-      this.rowRecList.splice(index, 1, form); //将卡付卡的数据替换掉
-      this.list[this.editProIndex].collectionCashAmounts =
-        (
-          this.list[this.editProIndex].amount -
-          (form.discoutMoney + form.discoutGiftMoney)
-        ).toFixed(2) * 1; //计算每一个项目的各自的现付金额
+      if (form.spendMoney > form.cardOver) {
+        form.spendMoney = form.cardOver;
+        form.giftSpendMoney = form.cardGiftOvers;
+      }
+ 
+      this.rowRecList.splice(index, 1, form);
+      this.list[this.editProIndex].collectionCashAmounts = (this.list[this.editProIndex].amount - (form.discoutMoney + form.discoutGiftMoney)).toFixed(2) * 1;
+      ////conslole.log(this.list)
+      ////conslole.log('这是index'+index)
       let num = 0;
-      this.list.forEach(item => {
-        num = (num + item.collectionCashAmounts).toFixed(2) * 1;
+      this.list.forEach((item) => {
+        num = num + item.collectionCashAmounts
       });
-
+      ////conslole.log(num)
       this.form.collectionCashAmounts = num;
-      console.log(
-        "🚀 ~ file: service.vue ~ line 597 ~ endEditcard ~ this.form.collectionCashAmounts",
-        this.form.collectionCashAmounts
-      );
-      this.form.cashAmount = (num * 1 + form.spendMoney * 1).toFixed(2) * 1;
-      console.log(
-        "🚀 ~ file: service.vue ~ line 598 ~ endEditcard ~ this.form.cashAmount",
-        this.form.cashAmount
-      );
-      console.log(
-        "🚀 ~ file: service.vue ~ line 596 ~ endEditcard ~ form.spendMoney",
-        form
-      );
+      this.form.cashAmount = (num*1+(form.spendMoney*1)).toFixed(2) * 1;
       this.sumNum();
+      // this.rowRecList.splice(index, 1, form);
+ 
+      // ---------------------------------------------------------------------------------------------------------------
+      // if (!row.spendMoney) {
+      //   row.spendMoney = 0;
+      // }
+      // row.spendMoney = row.spendMoney * 1;
+ 
+      // if (0 <= row.spendMoney * 1 > row.cardOver * 1) {
+      //   this.$message.info({
+      //     message: "支付金额不能大于可用金额!",
+      //   });
+      // } else {
+      //   this.recIndex = -1;
+      //   if (row.spendMoney * 1 < 0) {
+      //   } else {
+      //     if (this.recForm.noDiscount == 0) {
+      //       row.discoutMoney =
+      //         ((row.spendMoney * 1) / ((row.discount * 1) / 100)).toFixed(2) * 1;
+      //     } else {
+      //       row.discoutMoney = row.spendMoney;
+      //     }
+      //     row.cardOvers =
+      //       (row.cardOver * 1 - row.spendMoney * 1).toFixed(2) * 1;
+      //     row.cardGiftOvers =
+      //       (row.giftConsumeMoney * 1 - row.giftSpendMoney * 1).toFixed(2) * 1;
+      //   }
+      //   if (row.spendMoney == 0) {
+      //     row.discoutGiftMoney = 0;
+      //   }
+      // }
+      // let res = { ...row };
+      // this.rowRecList.splice(index, 1, res);
+      // this.sumNum();
     },
-
     sumNum() {
       let spendMoney = 0;
       let spendNumber = 0;
-
-      this.rowRecList.forEach(item => {
-        spendMoney =
-          (
-            spendMoney +
-            (item.discoutMoney * 1 + item.discoutGiftMoney * 1) * 1
-          ).toFixed(2) * 1;
-
-        spendNumber =
-          (
-            spendNumber +
-            (item.spendMoney * 1 + item.giftSpendMoney * 1) * 1
-          ).toFixed(2) * 1;
+      ////conslole.log(this.rowRecList)
+      this.rowRecList.forEach((item) => {
+        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);
+      console.log("🚀 ~ file: service.vue ~ line 595 ~ sumNum ~ spendMoney", spendMoney)
+ 
       this.recForm.collectionRechargeAmount = spendNumber.toFixed(2) * 1;
       this.recForm.collRecAmonnt = spendMoney.toFixed(2) * 1;
-
+      ////conslole.log(this.recForm.collectionRechargeAmount)
       this.recForm.cashAmount =
         (
           this.recForm.collectionCashAmount +
@@ -1198,17 +615,22 @@ export default {
           this.recForm.collectionCashAmount +
           this.recForm.collectionIntegralAmount
         ).toFixed(2) * 1;
-      this.recForm.collectionAmounts = spendMoney.toFixed(2) * 1;
-
-      this.recForm.rechargeAmount = spendNumber.toFixed(2) * 1;
+      this.recForm.collectionAmounts =
+        (
+          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);
       let rList = [];
-      this.list.forEach(item => {
+      this.list.forEach((item) => {
         if (item.index == this.editProIndex) {
           let rechargeAccountList = JSON.parse(
             JSON.stringify(item.rechargeAccountList)
           );
-          rechargeAccountList.forEach(item => {
+          rechargeAccountList.forEach((item) => {
+            ////conslole.log(item);
             item.cardOver = item.cardOvers;
             item.giftConsumeMoney = item.cardGiftOvers;
             item.giftSpendMoney = 0;
@@ -1217,16 +639,18 @@ export default {
           });
         }
       });
-
+ 
       this.recListCopy = JSON.parse(JSON.stringify(rList));
-
-      this.list.forEach(item => {
+ 
+      this.list.forEach((item) => {
         if (item.index != this.editProIndex) {
+          ////conslole.log(this.setRecList(item));
           let recArr = this.setRecList(item);
           item.rechargeAccountList.forEach((item, index) => {
             if (item.spendMoney > 0) {
               this.sumAmont();
             } else {
+              ////conslole.log(item);
               item.cardOver = recArr[index].cardOvers;
               item.cardOvers = recArr[index].cardOvers;
               item.giftConsumeMoney = recArr[index].cardGiftOvers;
@@ -1235,22 +659,15 @@ export default {
           });
         }
       });
-
+      ////conslole.log(rList);
+      ////conslole.log(this.list);
       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.rowRecList = JSON.parse(JSON.stringify(row.rechargeAccountList));
       this.editProIndex = row.index;
+      //conslole.log( this.editProIndex)
     },
     recashData(v) {
       this.list = v.list;
@@ -1258,6 +675,7 @@ export default {
       let recList = v.form.rechargeAccountList;
       this.list.forEach((item, index) => {
         if (Vindex < index) {
+          ////conslole.log("大于当前, 卡包变");
           recList.forEach((rec, recIndex) => {
             if (rec.spendMoney > 0) {
               item.rechargeAccountList[recIndex].cardOver = rec.cardOvers;
@@ -1269,7 +687,6 @@ export default {
       this.sumAmont();
     },
     proBlur(row) {
-      this.projectMomey = 0;
       if (this.cashNumber == 1 && !this.memberForm.memberName) {
         this.$message.warning({ message: "请先选择会员 !" });
       } else {
@@ -1277,9 +694,9 @@ export default {
           pageSize: 999,
           projectNum: row.projectNum,
           state: 1,
-          directConsumption: 1
+          directConsumption: 1,
         };
-        propage(form).then(res => {
+        propage(form).then((res) => {
           if (res.code == "000000") {
             if (res.pageInfo.total == 1) {
               if (!res.pageInfo.list[0].courseAccountId) {
@@ -1300,23 +717,23 @@ export default {
               confirmButtonClass: "confirmbtnFalses",
               type: "warning",
               center: true,
-              callback: action => {}
+              callback: (action) => { },
             });
           }
         });
       }
     },
-
+ 
     openAddMember() {
       this.$refs.addmember.show("添加");
     },
     getRowKeys(row) {
       return row.index;
     },
-
+ 
     endEditMoney(row) {
       let form = { ...row };
-
+      ////conslole.log(row);
       if (this.cashNumber == 1) {
         if (
           form.topPriceMember < form.transactionPrice * 1 ||
@@ -1327,7 +744,7 @@ export default {
               "价格不能低于" +
               form.minumumPriceMember +
               "高于" +
-              form.topPriceMember
+              form.topPriceMember,
           });
           form.transactionPrice = this.transactionPrice;
         } else {
@@ -1339,7 +756,8 @@ export default {
           form.transactionPrice * 1 < form.minumumPrice
         ) {
           this.$message.error({
-            message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice
+            message:
+              "价格不能低于" + form.minumumPrice + "高于" + form.topPrice,
           });
           form.transactionPrice = this.transactionPrice;
         } else {
@@ -1350,6 +768,7 @@ export default {
       this.sumAmont();
     },
     handleChange(data, row, text) {
+      ////conslole.log("行号", row.index);
       let form = { ...row };
       if (text == "managerList") {
         this.managerOptions.forEach((item, index) => {
@@ -1372,6 +791,7 @@ export default {
       } else {
         this.options.forEach((item, index) => {
           if (item.id == data) {
+            ////conslole.log("返回数据:", item);
             item.ratio = 100;
             form[text] = [];
             form[text].push(item);
@@ -1388,8 +808,8 @@ export default {
       if (partten.phoneNum.test(this.memberForm.mobilePhone)) {
         storeMemberOne({
           mobilePhone: this.memberForm.mobilePhone,
-          storeId: sessionStorage.getItem("parentId")
-        }).then(res => {
+          storeId: sessionStorage.getItem("parentId"),
+        }).then((res) => {
           if (res.code == "000000") {
             this.memberForm = res.data;
             this.debtMoneys = res.data.debtMoneys;
@@ -1408,7 +828,7 @@ export default {
                 confirmButtonClass: "confirmbtnFalses",
                 type: "warning",
                 center: true,
-                callback: action => {}
+                callback: (action) => { },
               });
               this.cashNumber = 0;
             }
@@ -1420,13 +840,13 @@ export default {
     },
     passcodeData(v) {
       if (v != null) {
+        //conslole.log(v)
         this.formData.append("file", v);
       }
       this.addCashConfirm();
     },
     //打开选择会员充值卡包弹窗
     openPro() {
-      this.projectMomey = 0;
       if (this.cashNumber == 1 && !this.memberForm.memberName) {
         this.$message.warning({ message: "请先选择会员 !" });
       } else {
@@ -1437,6 +857,7 @@ export default {
       this.$refs.project.show(this.memberForm);
     },
     projectData(v) {
+      ////conslole.log(v);
       if (!v.courseAccountId) {
         v.courseAccountId = null;
         v.courseProjectId = v.id;
@@ -1446,7 +867,6 @@ export default {
       }
       this.setProOne(v);
     },
-    // cashAmount
     setProOne(row) {
       if (row.courseAccountId == null) {
         row.courseMoney = 0;
@@ -1455,8 +875,8 @@ export default {
       }
       let form = {};
       proOne({
-        id: row.courseProjectId
-      }).then(res => {
+        id: row.courseProjectId,
+      }).then((res) => {
         if (res.code == "000000") {
           form = {
             payLists: this.payLists,
@@ -1508,8 +928,9 @@ export default {
             minumumPriceMember: res.data.minumumPriceMember,
             cashNumber: this.cashNumber,
             numberTimes: 1,
-            minumumTimes: res.data.minumumTimes
+            minumumTimes: res.data.minumumTimes,
           };
+          ////conslole.log(form);
           this.setRecList(form);
           if (this.cashNumber == 1) {
             if (row.courseAccountId == null) {
@@ -1533,15 +954,17 @@ export default {
           }
           form.memberName = this.memberForm.memberName;
           form.mobilePhone = this.memberForm.mobilePhone;
-
+ 
           if (form.courseAccountId == null) {
             form.cashAmount = 0;
             form.collectionAmount = 0;
           } else {
-            form.cashAmount = form.amount.toFixed(2) * 1;
+            form.cashAmount = form.amount;
             form.collectionAmount = form.cashAmount;
+            ////conslole.log("1")
           }
           if (this.list.length > 0) {
+            ////conslole.log(this.list.length);
             if (!this.list[0].projectName) {
               this.proIndex = 0;
             }
@@ -1570,13 +993,13 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
         }
       });
     },
     setRecList(form) {
-      this.recListCopy.forEach(item => {
+      this.recListCopy.forEach((item) => {
         item.cardGiftOvers = 0;
         item.spendMoney = 0;
         item.giftSpendMoney = 0;
@@ -1603,6 +1026,7 @@ export default {
                 2
               ) * 1;
           }
+          ////conslole.log(item);
         } else {
           item.offsetMoney = item.giftConsumeMoney + item.cardConsumeMoney;
           item.offsetGiftMoney = 0;
@@ -1619,12 +1043,11 @@ export default {
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
           center: true,
-          callback: action => {}
+          callback: (action) => { },
         });
         flag = false;
       }
       let sumMoney = 0;
-
       this.list.forEach((item, index) => {
         if (item.courseAccountId == null) {
           sumMoney +=
@@ -1634,11 +1057,21 @@ export default {
               item.collectionIntegralAmount
             ).toFixed(2) * 1;
         }
+        // if (!(item.sex == 0 || item.sex == 1)) {
+        //   this.$alert("项目没有选择顾客性别", "提示", {
+        //     confirmButtonText: "确定",
+        //     confirmButtonClass: "confirmbtnFalses",
+        //     type: "warning",
+        //     center: true,
+        //     callback: (action) => {},
+        //   });
+        //   flag = false;
+        // }
       });
-
+ 
       if (
         this.balance <=
-          (this.form.collectionCashAmounts - sumMoney).toFixed(2) * 1 ||
+        (this.form.collectionCashAmounts - sumMoney).toFixed(2) * 1 ||
         (this.form.collectionCashAmounts - sumMoney).toFixed(2) * 1 < 0
       ) {
         flag = false;
@@ -1647,7 +1080,7 @@ export default {
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
           center: true,
-          callback: action => {}
+          callback: (action) => { },
         });
       }
       if (this.isAddition == 1 && !this.additionDate) {
@@ -1657,7 +1090,7 @@ export default {
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
           center: true,
-          callback: action => {}
+          callback: (action) => { },
         });
       }
       if (flag) {
@@ -1674,7 +1107,7 @@ export default {
           if (item.courseAccountId != null) {
             passShow = true;
           }
-          item.rechargeAccountList.forEach(items => {
+          item.rechargeAccountList.forEach((items) => {
             if (items.spendMoney > 0) {
               passShow = true;
             }
@@ -1689,7 +1122,7 @@ export default {
     },
     addCashConfirm() {
       let list = [];
-      this.list.forEach(item => {
+      this.list.forEach((item) => {
         if (item.courseAccountId == null) {
           item.collectionCashAmount =
             (
@@ -1704,19 +1137,19 @@ export default {
               item.collectionCashAmount
             ).toFixed(2) * 1;
         }
-
+ 
         item.isAddition = this.isAddition;
         if (this.isAddition == 1) {
           item.additionDate = this.additionDate;
         }
         let salesmens = [];
-        item.managerList.forEach(items => {
+        item.managerList.forEach((items) => {
           if (items.id) {
             items.staffType = 0;
             salesmens.push(items);
           }
         });
-        item.adminList.forEach(items => {
+        item.adminList.forEach((items) => {
           if (items.id) {
             items.staffType = 1;
             salesmens.push(items);
@@ -1725,19 +1158,19 @@ export default {
         item.salesmens = salesmens;
         let payLists = [];
         let rechargeAccountList = [];
-        this.payLists.forEach(item => {
+        this.payLists.forEach((item) => {
           if (item.payMoney > 0) {
             let items = {
               payMoney: item.payMoney,
               payId: item.payId,
-              payName: item.payName
+              payName: item.payName,
             };
             payLists.push(items);
           }
         });
         item.payListsCopy = this.payLists;
         item.payLists = payLists;
-        item.rechargeAccountList.forEach(item => {
+        item.rechargeAccountList.forEach((item) => {
           if (item.spendMoney > 0) {
             rechargeAccountList.push(item);
           }
@@ -1746,28 +1179,30 @@ export default {
         item.rechargeAccountList = rechargeAccountList;
         if (item.courseAccountId != null) {
           item.collectionAmount = item.amount;
+          ////conslole.log("2")
         }
         if (item.projectId) {
           list.push(item);
         }
       });
-
-      list.forEach(item => {
-        item.collectionAmount = item.collectionAmounts;
-      });
-
+      //conslole.log(list)
+ 
+      list.forEach((item) => {
+        item.collectionAmount = item.collectionAmounts
+ 
+      })
+      //conslole.log(list)
       this.formData.append("cashListRequestList", JSON.stringify(list));
-
-      addCash(this.formData).then(res => {
+      addCash(this.formData).then((res) => {
         if (res.code == "000000") {
           this.$message.success({
-            message: "验证成功 , 收银" + res.message
+            message: "验证成功 , 收银" + res.message,
           });
-          this.formData = new FormData();
+          this.formData = new FormData()
           this.notData();
         } else {
           this.payLists = this.payListsCopy;
-          this.list.forEach(item => {
+          this.list.forEach((item) => {
             item.collectionCashAmount = 0;
           });
           this.$alert("收银" + res.message, "提示", {
@@ -1775,21 +1210,22 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
-          this.formData = new FormData();
+          this.formData = new FormData()
         }
       });
     },
     openStaffRatio(row, index, text) {
       this.editIndex = index;
-
+      //conslole.log(row)
       this.$refs.staffratio.show(row, text);
       this.$refs.staffratio.showdetele();
-      localStorage.setItem("row", JSON.stringify(row));
-      localStorage.setItem("text", text);
+      localStorage.setItem("row",JSON.stringify(row))
+      localStorage.setItem("text",text)
     },
     staffratioData(v) {
+      //conslole.log(v)
       let form = this.list[this.editIndex];
       let texts = v.text + "s";
       form[v.text] = v.list;
@@ -1807,25 +1243,47 @@ export default {
         adminList: [],
         payLists: this.payLists,
         rechargeAccountList: [], //卡付列表
-        collectionCashAmounts: 0
+        collectionCashAmounts:0,
       };
-      this.projectMomey = 0;
+ 
       this.list.push(list);
+      //conslole.log("🚀 ~ file: service.vue ~ line 1246 ~ addPro ~ list", this.list)
     },
     delPro(row) {
       // this.czRecList(row);
       this.list.splice(row.index, 1);
-
-      this.form.cashAmount =
-        (this.form.cashAmount - row.amount + row.cashAmount).toFixed(2) * 1;
-      this.form.collectionCashAmounts =
-        this.form.cashAmount - row.amount + row.cashAmount;
-      this.form.collectionCashAmount = this.form.collectionCashAmounts;
-      this.payLists.forEach(item => {
-        item.payMoney = 0;
+      ////conslole.log(row)
+      this.form.cashAmount = this.form.cashAmount - row.amount + row.cashAmount
+      this.form.collectionCashAmounts = this.form.cashAmount - row.amount + row.cashAmount
+      this.form.collectionCashAmount = this.form.collectionCashAmounts
+      this.payLists.forEach((item) => {
+        item.payMoney = 0
       });
-      this.sumAmont();
+      this.sumAmont()
     },
+    // czRecList(row) {
+    //   let list = [];
+    //   row.rechargeAccountList.forEach((item) => {
+    //     if (item.spendMoney > 0) {
+    //       list.push(item);
+    //     }
+    //   });
+    //   this.recListCopy.forEach((item) => {
+    //     list.forEach((items) => {
+    //       if (item.id == items.id) {
+    //         ////conslole.log(item);
+    //         ////conslole.log(item.giftConsumeMoney);
+    //         ////conslole.log(item.giftSpendMoney);
+    //         item.cardOver = (item.cardOver + items.spendMoney).toFixed(2) * 1;
+    //         item.cardOvers = (item.cardOvers + items.spendMoney).toFixed(2) * 1;
+    //         item.cardGiftOvers =
+    //           (item.giftConsumeMoney + items.giftSpendMoney).toFixed(2) * 1;
+    //         item.giftConsumeMoney =
+    //           (item.giftConsumeMoney + items.giftSpendMoney).toFixed(2) * 1;
+    //       }
+    //     });
+    //   });
+    // },
     //打开选择会员弹窗
     openMember() {
       this.cashNumber = 1;
@@ -1833,14 +1291,16 @@ export default {
     },
     //选中会员返回方法
     memberData(v) {
+      ////conslole.log(v);
       this.memberForm.mobilePhone = v.mobilePhone;
       this.inputMember();
     },
-    reccardData(v) {},
+    reccardData(v) { },
     courseData(v) {
       this.setProOne(v);
     },
     paymentData(v) {
+      ////conslole.log(v);
       this.form = v.form;
       this.payLists = v.list;
       this.sumAmont();
@@ -1848,8 +1308,8 @@ export default {
     rowClassName({ row, rowIndex }) {
       row.index = rowIndex;
     },
-
-    expandSelect: function(row, expandedRows) {
+ 
+    expandSelect: function (row, expandedRows) {
       var that = this;
       this.expandedRows = JSON.parse(JSON.stringify(expandedRows));
       // if (expandedRows.length) {
@@ -1863,6 +1323,7 @@ export default {
     },
     //点击选中
     rowClick(row) {
+      ////conslole.log(row);
       this.$refs.list.toggleRowExpansion(row);
     },
     close() {
@@ -1877,7 +1338,7 @@ export default {
     },
     //获取数据
     async getData() {
-      this.list.forEach(item => {
+      this.list.forEach((item) => {
         item.payLists = [...this.payLists];
         item.rechargeAccountList = [];
       });
@@ -1889,21 +1350,21 @@ export default {
         //会员
         storeMemberOne({
           mobilePhone: itemForm.mobilePhone,
-          storeId: sessionStorage.getItem("parentId")
-        }).then(res => {
+          storeId: sessionStorage.getItem("parentId"),
+        }).then((res) => {
           if (res.code == "000000") {
             this.memberForm = res.data;
             this.$refs.reccard.show(this.memberForm);
             this.$refs.course.show(this.memberForm);
             var memberIds = {
-              memberId: itemForm.memberId
+              memberId: itemForm.memberId,
             };
             recAccountCashList({
-              memberId: this.memberForm.id
-            }).then(res => {
+              memberId: this.memberForm.id,
+            }).then((res) => {
               if (res.code == "000000") {
                 this.rechargeAccountList = res.rows;
-                this.list.forEach(item => {
+                this.list.forEach((item) => {
                   item.rechargeAccountList = this.rechargeAccountList;
                 });
               } else {
@@ -1912,16 +1373,16 @@ export default {
                   confirmButtonClass: "confirmbtnFalses",
                   type: "warning",
                   center: true,
-                  callback: action => {}
+                  callback: (action) => { },
                 });
               }
               //查询当前会员下的所有项目疗程 如果有相对应的项目 就给courseAccountId赋值 没有的话 就是卡付现付
-              couAccountList(memberIds).then(res => {
+              couAccountList(memberIds).then((res) => {
                 if (res.code == "000000") {
                   this.projectList = res.rows;
                   if (res.rows.length != 0) {
-                    this.list.forEach(items1 => {
-                      res.rows.forEach(items => {
+                    this.list.forEach((items1) => {
+                      res.rows.forEach((items) => {
                         items.number = items.courseConsumeCount;
                         if (
                           items.courseProjectId == items1.projectId &&
@@ -1941,10 +1402,10 @@ export default {
                     confirmButtonClass: "confirmbtnFalses",
                     type: "warning",
                     center: true,
-                    callback: action => {}
+                    callback: (action) => { },
                   });
                 }
-
+ 
                 let list = [];
                 this.list.forEach((itemList, index) => {
                   var itemLists = {
@@ -2006,9 +1467,9 @@ export default {
                     cardAchievementSmall: itemList.cardAchievementSmall,
                     cardAchievementTechnician:
                       itemList.cardAchievementTechnician,
-                    cardAchievementZhonggong: itemList.cardAchievementZhonggong
+                    cardAchievementZhonggong: itemList.cardAchievementZhonggong,
                   };
-
+ 
                   if (itemLists.courseAccountId == null) {
                     itemLists.cashAmount = 0;
                     itemLists.collectionAmount = 0;
@@ -2016,7 +1477,7 @@ export default {
                   } else {
                     itemLists.cashAmount = itemLists.amount;
                     itemLists.collectionAmount = itemLists.amount;
-
+                    ////conslole.log(3)
                     itemLists.courseMoney = itemLists.transactionPrice;
                   }
                   list.push(itemLists);
@@ -2088,7 +1549,7 @@ export default {
             cardAchievementLarge: itemList.cardAchievementLarge,
             cardAchievementSmall: itemList.cardAchievementSmall,
             cardAchievementTechnician: itemList.cardAchievementTechnician,
-            cardAchievementZhonggong: itemList.cardAchievementZhonggong
+            cardAchievementZhonggong: itemList.cardAchievementZhonggong,
           };
           list.push(itemLists);
         });
@@ -2097,7 +1558,7 @@ export default {
       }
     },
     setList() {
-      this.list.forEach(item => {
+      this.list.forEach((item) => {
         item.editNumber = 1;
         if (item.largeList.length != 0) {
           item.largeLists =
@@ -2149,7 +1610,7 @@ export default {
         }
       });
     },
-
+ 
     goBack() {
       if (this.isAddition == 0) {
         this.orderNumber = 1;
@@ -2162,12 +1623,12 @@ export default {
     },
     getRecCard() {
       recAccountCashList({
-        memberId: this.memberForm.id
-      }).then(res => {
+        memberId: this.memberForm.id,
+      }).then((res) => {
         if (res.code == "000000") {
           this.rechargeAccountList = res.rows;
           this.recListCopy = JSON.parse(JSON.stringify(res.rows));
-          this.list.forEach(item => {
+          this.list.forEach((item) => {
             item.rechargeAccountList = this.rechargeAccountList;
           });
           this.addPro();
@@ -2177,21 +1638,21 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
         }
       });
       this.getCt();
     },
     getDetail() {
-      selectListType({ type: 0 }).then(res => {
+      selectListType({ type: 0 }).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach(item => {
+          res.rows.forEach((item) => {
             item.label = item.brandNumber + "-" + item.staffName;
             item.ratio = 100;
             delete item.state;
           });
-
+ 
           this.adminOptions = res.rows;
         } else {
           this.$alert(res.message, "加载员工提示", {
@@ -2199,13 +1660,13 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
         }
       });
-      QuerCompetent({ type: 0, pageSize: 999 }).then(res => {
+      QuerCompetent({ type: 0, pageSize: 999 }).then((res) => {
         if (res.code == "000000") {
-          res.pageInfo.list.forEach(item => {
+          res.pageInfo.list.forEach((item) => {
             item.label = item.brandNumber + "-" + item.staffName;
             item.ratio = 100;
             delete item.state;
@@ -2217,13 +1678,13 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
         }
       });
-      selectList({ id: "" }).then(res => {
+      selectList({ id: "" }).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach(item => {
+          res.rows.forEach((item) => {
             item.label = item.brandNumber + "-" + item.staffName;
             delete item.state;
             item.ratio = 100;
@@ -2235,7 +1696,7 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
         }
       });
@@ -2243,23 +1704,23 @@ export default {
     },
     getCt() {
       ctlist({
-        state: 1
-      }).then(res => {
+        state: 1,
+      }).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach(item => {
+          res.rows.forEach((item) => {
             item.payMoney = 0;
             item.payId = item.id;
             item.payName = item.collectionTypeName;
           });
           this.payLists = JSON.parse(JSON.stringify(res.rows));
           this.copyPayList = JSON.parse(JSON.stringify(res.rows));
-          this.list.forEach(item => {
+          this.list.forEach((item) => {
             item.payLists = this.payLists;
             item.rechargeAccountList = [];
           });
           this.form = {
             collectionCashAmount: 0,
-            cashAmount: 0
+            cashAmount: 0,
           };
           this.sumAmont();
         } else {
@@ -2268,20 +1729,19 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: action => {}
+            callback: (action) => { },
           });
         }
       });
     },
-    // cashAmount
     sumAmont() {
       let money = 0;
       var payMoneys = 0;
-      this.payLists.forEach(item => {
+      this.payLists.forEach((item) => {
         payMoneys += item.payMoney;
       });
       if (this.form.collectionCashAmount <= 0) {
-        this.list.forEach(item => {
+        this.list.forEach((item) => {
           item.collectionCashAmount = 0;
           if (item.rechargeAmount) {
             item.collectionAmount =
@@ -2290,19 +1750,22 @@ export default {
                 item.collectionIntegralAmount +
                 item.collectionCashAmount
               ).toFixed(2) * 1;
+            ////conslole.log(4)
           } else {
             item.collectionAmount =
               (
                 item.collectionIntegralAmount + item.collectionCashAmount
               ).toFixed(2) * 1;
           }
+          ////conslole.log(5)
         });
       }
       let collectionRechargeAmountg = 0;
-      this.list.forEach(item => {
+      this.list.forEach((item) => {
         let debtMoney = 0;
-
+ 
         if (item.amount && item.courseAccountId == null) {
+ 
           debtMoney =
             (
               item.amount -
@@ -2312,19 +1775,16 @@ export default {
             ).toFixed(2) * 1;
           money += debtMoney;
         }
-        collectionRechargeAmountg +=
-          item.collectionRechargeAmount.toFixed(2) * 1;
-        console.log(
-          "🚀 ~ file: service.vue ~ line 1764 ~ this.list.forEach ~ collectionRechargeAmountg",
-          collectionRechargeAmountg
-        );
+        collectionRechargeAmountg += (item.collectionRechargeAmount).toFixed(2) * 1;
       });
-
-      // 总付金额计算
-      this.form.cashAmount =
-        money.toFixed(2) * 1 + collectionRechargeAmountg.toFixed(2) * 1;
-      this.form.collectionCashAmounts = money.toFixed(2) * 1;
-      this.list.forEach(item => {
+ 
+      this.form.cashAmount = (money.toFixed(2) * 1) + (collectionRechargeAmountg.toFixed(2) * 1)
+      this.form.collectionCashAmounts = (money.toFixed(2) * 1)
+      // console.log("🚀 ~ file: service.vue ~ line 1780 ~ sumAmont ~ this.form.collectionCashAmounts", this.form.collectionCashAmounts)
+      // //conslole.log(this.form.collectionCashAmounts)
+      // //conslole.log(this.form.cashAmount)
+      // console.log("🚀 ~ file: service.vue ~ line 1782 ~ sumAmont ~ this.form.cashAmount", this.form.cashAmount)
+      this.list.forEach((item) => {
         if (
           this.form.cashAmount == this.form.collectionCashAmount &&
           item.courseAccountId == null
@@ -2343,11 +1803,15 @@ export default {
               item.collectionIntegralAmount +
               item.collectionCashAmount
             ).toFixed(2) * 1;
+          ////conslole.log(6)
+          ////conslole.log( item.collectionAmount)
+ 
         } else {
           item.collectionAmount =
             (item.collectionIntegralAmount + item.collectionCashAmount).toFixed(
               2
             ) * 1;
+          ////conslole.log(7)
         }
       });
       this.form.debtMoney =
@@ -2355,6 +1819,7 @@ export default {
       var that = this;
       setTimeout(() => {
         that.$nextTick(() => {
+          //conslole.log(that.form)
           that.$refs.payment.show(that.form, that.payLists);
         });
       }, 500);
@@ -2368,7 +1833,7 @@ export default {
           sums[index] = "合计";
           return;
         }
-        const values = data.map(item => Number(item[column.property]));
+        const values = data.map((item) => Number(item[column.property]));
         if (column.property == "discoutMoney") {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
@@ -2413,31 +1878,31 @@ export default {
     },
     setPage() {
       this.getDetail();
-    }
+    },
   },
   activated() {
     this.setPage();
   },
-  created() {}
+  created() { },
 };
 </script>
-
+ 
 <style scoped>
 .el-icon-edit-outline {
   padding-left: 5px;
 }
-
+ 
 .imgss {
   width: 160px;
   height: 60px;
   border: 1px solid #333;
 }
-
+ 
 .esign {
   border: #333 1px solid;
 }
-
+ 
 .el-form-item {
   margin-bottom: 5px;
 }
-</style>
+</style>
\ No newline at end of file