From f4c1d1e7d6302f0f10895a7df4be1d8db991fb4b Mon Sep 17 00:00:00 2001
From: mayf <m13160102112@163.com>
Date: 星期一, 23 九月 2024 11:14:17 +0800
Subject: [PATCH] 订单详情字段增加
---
pages/order/list/_id.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index 5a1cb0c..2307275 100644
--- a/pages/order/list/_id.vue
+++ b/pages/order/list/_id.vue
@@ -73,9 +73,19 @@
min-width="100"
></el-table-column>
<el-table-column
+ label="券后总金额(元)"
+ prop="realTotal"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
label="券后单价(元)"
prop="realPrice"
min-width="100"
+ ></el-table-column>
+ <el-table-column
+ label="优惠总金额(元)"
+ prop="couponAmountTotal"
+ min-width="120"
></el-table-column>
<el-table-column
label="供应商"
@@ -113,8 +123,23 @@
min-width="120"
></el-table-column>
<el-table-column
- label="质检扣款(元)"
+ label="质检退款(元)"
prop="deductAmount"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="补货扣款(元)"
+ prop="replaceFee"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="降级扣款(元)"
+ prop="checkFee"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="缺货扣款(元)"
+ prop="lackFeeSupplier"
min-width="120"
></el-table-column>
<el-table-column label="质检审核" width="220" fixed="right">
@@ -158,6 +183,23 @@
</template>
</el-table-column>
</el-table>
+ <template v-if="detail.pointGoodsList && detail.pointGoodsList.length > 0">
+ <div class="base-page-wrapper__line"></div>
+ <el-bus-title title="积分兑换商品" size="small" />
+ <el-table :data="detail.pointGoodsList">
+ <el-table-column label="商品图片">
+ <template #default="{ row }">
+ <el-bus-image
+ :src="row.cover"
+ lazy
+ style="width: 50px; height: 50px"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="商品名称" prop="name"></el-table-column>
+ <el-table-column label="兑换数量" prop="num"></el-table-column>
+ </el-table>
+ </template>
<template v-if="afterSaleList && afterSaleList.length > 0">
<div class="base-page-wrapper__line"></div>
<el-bus-title title="售后信息" size="small" class="mt-20"></el-bus-title>
@@ -349,7 +391,8 @@
{ label: '商品金额：', id: 'flowerAmountDesc', type: 'input' },
{ label: '打包费：', id: 'packingFee', type: 'input' },
{ label: '运费：', id: 'transportFee', type: 'input' },
- { label: '订单金额：', id: 'totalAmountDesc', type: 'input' },
+ { label: '订单金额：', id: 'originalPrice', type: 'input' },
+ { label: '实际支付金额：', id: 'totalAmountDesc', type: 'input' },
{ label: '订单状态：', id: 'statusBackendStr', type: 'input' },
{ label: '合伙人：', id: 'partnerName', type: 'input' },
{ label: '库区：', id: 'warehouseName', type: 'input' },
@@ -405,7 +448,7 @@
id: 'memberDiscountAmount',
type: 'input',
unit: '元/扎',
- hidden: (row) => row.memberDiscountType !== 'ratio',
+ hidden: (row) => row.memberDiscountType !== 'amount',
},
],
},
@@ -559,6 +602,13 @@
if (data.memberCouponAmount) {
data.totalAmountDesc += `（其中使用了${data.memberCouponAmount}元优惠券）`
}
+ data.originalPrice = Number(
+ (
+ (data.flowerAmount || 0) +
+ (data.packingFee || 0) +
+ (data.transportFee || 0)
+ ).toFixed(2)
+ )
this.detail = data
this.$nextTick(() => {
if (this.$refs.discountForm) {
--
Gitblit v1.9.3