|
|
|
|
@ -43,76 +43,100 @@
|
|
|
|
|
</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" row-key="index" 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"
|
|
|
|
|
row-key="index" 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='美发师'>
|
|
|
|
|
<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-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='美容师'>
|
|
|
|
|
<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-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='技师'>
|
|
|
|
|
<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-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='助理'>
|
|
|
|
|
<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-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='高管'>
|
|
|
|
|
<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='管理层'>
|
|
|
|
|
<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>
|
|
|
|
|
@ -123,13 +147,17 @@
|
|
|
|
|
<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>
|
|
|
|
|
<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">
|
|
|
|
|
<template slot-scope="scope">{{
|
|
|
|
|
scope.row.noDiscount == 0 ? "是" : scope.row.noDiscount == 1 ? '否' : "未设"
|
|
|
|
|
@ -138,7 +166,8 @@
|
|
|
|
|
<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>
|
|
|
|
|
<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>
|
|
|
|
|
@ -153,8 +182,11 @@
|
|
|
|
|
<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>
|
|
|
|
|
@ -163,36 +195,44 @@
|
|
|
|
|
</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 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">
|
|
|
|
|
<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 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-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="collectionAmount" 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 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="collectionCashAmount" label="现付金额">
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
<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="">
|
|
|
|
|
@ -208,11 +248,13 @@
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column show-overflow-tooltip min-width="120" align="center" prop="storeName" label="所属门店"></el-table-column>
|
|
|
|
|
<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>
|
|
|
|
|
@ -221,15 +263,15 @@
|
|
|
|
|
<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=" ">总付金额:</span>
|
|
|
|
|
<span class="text-red text-price">
|
|
|
|
|
{{ form.cashAmount }}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="form-width-m">
|
|
|
|
|
<span class=" ">实付金额:</span>
|
|
|
|
|
<span class=" ">现付金额:</span>
|
|
|
|
|
<span class="text-red text-price">
|
|
|
|
|
{{form.collectionCashAmount}}
|
|
|
|
|
{{ form.collectionCashAmounts }}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
@ -317,6 +359,7 @@ export default {
|
|
|
|
|
rowList: [],
|
|
|
|
|
form: {
|
|
|
|
|
collectionCashAmount: 0,
|
|
|
|
|
collectionCashAmounts: 0,
|
|
|
|
|
cashAmount: 0,
|
|
|
|
|
debtMoney: 0,
|
|
|
|
|
},
|
|
|
|
|
@ -350,6 +393,9 @@ export default {
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
selectindex(row) {
|
|
|
|
|
console.log(row)
|
|
|
|
|
},
|
|
|
|
|
changeMember() {
|
|
|
|
|
if (this.cashNumber == 1) {
|
|
|
|
|
Object.assign(this.$data, this.$options.data.call(this));
|
|
|
|
|
@ -364,30 +410,26 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
clear(row, text) {
|
|
|
|
|
console.log(text);
|
|
|
|
|
//console.log(text);
|
|
|
|
|
let form = { ...row };
|
|
|
|
|
form[text] = [];
|
|
|
|
|
console.log(form);
|
|
|
|
|
//console.log(form);
|
|
|
|
|
this.list.splice(row.index, 1, form);
|
|
|
|
|
},
|
|
|
|
|
//修改卡付金额
|
|
|
|
|
editcard(row, index) {
|
|
|
|
|
this.recIndex = index;
|
|
|
|
|
console.log(index)
|
|
|
|
|
},
|
|
|
|
|
endEditcard(row, index) {
|
|
|
|
|
console.log(index)
|
|
|
|
|
let debtMoney =
|
|
|
|
|
(this.recForm.amount * 1 - this.recForm.cashAmount * 1).toFixed(2) * 1;
|
|
|
|
|
console.log(this.recForm)
|
|
|
|
|
let form = { ...row };
|
|
|
|
|
console.log(debtMoney);
|
|
|
|
|
console.log(form)
|
|
|
|
|
//console.log(debtMoney);//套餐价格
|
|
|
|
|
if (debtMoney > 0) {
|
|
|
|
|
// let cardMoney =
|
|
|
|
|
// (form.offsetMoney + form.offsetGiftMoney).toFixed(2) * 1;
|
|
|
|
|
// if (cardMoney < debtMoney) {
|
|
|
|
|
// form.spendMoney = form.cardOver;
|
|
|
|
|
// form.giftSpendMoney = form.giftConsumeMoney;
|
|
|
|
|
// form.discoutMoney = form.offsetMoney;
|
|
|
|
|
// form.discoutGiftMoney = form.offsetGiftMoney;
|
|
|
|
|
// } else {
|
|
|
|
|
console.log(form.type);
|
|
|
|
|
console.log(this.useRecharge);
|
|
|
|
|
if (form.type == 2 || form.type == 0) {
|
|
|
|
|
if (this.useRecharge == 2) {
|
|
|
|
|
//先用充值再用赠送
|
|
|
|
|
@ -423,47 +465,35 @@ export default {
|
|
|
|
|
} 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;
|
|
|
|
|
console.log(form.cardRestMoney);
|
|
|
|
|
console.log(form.cardGiftOvers);
|
|
|
|
|
console.log(sunRatio);
|
|
|
|
|
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.spendMoney =
|
|
|
|
|
(debtMoney * recRatio * (form.discount / 100)).toFixed(2) * 1;
|
|
|
|
|
form.discoutMoney = (debtMoney * recRatio).toFixed(2) * 1;
|
|
|
|
|
form.giftSpendMoney =
|
|
|
|
|
(
|
|
|
|
|
debtMoney *
|
|
|
|
|
recGiftRatio *
|
|
|
|
|
(form.discountFreeAmount / 100)
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
form.discoutGiftMoney =
|
|
|
|
|
(debtMoney * recGiftRatio).toFixed(2) * 1;
|
|
|
|
|
form.discoutMoney =//充值卡支付的钱
|
|
|
|
|
((form.spendMoney * 1) / (form.discount / 100)).toFixed(2) * 1;
|
|
|
|
|
form.giftSpendMoney = ((form.spendMoney * 1) / recRatio * recGiftRatio).toFixed(2) * 1;
|
|
|
|
|
console.log("这个是赠送金额" + form.giftSpendMoney)
|
|
|
|
|
form.discoutGiftMoney =//赠送卡支付的钱
|
|
|
|
|
(form.giftSpendMoney / (form.discountFreeAmount / 100)).toFixed(2) * 1;
|
|
|
|
|
//console.log(form.discoutGiftMoney)
|
|
|
|
|
} else {
|
|
|
|
|
console.log(debtMoney);
|
|
|
|
|
//console.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.cardOver / (form.discount / 100)).toFixed(2) * 1;
|
|
|
|
|
form.giftSpendMoney =
|
|
|
|
|
debtMoney * recRatio -
|
|
|
|
|
form.discoutMoney +
|
|
|
|
|
(debtMoney * recGiftRatio).toFixed(2) * 1;
|
|
|
|
|
form.discoutGiftMoney =
|
|
|
|
|
(
|
|
|
|
|
debtMoney * recRatio -
|
|
|
|
|
form.discoutMoney +
|
|
|
|
|
(debtMoney * recGiftRatio) / (form.discountFreeAmount / 100)
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
((form.spendMoney * 1) * (form.discount / 100)).toFixed(2) * 1;
|
|
|
|
|
form.giftSpendMoney = ((form.spendMoney * 1) / recRatio * recGiftRatio).toFixed(2) * 1;
|
|
|
|
|
console.log("这个是赠送金额" + form.giftSpendMoney)
|
|
|
|
|
form.discoutGiftMoney =//赠送卡支付的钱
|
|
|
|
|
(form.giftSpendMoney * (form.discount / 100)).toFixed(2) * 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (form.spendMoney == 0) {
|
|
|
|
|
@ -474,71 +504,100 @@ export default {
|
|
|
|
|
} else {
|
|
|
|
|
if (this.recForm.noDiscount == 0) {
|
|
|
|
|
// 可以打折
|
|
|
|
|
form.spendMoney =
|
|
|
|
|
((debtMoney * form.discount) / 100).toFixed(2) * 1;
|
|
|
|
|
|
|
|
|
|
form.discoutMoney =
|
|
|
|
|
((form.spendMoney * form.discount) / 100).toFixed(2) * 1;
|
|
|
|
|
} else {
|
|
|
|
|
// 不可以打折
|
|
|
|
|
form.spendMoney = debtMoney;
|
|
|
|
|
不可以打折
|
|
|
|
|
form.discoutMoney = form.spendMoney;
|
|
|
|
|
}
|
|
|
|
|
form.discoutMoney = debtMoney;
|
|
|
|
|
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 (form.spendMoney > form.cardOver) {
|
|
|
|
|
form.spendMoney = form.cardOver;
|
|
|
|
|
form.giftSpendMoney = form.cardGiftOvers;
|
|
|
|
|
}
|
|
|
|
|
this.rowRecList.splice(index, 1, form);
|
|
|
|
|
},
|
|
|
|
|
endEditcard(row, index) {
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
if (form.spendMoney > form.cardOver) {
|
|
|
|
|
form.spendMoney = form.cardOver;
|
|
|
|
|
form.giftSpendMoney = form.cardGiftOvers;
|
|
|
|
|
}
|
|
|
|
|
let res = { ...row };
|
|
|
|
|
this.rowRecList.splice(index, 1, res);
|
|
|
|
|
|
|
|
|
|
this.rowRecList.splice(index, 1, form);
|
|
|
|
|
this.list[this.editProIndex].collectionCashAmounts = this.list[this.editProIndex].amount - (form.discoutMoney + form.discoutGiftMoney)
|
|
|
|
|
//console.log(this.list)
|
|
|
|
|
//console.log('这是index'+index)
|
|
|
|
|
let num = 0;
|
|
|
|
|
this.list.forEach((item) => {
|
|
|
|
|
// //console.log("这个是"+item.collectionCashAmounts)
|
|
|
|
|
num = num + item.collectionCashAmounts
|
|
|
|
|
});
|
|
|
|
|
//console.log(num)
|
|
|
|
|
this.form.collectionCashAmounts = num;
|
|
|
|
|
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;
|
|
|
|
|
//console.log(this.rowRecList)
|
|
|
|
|
this.rowRecList.forEach((item) => {
|
|
|
|
|
console.log(item.discoutMoney);
|
|
|
|
|
console.log(item.discoutGiftMoney);
|
|
|
|
|
spendMoney += (item.discoutMoney + item.discoutGiftMoney) * 1;
|
|
|
|
|
spendNumber += (item.spendMoney * 1 + item.giftSpendMoney) * 1;
|
|
|
|
|
//console.log(item.discoutMoney);
|
|
|
|
|
//console.log(item.discoutGiftMoney);
|
|
|
|
|
});
|
|
|
|
|
console.log(spendMoney);
|
|
|
|
|
//console.log(spendMoney);
|
|
|
|
|
|
|
|
|
|
this.recForm.collectionRechargeAmount = spendNumber.toFixed(2) * 1;
|
|
|
|
|
this.recForm.collRecAmonnt = spendMoney.toFixed(2) * 1;
|
|
|
|
|
|
|
|
|
|
//console.log(this.recForm.collectionRechargeAmount)
|
|
|
|
|
this.recForm.cashAmount =
|
|
|
|
|
(
|
|
|
|
|
this.recForm.collectionCashAmount +
|
|
|
|
|
@ -555,6 +614,11 @@ export default {
|
|
|
|
|
this.recForm.collectionCashAmount +
|
|
|
|
|
this.recForm.collectionIntegralAmount
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
this.recForm.collectionAmounts =
|
|
|
|
|
(
|
|
|
|
|
spendMoney
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
//console.log(this.recForm.collectionAmount)
|
|
|
|
|
this.recForm.rechargeAmount = spendNumber;
|
|
|
|
|
this.list.splice(this.recForm.index, 1, this.recForm);
|
|
|
|
|
let rList = [];
|
|
|
|
|
@ -564,7 +628,7 @@ export default {
|
|
|
|
|
JSON.stringify(item.rechargeAccountList)
|
|
|
|
|
);
|
|
|
|
|
rechargeAccountList.forEach((item) => {
|
|
|
|
|
console.log(item);
|
|
|
|
|
//console.log(item);
|
|
|
|
|
item.cardOver = item.cardOvers;
|
|
|
|
|
item.giftConsumeMoney = item.cardGiftOvers;
|
|
|
|
|
item.giftSpendMoney = 0;
|
|
|
|
|
@ -578,12 +642,13 @@ export default {
|
|
|
|
|
|
|
|
|
|
this.list.forEach((item) => {
|
|
|
|
|
if (item.index != this.editProIndex) {
|
|
|
|
|
console.log(this.setRecList(item));
|
|
|
|
|
//console.log(this.setRecList(item));
|
|
|
|
|
let recArr = this.setRecList(item);
|
|
|
|
|
item.rechargeAccountList.forEach((item, index) => {
|
|
|
|
|
if (item.spendMoney > 0) {
|
|
|
|
|
this.sumAmont();
|
|
|
|
|
} else {
|
|
|
|
|
console.log(item);
|
|
|
|
|
//console.log(item);
|
|
|
|
|
item.cardOver = recArr[index].cardOvers;
|
|
|
|
|
item.cardOvers = recArr[index].cardOvers;
|
|
|
|
|
item.giftConsumeMoney = recArr[index].cardGiftOvers;
|
|
|
|
|
@ -592,14 +657,15 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log(rList);
|
|
|
|
|
console.log(this.list);
|
|
|
|
|
//console.log(rList);
|
|
|
|
|
//console.log(this.list);
|
|
|
|
|
this.sumAmont();
|
|
|
|
|
},
|
|
|
|
|
openRec(row) {
|
|
|
|
|
this.recForm = JSON.parse(JSON.stringify(row));
|
|
|
|
|
this.rowRecList = JSON.parse(JSON.stringify(row.rechargeAccountList));
|
|
|
|
|
this.editProIndex = row.index;
|
|
|
|
|
console.log( this.editProIndex)
|
|
|
|
|
},
|
|
|
|
|
recashData(v) {
|
|
|
|
|
this.list = v.list;
|
|
|
|
|
@ -607,7 +673,7 @@ export default {
|
|
|
|
|
let recList = v.form.rechargeAccountList;
|
|
|
|
|
this.list.forEach((item, index) => {
|
|
|
|
|
if (Vindex < index) {
|
|
|
|
|
console.log("大于当前, 卡包变");
|
|
|
|
|
//console.log("大于当前, 卡包变");
|
|
|
|
|
recList.forEach((rec, recIndex) => {
|
|
|
|
|
if (rec.spendMoney > 0) {
|
|
|
|
|
item.rechargeAccountList[recIndex].cardOver = rec.cardOvers;
|
|
|
|
|
@ -665,7 +731,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
endEditMoney(row) {
|
|
|
|
|
let form = { ...row };
|
|
|
|
|
console.log(row);
|
|
|
|
|
//console.log(row);
|
|
|
|
|
if (this.cashNumber == 1) {
|
|
|
|
|
if (
|
|
|
|
|
form.topPriceMember < form.transactionPrice * 1 ||
|
|
|
|
|
@ -700,7 +766,7 @@ export default {
|
|
|
|
|
this.sumAmont();
|
|
|
|
|
},
|
|
|
|
|
handleChange(data, row, text) {
|
|
|
|
|
console.log("行号", row.index);
|
|
|
|
|
//console.log("行号", row.index);
|
|
|
|
|
let form = { ...row };
|
|
|
|
|
if (text == "managerList") {
|
|
|
|
|
this.managerOptions.forEach((item, index) => {
|
|
|
|
|
@ -723,7 +789,7 @@ export default {
|
|
|
|
|
} else {
|
|
|
|
|
this.options.forEach((item, index) => {
|
|
|
|
|
if (item.id == data) {
|
|
|
|
|
console.log("返回数据:", item);
|
|
|
|
|
//console.log("返回数据:", item);
|
|
|
|
|
item.ratio = 100;
|
|
|
|
|
form[text] = [];
|
|
|
|
|
form[text].push(item);
|
|
|
|
|
@ -772,6 +838,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
passcodeData(v) {
|
|
|
|
|
if (v != null) {
|
|
|
|
|
console.log(v)
|
|
|
|
|
this.formData.append("file", v);
|
|
|
|
|
}
|
|
|
|
|
this.addCashConfirm();
|
|
|
|
|
@ -788,7 +855,7 @@ export default {
|
|
|
|
|
this.$refs.project.show(this.memberForm);
|
|
|
|
|
},
|
|
|
|
|
projectData(v) {
|
|
|
|
|
console.log(v);
|
|
|
|
|
//console.log(v);
|
|
|
|
|
if (!v.courseAccountId) {
|
|
|
|
|
v.courseAccountId = null;
|
|
|
|
|
v.courseProjectId = v.id;
|
|
|
|
|
@ -861,7 +928,7 @@ export default {
|
|
|
|
|
numberTimes: 1,
|
|
|
|
|
minumumTimes: res.data.minumumTimes,
|
|
|
|
|
};
|
|
|
|
|
console.log(form);
|
|
|
|
|
//console.log(form);
|
|
|
|
|
this.setRecList(form);
|
|
|
|
|
if (this.cashNumber == 1) {
|
|
|
|
|
if (row.courseAccountId == null) {
|
|
|
|
|
@ -892,9 +959,10 @@ export default {
|
|
|
|
|
} else {
|
|
|
|
|
form.cashAmount = form.amount;
|
|
|
|
|
form.collectionAmount = form.cashAmount;
|
|
|
|
|
//console.log("1")
|
|
|
|
|
}
|
|
|
|
|
if (this.list.length > 0) {
|
|
|
|
|
console.log(this.list.length);
|
|
|
|
|
//console.log(this.list.length);
|
|
|
|
|
if (!this.list[0].projectName) {
|
|
|
|
|
this.proIndex = 0;
|
|
|
|
|
}
|
|
|
|
|
@ -956,7 +1024,7 @@ export default {
|
|
|
|
|
2
|
|
|
|
|
) * 1;
|
|
|
|
|
}
|
|
|
|
|
console.log(item);
|
|
|
|
|
//console.log(item);
|
|
|
|
|
} else {
|
|
|
|
|
item.offsetMoney = item.giftConsumeMoney + item.cardConsumeMoney;
|
|
|
|
|
item.offsetGiftMoney = 0;
|
|
|
|
|
@ -1001,8 +1069,8 @@ export default {
|
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
this.balance <=
|
|
|
|
|
(this.form.collectionCashAmount - sumMoney).toFixed(2) * 1 ||
|
|
|
|
|
(this.form.collectionCashAmount - sumMoney).toFixed(2) * 1 < 0
|
|
|
|
|
(this.form.collectionCashAmounts - sumMoney).toFixed(2) * 1 ||
|
|
|
|
|
(this.form.collectionCashAmounts - sumMoney).toFixed(2) * 1 < 0
|
|
|
|
|
) {
|
|
|
|
|
flag = false;
|
|
|
|
|
this.$alert("实付金额不等于项目金额", "提示", {
|
|
|
|
|
@ -1109,17 +1177,26 @@ export default {
|
|
|
|
|
item.rechargeAccountList = rechargeAccountList;
|
|
|
|
|
if (item.courseAccountId != null) {
|
|
|
|
|
item.collectionAmount = item.amount;
|
|
|
|
|
//console.log("2")
|
|
|
|
|
}
|
|
|
|
|
if (item.projectId) {
|
|
|
|
|
list.push(item);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log(list)
|
|
|
|
|
|
|
|
|
|
list.forEach((item) => {
|
|
|
|
|
item.collectionAmount = item.collectionAmounts
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
console.log(list)
|
|
|
|
|
this.formData.append("cashListRequestList", JSON.stringify(list));
|
|
|
|
|
addCash(this.formData).then((res) => {
|
|
|
|
|
if (res.code == "000000") {
|
|
|
|
|
this.$message.success({
|
|
|
|
|
message: "验证成功 , 收银" + res.message,
|
|
|
|
|
});
|
|
|
|
|
this.formData = new FormData()
|
|
|
|
|
this.notData();
|
|
|
|
|
} else {
|
|
|
|
|
this.payLists = this.payListsCopy;
|
|
|
|
|
@ -1133,14 +1210,20 @@ export default {
|
|
|
|
|
center: true,
|
|
|
|
|
callback: (action) => { },
|
|
|
|
|
});
|
|
|
|
|
this.formData = new FormData()
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
openStaffRatio(row, index, text) {
|
|
|
|
|
this.editIndex = index;
|
|
|
|
|
console.log(row)
|
|
|
|
|
this.$refs.staffratio.show(row, text);
|
|
|
|
|
this.$refs.staffratio.showdetele();
|
|
|
|
|
localStorage.setItem("row",JSON.stringify(row))
|
|
|
|
|
localStorage.setItem("text",text)
|
|
|
|
|
},
|
|
|
|
|
staffratioData(v) {
|
|
|
|
|
console.log(v)
|
|
|
|
|
let form = this.list[this.editIndex];
|
|
|
|
|
let texts = v.text + "s";
|
|
|
|
|
form[v.text] = v.list;
|
|
|
|
|
@ -1163,32 +1246,40 @@ export default {
|
|
|
|
|
this.list.push(list);
|
|
|
|
|
},
|
|
|
|
|
delPro(row) {
|
|
|
|
|
this.czRecList(row);
|
|
|
|
|
// this.czRecList(row);
|
|
|
|
|
this.list.splice(row.index, 1);
|
|
|
|
|
},
|
|
|
|
|
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) {
|
|
|
|
|
console.log(item);
|
|
|
|
|
console.log(item.giftConsumeMoney);
|
|
|
|
|
console.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;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//console.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()
|
|
|
|
|
},
|
|
|
|
|
// 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) {
|
|
|
|
|
// //console.log(item);
|
|
|
|
|
// //console.log(item.giftConsumeMoney);
|
|
|
|
|
// //console.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;
|
|
|
|
|
@ -1196,7 +1287,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
//选中会员返回方法
|
|
|
|
|
memberData(v) {
|
|
|
|
|
console.log(v);
|
|
|
|
|
//console.log(v);
|
|
|
|
|
this.memberForm.mobilePhone = v.mobilePhone;
|
|
|
|
|
this.inputMember();
|
|
|
|
|
},
|
|
|
|
|
@ -1205,7 +1296,7 @@ export default {
|
|
|
|
|
this.setProOne(v);
|
|
|
|
|
},
|
|
|
|
|
paymentData(v) {
|
|
|
|
|
console.log(v);
|
|
|
|
|
//console.log(v);
|
|
|
|
|
this.form = v.form;
|
|
|
|
|
this.payLists = v.list;
|
|
|
|
|
this.sumAmont();
|
|
|
|
|
@ -1228,7 +1319,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
//点击选中
|
|
|
|
|
rowClick(row) {
|
|
|
|
|
console.log(row);
|
|
|
|
|
//console.log(row);
|
|
|
|
|
this.$refs.list.toggleRowExpansion(row);
|
|
|
|
|
},
|
|
|
|
|
close() {
|
|
|
|
|
@ -1382,6 +1473,7 @@ export default {
|
|
|
|
|
} else {
|
|
|
|
|
itemLists.cashAmount = itemLists.amount;
|
|
|
|
|
itemLists.collectionAmount = itemLists.amount;
|
|
|
|
|
//console.log(3)
|
|
|
|
|
itemLists.courseMoney = itemLists.transactionPrice;
|
|
|
|
|
}
|
|
|
|
|
list.push(itemLists);
|
|
|
|
|
@ -1654,17 +1746,22 @@ export default {
|
|
|
|
|
item.collectionIntegralAmount +
|
|
|
|
|
item.collectionCashAmount
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
//console.log(4)
|
|
|
|
|
} else {
|
|
|
|
|
item.collectionAmount =
|
|
|
|
|
(
|
|
|
|
|
item.collectionIntegralAmount + item.collectionCashAmount
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
}
|
|
|
|
|
//console.log(5)
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
let collectionRechargeAmountg = 0;
|
|
|
|
|
this.list.forEach((item) => {
|
|
|
|
|
let debtMoney = 0;
|
|
|
|
|
|
|
|
|
|
if (item.amount && item.courseAccountId == null) {
|
|
|
|
|
|
|
|
|
|
debtMoney =
|
|
|
|
|
(
|
|
|
|
|
item.amount -
|
|
|
|
|
@ -1674,8 +1771,13 @@ export default {
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
money += debtMoney;
|
|
|
|
|
}
|
|
|
|
|
collectionRechargeAmountg += (item.collectionRechargeAmount).toFixed(2) * 1;
|
|
|
|
|
});
|
|
|
|
|
this.form.cashAmount = money.toFixed(2) * 1;
|
|
|
|
|
|
|
|
|
|
this.form.cashAmount = (money.toFixed(2) * 1) + (collectionRechargeAmountg.toFixed(2) * 1)
|
|
|
|
|
this.form.collectionCashAmounts = (money.toFixed(2) * 1)
|
|
|
|
|
console.log(this.form.collectionCashAmounts)
|
|
|
|
|
console.log(this.form.cashAmount)
|
|
|
|
|
this.list.forEach((item) => {
|
|
|
|
|
if (
|
|
|
|
|
this.form.cashAmount == this.form.collectionCashAmount &&
|
|
|
|
|
@ -1695,11 +1797,15 @@ export default {
|
|
|
|
|
item.collectionIntegralAmount +
|
|
|
|
|
item.collectionCashAmount
|
|
|
|
|
).toFixed(2) * 1;
|
|
|
|
|
//console.log(6)
|
|
|
|
|
//console.log( item.collectionAmount)
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
item.collectionAmount =
|
|
|
|
|
(item.collectionIntegralAmount + item.collectionCashAmount).toFixed(
|
|
|
|
|
2
|
|
|
|
|
) * 1;
|
|
|
|
|
//console.log(7)
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.form.debtMoney =
|
|
|
|
|
@ -1707,6 +1813,7 @@ export default {
|
|
|
|
|
var that = this;
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
that.$nextTick(() => {
|
|
|
|
|
console.log(that.form)
|
|
|
|
|
that.$refs.payment.show(that.form, that.payLists);
|
|
|
|
|
});
|
|
|
|
|
}, 500);
|
|
|
|
|
@ -1778,14 +1885,17 @@ export default {
|
|
|
|
|
.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;
|
|
|
|
|
}
|
|
|
|
|
|
Sigo
4 years ago