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 |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index dcac6cf..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="供应商"
@@ -381,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' },
@@ -437,7 +448,7 @@
               id: 'memberDiscountAmount',
               type: 'input',
               unit: '元/扎',
-              hidden: (row) => row.memberDiscountType !== 'ratio',
+              hidden: (row) => row.memberDiscountType !== 'amount',
             },
           ],
         },
@@ -591,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