优化
This commit is contained in:
@@ -93,13 +93,8 @@
|
|||||||
<div>
|
<div>
|
||||||
实收金额:
|
实收金额:
|
||||||
<span style="color: red">¥{{ detail.payAmount }}</span>
|
<span style="color: red">¥{{ detail.payAmount }}</span>
|
||||||
<el-button
|
<el-button v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount" size="small"
|
||||||
v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount"
|
type="danger" class="u-m-l-10" @click="tuikuan()">
|
||||||
size="small"
|
|
||||||
type="danger"
|
|
||||||
class="u-m-l-10"
|
|
||||||
@click="tuikuan()"
|
|
||||||
>
|
|
||||||
<span>退款</span>
|
<span>退款</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -130,35 +125,22 @@
|
|||||||
<div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
|
<div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
|
||||||
<template v-for="(item, index) in detail.detailMap" :key="index">
|
<template v-for="(item, index) in detail.detailMap" :key="index">
|
||||||
<h4>第{{ index }}次下单</h4>
|
<h4>第{{ index }}次下单</h4>
|
||||||
<el-table
|
<el-table :data="item" :ref="'refTable' + index" @select-all="tableSelectAll($event, index)">
|
||||||
:data="item"
|
|
||||||
:ref="'refTable' + index"
|
|
||||||
@select-all="tableSelectAll($event, index)"
|
|
||||||
>
|
|
||||||
<!-- <el-table-column type="selection" width="55" /> -->
|
<!-- <el-table-column type="selection" width="55" /> -->
|
||||||
<el-table-column label="数量" type="selection">
|
<el-table-column label="数量" type="selection">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<div v-if="detail.status == 'unpaid'">
|
<div v-if="detail.status == 'unpaid'">
|
||||||
<el-checkbox
|
<el-checkbox v-if="scope.row.num - scope.row.returnNum > 0" v-model="scope.row.checked" />
|
||||||
v-if="scope.row.num - scope.row.returnNum > 0"
|
|
||||||
v-model="scope.row.checked"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<el-checkbox
|
<el-checkbox v-if="scope.row.num - scope.row.refundNum > 0" v-model="scope.row.checked" />
|
||||||
v-if="scope.row.num - scope.row.refundNum > 0"
|
|
||||||
v-model="scope.row.checked"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="商品" width="150">
|
<el-table-column label="商品" width="150">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<div class="shop_info">
|
<div class="shop_info">
|
||||||
<el-image
|
<el-image :src="scope.row.productImg" style="width: 40px; height: 40px"></el-image>
|
||||||
:src="scope.row.productImg"
|
|
||||||
style="width: 40px; height: 40px"
|
|
||||||
></el-image>
|
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<span :class="[scope.row.isVip == 1 ? 'colorStyle' : '']">
|
<span :class="[scope.row.isVip == 1 ? 'colorStyle' : '']">
|
||||||
{{ scope.row.productName }}
|
{{ scope.row.productName }}
|
||||||
@@ -191,32 +173,17 @@
|
|||||||
<el-table-column label="实付">
|
<el-table-column label="实付">
|
||||||
<template v-slot="scope">¥{{ scope.row.payAmount }}</template>
|
<template v-slot="scope">¥{{ scope.row.payAmount }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column v-if="detail.status == 'unpaid'" label="可退菜数量" align="center" width="130px">
|
||||||
v-if="detail.status == 'unpaid'"
|
|
||||||
label="可退菜数量"
|
|
||||||
align="center"
|
|
||||||
width="130px"
|
|
||||||
>
|
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-input-number
|
<el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
|
||||||
v-if="scope.row.checked"
|
:max="scope.row.num - scope.row.returnNum"></el-input-number>
|
||||||
:min="0"
|
|
||||||
style="width: 100px"
|
|
||||||
v-model="scope.row.selNumber"
|
|
||||||
:max="scope.row.num - scope.row.returnNum"
|
|
||||||
></el-input-number>
|
|
||||||
<span class="" v-else>{{ scope.row.num - scope.row.returnNum }}</span>
|
<span class="" v-else>{{ scope.row.num - scope.row.returnNum }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column v-else label="可退款数量" align="center" width="130px">
|
<el-table-column v-else label="可退款数量" align="center" width="130px">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-input-number
|
<el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
|
||||||
v-if="scope.row.checked"
|
:max="scope.row.num - scope.row.refundNum - scope.row.returnNum"></el-input-number>
|
||||||
:min="0"
|
|
||||||
style="width: 100px"
|
|
||||||
v-model="scope.row.selNumber"
|
|
||||||
:max="scope.row.num - scope.row.refundNum - scope.row.returnNum"
|
|
||||||
></el-input-number>
|
|
||||||
<span class="" v-else>
|
<span class="" v-else>
|
||||||
{{ scope.row.num - scope.row.refundNum - scope.row.returnNum }}
|
{{ scope.row.num - scope.row.refundNum - scope.row.returnNum }}
|
||||||
</span>
|
</span>
|
||||||
@@ -231,23 +198,13 @@
|
|||||||
<el-table-column label="操作" fixed="right">
|
<el-table-column label="操作" fixed="right">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<template v-if="detail.status != 'unpaid'">
|
<template v-if="detail.status != 'unpaid'">
|
||||||
<el-button
|
<el-button v-if="canTuikuan(scope.row)" link size="small" @click="tuikuan(scope.row)">
|
||||||
v-if="canTuikuan(scope.row)"
|
|
||||||
link
|
|
||||||
size="small"
|
|
||||||
@click="tuikuan(scope.row)"
|
|
||||||
>
|
|
||||||
<span>退款</span>
|
<span>退款</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
<span class="color-999" v-if="scope.row.status == 'refund'">已退款</span>
|
<span class="color-999" v-if="scope.row.status == 'refund'">已退款</span>
|
||||||
</template>
|
</template>
|
||||||
<template v-if="detail.status == 'unpaid'">
|
<template v-if="detail.status == 'unpaid'">
|
||||||
<el-button
|
<el-button v-if="canTuicai(scope.row)" link size="small" @click="tuicai(scope.row)">
|
||||||
v-if="canTuicai(scope.row)"
|
|
||||||
link
|
|
||||||
size="small"
|
|
||||||
@click="tuicai(scope.row)"
|
|
||||||
>
|
|
||||||
<span>退菜</span>
|
<span>退菜</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
<span class="color-999" v-else>已退菜</span>
|
<span class="color-999" v-else>已退菜</span>
|
||||||
@@ -257,41 +214,25 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</template>
|
</template>
|
||||||
<!-- 退款 -->
|
<!-- 退款 -->
|
||||||
<div
|
<div class="u-p-20 u-flex u-row-right" v-if="
|
||||||
class="u-p-20 u-flex u-row-right"
|
detail.status !== 'refund' &&
|
||||||
v-if="
|
detail.status !== 'unpaid' &&
|
||||||
detail.status !== 'refund' &&
|
detail.status !== 'cancelled'
|
||||||
detail.status !== 'unpaid' &&
|
">
|
||||||
detail.status !== 'cancelled'
|
<el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-checkbox
|
|
||||||
v-model="allSelected"
|
|
||||||
@change="allSelectedChange"
|
|
||||||
label="全选"
|
|
||||||
></el-checkbox>
|
|
||||||
<el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
|
<el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
|
||||||
</div>
|
</div>
|
||||||
<!-- 退菜 -->
|
<!-- 退菜 -->
|
||||||
<div class="u-p-20 u-flex u-row-right" v-if="detail.status == 'unpaid'">
|
<div class="u-p-20 u-flex u-row-right" v-if="detail.status == 'unpaid'">
|
||||||
<el-checkbox
|
<el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
|
||||||
v-model="allSelected"
|
|
||||||
@change="allSelectedChange"
|
|
||||||
label="全选"
|
|
||||||
></el-checkbox>
|
|
||||||
<el-button type="danger" class="u-m-l-20" @click.stop="tuicai('all')">退菜</el-button>
|
<el-button type="danger" class="u-m-l-20" @click.stop="tuicai('all')">退菜</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
<!-- 退款 -->
|
<!-- 退款 -->
|
||||||
<return-money
|
<return-money :modal="false" ref="refReturnMoney" :max="selGoods.num" :goods="selGoods"
|
||||||
:modal="false"
|
@confirm="refReturnMoneyConfirm"></return-money>
|
||||||
ref="refReturnMoney"
|
|
||||||
:max="selGoods.num"
|
|
||||||
:goods="selGoods"
|
|
||||||
@confirm="refReturnMoneyConfirm"
|
|
||||||
></return-money>
|
|
||||||
<!-- 退菜 -->
|
<!-- 退菜 -->
|
||||||
<order-return-cart ref="refReturnCart" @confirm="refReturnCartConfirm"></order-return-cart>
|
<order-return-cart ref="refReturnCart" @confirm="refReturnCartConfirm"></order-return-cart>
|
||||||
</div>
|
</div>
|
||||||
@@ -466,6 +407,12 @@ export default {
|
|||||||
},
|
},
|
||||||
tuikuan(item) {
|
tuikuan(item) {
|
||||||
if (!item) {
|
if (!item) {
|
||||||
|
let arrs = []
|
||||||
|
for (let i in this.detail.detailMap) {
|
||||||
|
this.detail.detailMap[i].map((v) => {
|
||||||
|
arrs.push(v);
|
||||||
|
});
|
||||||
|
}
|
||||||
this.$refs.refReturnMoney.open([], this.detail);
|
this.$refs.refReturnMoney.open([], this.detail);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -484,6 +431,10 @@ export default {
|
|||||||
if (arr.length == 0) {
|
if (arr.length == 0) {
|
||||||
return ElMessage.error("请选择要退款的商品和数量");
|
return ElMessage.error("请选择要退款的商品和数量");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('tuikuan===', arr);
|
||||||
|
return
|
||||||
|
|
||||||
this.$refs.refReturnMoney.open(arr, this.detail);
|
this.$refs.refReturnMoney.open(arr, this.detail);
|
||||||
},
|
},
|
||||||
tuicai(item) {
|
tuicai(item) {
|
||||||
@@ -502,7 +453,7 @@ export default {
|
|||||||
if (arr.length == 0) {
|
if (arr.length == 0) {
|
||||||
return ElMessage.error("请选择要退菜的商品和数量");
|
return ElMessage.error("请选择要退菜的商品和数量");
|
||||||
}
|
}
|
||||||
console.log(arr);
|
console.log('tuicai===', arr);
|
||||||
this.$refs.refReturnCart.open(arr, this.detail);
|
this.$refs.refReturnCart.open(arr, this.detail);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user