From f143d2a63e00e43b461914a0660e4a91dd50a1db Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 09 十月 2024 19:56:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/order/list/index.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index 01e2980..706be30 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -86,6 +86,7 @@
{ label: '底价(元)', prop: 'supplierAmount', minWidth: 150 },
{ label: '订单状态', prop: 'statusBackendStr', minWidth: 120 },
{ label: '下单时间', prop: 'createTime', minWidth: 180 },
+ { label: '支付时间', prop: 'paymentTime', minWidth: 180 },
{ label: '合伙人', prop: 'partnerName', minWidth: 120 },
{ label: '库位', prop: 'warehouseLocationCode', minWidth: 120 },
{ label: '特殊需求', prop: 'specialNeedsStr', minWidth: 120 },
@@ -181,7 +182,11 @@
component: 'el-bus-select-area',
span: 24,
commonFormat: true,
- commonFormatProps: ['customerProvince', 'customerCity', 'customerRegion'],
+ commonFormatProps: [
+ 'customerProvince',
+ 'customerCity',
+ 'customerRegion',
+ ],
str: true,
strKey: 'districtStr',
rules: { required: true, message: '请选择地区' },
@@ -358,7 +363,9 @@
},
methods: {
getDistrict(row) {
- return `${row.customerProvince || ''}${row.customerCity || ''}${row.customerRegion || ''}`
+ return `${row.customerProvince || ''}${row.customerCity || ''}${
+ row.customerRegion || ''
+ }`
},
},
}
--
Gitblit v1.9.3