|
@@ -51,11 +51,11 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
<template #orderStatus="{ record }">
|
|
<template #orderStatus="{ record }">
|
|
{{ renderOrderStatusLabel(record.orderStatus) }}
|
|
{{ renderOrderStatusLabel(record.orderStatus) }}
|
|
</template>
|
|
</template>
|
|
- <template #shipingStatus="{ record }">
|
|
|
|
- {{ renderShipingStatusLabel(record.shipingStatus) }}
|
|
|
|
|
|
+ <template #shippingStatus="{ record }">
|
|
|
|
+ {{ rendershippingStatusLabel(record.shippingStatus) }}
|
|
</template>
|
|
</template>
|
|
- <template #paymentStatus="{ record }">
|
|
|
|
- {{ renderPaymentStatusLabel(record.paymentStatus) }}
|
|
|
|
|
|
+ <template #payStatus="{ record }">
|
|
|
|
+ {{ renderpayStatusLabel(record.payStatus) }}
|
|
</template>
|
|
</template>
|
|
<template #addTime="{ record }">
|
|
<template #addTime="{ record }">
|
|
<Time :value="record.addTime" mode="datetime" />
|
|
<Time :value="record.addTime" mode="datetime" />
|
|
@@ -67,7 +67,7 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
icon: 'mdi:information-outline',
|
|
icon: 'mdi:information-outline',
|
|
label: '详情',
|
|
label: '详情',
|
|
onClick: () => {
|
|
onClick: () => {
|
|
- go(`/order/list/detail/${record.orderNo}`);
|
|
|
|
|
|
+ go(`/order/list/detail/${record.orderSn}`);
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -130,7 +130,7 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: 'VR场景',
|
|
title: 'VR场景',
|
|
- dataIndex: 'scene.name',
|
|
|
|
|
|
+ dataIndex: 'brandName',
|
|
width: 80,
|
|
width: 80,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -149,15 +149,15 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '发货状态',
|
|
title: '发货状态',
|
|
- dataIndex: 'shipingStatus',
|
|
|
|
|
|
+ dataIndex: 'shippingStatus',
|
|
sorter: true,
|
|
sorter: true,
|
|
- slots: { customRender: 'shipingStatus' },
|
|
|
|
|
|
+ slots: { customRender: 'shippingStatus' },
|
|
width: 80,
|
|
width: 80,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '付款状态',
|
|
title: '付款状态',
|
|
- dataIndex: 'paymentStatus',
|
|
|
|
- slots: { customRender: 'paymentStatus' },
|
|
|
|
|
|
+ dataIndex: 'payStatus',
|
|
|
|
+ slots: { customRender: 'payStatus' },
|
|
width: 60,
|
|
width: 60,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -167,7 +167,7 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '快递单号',
|
|
title: '快递单号',
|
|
- dataIndex: 'shipingNo',
|
|
|
|
|
|
+ dataIndex: 'shippingNo',
|
|
width: 80,
|
|
width: 80,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -238,20 +238,22 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
function renderOrderStatusLabel(type: number): string {
|
|
function renderOrderStatusLabel(type: number): string {
|
|
switch (type) {
|
|
switch (type) {
|
|
case 0:
|
|
case 0:
|
|
- return '已取消';
|
|
|
|
- case 1:
|
|
|
|
return '待付款';
|
|
return '待付款';
|
|
- case 2:
|
|
|
|
|
|
+ case 101:
|
|
|
|
+ return '已取消';
|
|
|
|
+ case 201:
|
|
return '已付款';
|
|
return '已付款';
|
|
- case 3:
|
|
|
|
|
|
+ case 1:
|
|
return '已发货';
|
|
return '已发货';
|
|
- case 4:
|
|
|
|
|
|
+ case 2:
|
|
return '已收货';
|
|
return '已收货';
|
|
|
|
+ case 501:
|
|
|
|
+ return '完成';
|
|
default:
|
|
default:
|
|
return '';
|
|
return '';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- function renderShipingStatusLabel(type: number): string {
|
|
|
|
|
|
+ function rendershippingStatusLabel(type: number): string {
|
|
switch (type) {
|
|
switch (type) {
|
|
case 0:
|
|
case 0:
|
|
return '未发货';
|
|
return '未发货';
|
|
@@ -261,7 +263,7 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
return '';
|
|
return '';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- function renderPaymentStatusLabel(type: number): string {
|
|
|
|
|
|
+ function renderpayStatusLabel(type: number): string {
|
|
switch (type) {
|
|
switch (type) {
|
|
case 0:
|
|
case 0:
|
|
return '未付款';
|
|
return '未付款';
|
|
@@ -279,8 +281,8 @@ userName: "微信用户q0zj95zuo4pv" -->
|
|
go,
|
|
go,
|
|
renderOrderTypeLabel,
|
|
renderOrderTypeLabel,
|
|
renderOrderStatusLabel,
|
|
renderOrderStatusLabel,
|
|
- renderShipingStatusLabel,
|
|
|
|
- renderPaymentStatusLabel,
|
|
|
|
|
|
+ rendershippingStatusLabel,
|
|
|
|
+ renderpayStatusLabel,
|
|
uploadApi: uploadApi as any,
|
|
uploadApi: uploadApi as any,
|
|
};
|
|
};
|
|
},
|
|
},
|