From bf6b7af0fb6c230eb15dd09ceda3a04abf958141 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:22 +0800
Subject: [PATCH] add:发货
---
pages/order/list/_id.vue | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index 5a1cb0c..d19da68 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>
@@ -319,11 +361,26 @@
span: 24,
readonly: true,
},
+ {
+ label: '提交时间：',
+ id: 'checkTime',
+ type: 'input',
+ span: 24,
+ readonly: true,
+ },
]
const dialogAuditForm = [
{
label: '审核结果：',
id: 'auditStatusStr',
+ type: 'input',
+ hidden: (row) => !row.auditStatusStr,
+ span: 24,
+ readonly: true,
+ },
+ {
+ label: '审核时间：',
+ id: 'auditTime',
type: 'input',
hidden: (row) => !row.auditStatusStr,
span: 24,
@@ -349,11 +406,14 @@
{ 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' },
{ label: '库位：', id: 'warehouseLocationCode', type: 'input' },
+ { label: '特殊需求：', id: 'specialNeedsStr', type: 'input' },
+ { label: '快递号：', id: 'deliveryNo', type: 'input' },
{
label: '备注：',
id: 'remarks',
@@ -368,6 +428,18 @@
{
type: 'row',
items: [
+ {
+ label: '优惠券类型：',
+ id: 'couponDiscountTypeName',
+ type: 'input',
+ hidden: (row) => !row.memberCouponAmount,
+ },
+ {
+ label: '使用条件：',
+ id: 'minOrderAmount',
+ type: 'input',
+ hidden: (row) => !row.memberCouponAmount,
+ },
{
label: '优惠券名称：',
id: 'memberCouponName',
@@ -405,7 +477,7 @@
id: 'memberDiscountAmount',
type: 'input',
unit: '元/扎',
- hidden: (row) => row.memberDiscountType !== 'ratio',
+ hidden: (row) => row.memberDiscountType !== 'amount',
},
],
},
@@ -559,6 +631,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