From 820c1c23027dfe95a02d93d6a1611f8ef7f6d6c9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 16:45:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/order/list/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index f346589..bc7e38b 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -27,7 +27,6 @@
import { dateRangeOptions } from '@/utils/options'
import CustomDateRange from '@/components/custom-date-range.vue'
import PrintList from '@/components/order/print-list'
-// import GoodsTableItemList from '@/components/order/goods-table-item-list.vue'
export default {
components: {
PrintList,
@@ -74,16 +73,18 @@
}${row.customerAddress || ''}`,
minWidth: 250,
},
- // {
- // label: '商品信息',
- // formatter: (row) => <GoodsTableItemList items={row.items} />,
- // minWidth: 250,
- // },
{ label: '订单金额(元)', prop: 'totalAmount', minWidth: 150 },
{ label: '底价(元)', prop: 'supplierAmount', minWidth: 150 },
{ label: '订单状态', prop: 'statusBackendStr', minWidth: 120 },
{ label: '下单时间', prop: 'createTime', minWidth: 180 },
{ label: '合伙人', prop: 'partnerName', minWidth: 120 },
+ {
+ label: '备注',
+ formatter: (row) => (
+ <simple-text value={row.remarks} type="primary"></simple-text>
+ ),
+ minWidth: 200,
+ },
],
searchFormAttrs: {
labelWidth: 'auto',
--
Gitblit v1.9.3