From 2bc7d6bb5cfd9ed2034f2f616366d69e226c4d5d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 14 九月 2024 15:51:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/order/list/_id.vue | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index 87dd692..dcac6cf 100644
--- a/pages/order/list/_id.vue
+++ b/pages/order/list/_id.vue
@@ -113,8 +113,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 +173,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>
@@ -354,6 +386,13 @@
{ label: '合伙人：', id: 'partnerName', type: 'input' },
{ label: '库区：', id: 'warehouseName', type: 'input' },
{ label: '库位：', id: 'warehouseLocationCode', type: 'input' },
+ {
+ label: '备注：',
+ id: 'remarks',
+ type: 'input',
+ el: { type: 'textarea' },
+ span: 24,
+ },
],
},
],
--
Gitblit v1.9.3