|
|
@@ -91,7 +91,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column type="index" min-width="80" />
|
|
|
- <el-table-column label="订单号" prop="number" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column label="订单号" prop="number" min-width="180" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column label="支付金额" min-width="160" prop="amount">
|
|
|
<template #default="{ row }">
|
|
|
<div>
|
|
|
@@ -100,23 +100,15 @@
|
|
|
实付金额:￥{{row.payAmount || row.amount}}
|
|
|
</div>
|
|
|
<div v-if="row.ticketNo" class="refund-info">
|
|
|
- <div style="font-size: 12px;">抵扣券券号:{{ row.ticketNo }}</div>
|
|
|
- <div style="font-size: 12px;">抵扣券金额:￥{{ row.ticketAmount }}</div>
|
|
|
+ <div style="font-size: 12px;">抵扣券号:{{ row.ticketNo }}</div>
|
|
|
+ <div style="font-size: 12px;">抵扣金额:￥{{ row.ticketAmount }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="桌号" prop="deskName"></el-table-column>
|
|
|
- <el-table-column label="备注" prop="remark" min-width="150" show-tooltip-when-overflow>
|
|
|
- <!-- <template #default="{ row }">
|
|
|
- <div class="remark-text">
|
|
|
- {{row.remark}}
|
|
|
- </div>
|
|
|
- </template> -->
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="类型" prop="type"
|
|
|
- :formatter="(row: any) => (row.type == 0 ? '后台点单' : '扫码点单')"></el-table-column>
|
|
|
- <el-table-column label="状态" min-width="160" prop="status" >
|
|
|
+ <el-table-column label="备注" prop="remark" min-width="100" show-tooltip-when-overflow></el-table-column>
|
|
|
+ <el-table-column label="状态" min-width="170" prop="status" >
|
|
|
<template #default="{ row }">
|
|
|
<div>
|
|
|
{{ row.status == 4 ? '退款成功' : row.status == 2 ? '已完成' : row.status == 0 ? '待下单'
|
|
|
@@ -128,11 +120,12 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="类型" prop="type" :formatter="(row: any) => (row.type == 0 ? '后台点单' : '扫码点单')"></el-table-column>
|
|
|
<el-table-column label="结账时间" prop="checkoutTime"></el-table-column>
|
|
|
<el-table-column label="创建时间" prop="createTime"></el-table-column>
|
|
|
- <el-table-column label="操作" width="200" fixed="right">
|
|
|
+ <el-table-column label="操作" width="60" fixed="right">
|
|
|
<template #default="{ row }">
|
|
|
- <el-button type="primary" link @click="showDetail(row)">查看已点菜品</el-button>
|
|
|
+<!-- <el-button type="primary" link @click="showDetail(row)">查看已点菜品</el-button>-->
|
|
|
<el-button v-if="row.status=='2' && !row.refundAmount" type="danger" link @click="refund(row)">退款</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -280,7 +273,7 @@
|
|
|
// 展开当前行
|
|
|
expandRowKeys.value = [row.id]
|
|
|
} else {
|
|
|
- feedback.msgError('获取订单详情失败111')
|
|
|
+ feedback.msgError('获取订单详情失败')
|
|
|
}
|
|
|
} catch (error) {
|
|
|
console.error('获取订单详情失败:', error)
|
