订单取消状态改为已关闭、订单货物展示退款数量

This commit is contained in:
15386982806
2024-01-05 10:08:37 +08:00
parent 4565297fe6
commit 21ae217369
9 changed files with 34 additions and 13 deletions

View File

@@ -16,7 +16,7 @@
<!-- <Option value="TAKE">待核验</Option>-->
<!-- <Option value="COMPLETE">已完成</Option>-->
<!-- <Option value="WAIT_PINTUAN">待成团</Option>-->
<!-- <Option value="CANCELLED">取消</Option>-->
<!-- <Option value="CANCELLED">关闭</Option>-->
<!-- </Select>-->
<!-- </Form-item>-->
<Form-item label="下单时间">
@@ -127,7 +127,7 @@ export default {
} else if (params.row.orderStatus == "TAKE") {
return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
} else if (params.row.orderStatus == "CANCELLED") {
return h("div", [h("tag", { props: { color: "red" } }, "已取消")]);
return h("div", [h("tag", { props: { color: "red" } }, "已关闭")]);
}
}
},
@@ -191,7 +191,7 @@ export default {
{title: '已付款', value: 'PAID'},
{title: '待核验', value: 'TAKE'},
{title: '已完成', value: 'COMPLETED'},
{title: '已取消', value: 'CANCELLED'},
{title: '已关闭', value: 'CANCELLED'},
],
currentStatus: ''
};

View File

@@ -596,6 +596,11 @@ export default {
key: "num",
minWidth: 80,
},
{
title: "退款数量",
key: "returnGoodsNumber",
minWidth: 80,
},
{
title: "小计",
key: "subTotal",

View File

@@ -66,7 +66,7 @@
<!-- <Option value="DELIVERED">已发货</Option>-->
<!-- <Option value="COMPLETED">已完成</Option>-->
<!-- <Option value="TAKE">待核验</Option>-->
<!-- <Option value="CANCELLED">取消</Option>-->
<!-- <Option value="CANCELLED">关闭</Option>-->
<!-- <Option value="STAY_PICKED_UP">待自提</Option>-->
<!-- </Select>-->
<!-- </Form-item>-->
@@ -289,7 +289,7 @@ export default {
]);
} else if (params.row.orderStatus == "CANCELLED") {
return h("div", [
h("tag", { props: { color: "red" } }, "已取消"),
h("tag", { props: { color: "red" } }, "已关闭"),
]);
}
},
@@ -332,7 +332,7 @@ export default {
{title: '待核验', value: 'TAKE'},
{title: '待自提', value: 'STAY_PICKED_UP'},
{title: '已完成', value: 'COMPLETED'},
{title: '已取消', value: 'CANCELLED'},
{title: '已关闭', value: 'CANCELLED'},
],
currentStatus: ''