From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/order/list/_id.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index dcac6cf..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="供应商"
@@ -351,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,
@@ -381,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',
@@ -400,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',
@@ -437,7 +477,7 @@
id: 'memberDiscountAmount',
type: 'input',
unit: '元/扎',
- hidden: (row) => row.memberDiscountType !== 'ratio',
+ hidden: (row) => row.memberDiscountType !== 'amount',
},
],
},
@@ -591,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