Skip to content

M
member
Commit b49dd452 by chenyu
Options

update: update

parent 8532fb09
Showing with 32 additions and 32 deletions
src/components/allCustomers/consumption.vue
......@@ -54,8 +54,8 @@
<el-table class="only-content-table" :data="group.orderItems" show-overflow-tooltip
:span-method="(obj)=>spanMethod({...obj,length:group.orderItems.length})">
<template v-for="colunm in tableColumnList">
<el-table-column :key="colunm" :label="colunm.label" :min-width="colunm.width" show-overflow-tooltip
:prop="colunm.prop">
<el-table-column :key="colunm" :label="colunm.label" :min-width="colunm.width"
show-overflow-tooltip :prop="colunm.prop">
<template slot-scope="{row}">
<template
v-if="['orderStatus','clerkName','payAmount'].includes(colunm.prop)">
......@@ -78,39 +78,39 @@
<div style="display:flex;align-items:center;padding-left:14px;">
￥{{ group[colunm.prop]?(group[colunm.prop]|fomatFloat):'--' }}
<el-popover popper-class="amount-detail-popover" placement="bottom"
width="242" trigger="click" :open-delay="200">
<div class="amount-detail" v-loading="orderLoading"
v-if="Object.keys(orderInfo).length">
<h5 class="title">
金额详情
</h5>
<div class="middle">
<p class="amount-line">
<span>吊牌价总额：</span>¥{{ orderInfo.totalAmount|fomatFloat }}
</p>
<p class="amount-line">
<span>订单应收：</span>¥{{ orderInfo.paidAmount|fomatFloat }}
</p>
<p class="amount-line">
<span>订单实付：</span>¥{{ orderInfo.actualAmount|fomatFloat }}
</p>
</div>
<div class="bottom">
<p class="amount-line">
支付方式：
</p>
<div class="right">
<p v-for="pay in payInfo" :key="pay">
<span>{{ pay.name }}</span>¥{{ pay.value|fomatFloat }}
width="242" trigger="hover" :open-delay="200" @show="getOrderDetail(group.orderId)">
<div class="amount-detail" v-loading="orderLoading">
<template v-if="Object.keys(orderInfo).length">
<h5 class="title">
金额详情
</h5>
<div class="middle">
<p class="amount-line">
<span>吊牌价总额：</span>¥{{ orderInfo.totalAmount|fomatFloat }}
</p>
<p class="amount-line">
<span>订单应收：</span>¥{{ orderInfo.paidAmount|fomatFloat }}
</p>
<p class="amount-line">
<span>订单实付：</span>¥{{ orderInfo.actualAmount|fomatFloat }}
</p>
</div>
<div class="bottom">
<p class="amount-line">
支付方式：
</p>
<div class="right">
<p v-for="pay in payInfo" :key="pay">
<span>{{ pay.name }}</span>¥{{ pay.value|fomatFloat }}
</p>
</div>
</div>
</template>
<div v-else style="text-align:center">
暂无数据
</div>
</div>
<div v-else style="text-align:center">
暂无数据
</div>
<span slot="reference" class="icon-span" title="查看金额详情"
@click="getOrderDetail(group.orderId)"><i
<span slot="reference" class="icon-span" title="查看金额详情"><i
class="iconfont icon-zhangdan" /></span>
</el-popover>
</div>
......@@ -127,7 +127,7 @@
</el-image>
<div class="info-detail">
<p class="good-name">
<span class="name">{{ row.productName }}</span>
<span class="name">{{ row.productName }}</span>
<el-tag type="warning" v-if="[2,3].includes(row.productType)">
{{ row.productType===2?'赠品':'换购'}}
</el-tag>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment