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/index.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index 6c37c1e..e370220 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',
@@ -153,6 +154,7 @@
type: 'input',
el: { placeholder: '收货人姓名/手机号' },
},
+ { label: '收货地址：', id: 'address', type: 'input' },
],
},
],
@@ -175,7 +177,7 @@
}
const ids = selected.map((i) => i.id)
const { code, data } = await this.$elBusHttp.request(
- 'flower/api/order/check/list',
+ 'flower/api/order/check/location/list',
{
method: 'post',
data: {
@@ -198,7 +200,7 @@
for (const tr of trs) {
const tds = tr.querySelectorAll('td')
if (tds && tds.length > 0) {
- tds[0].colSpan = 7
+ tds[0].colSpan = 8
tds[0].style.textAlign = 'center'
}
}
--
Gitblit v1.9.3