From 10e8e82fe483268a698b4a0d1aeee91643bfc7d8 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 18 Sep 2024 15:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=8F=91?=
=?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
buyer/src/pages/home/enumeration.js | 4 ++++
manager/src/views/order/order/orderList.vue | 5 +++++
seller/src/views/order/order/orderList.vue | 7 ++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/buyer/src/pages/home/enumeration.js b/buyer/src/pages/home/enumeration.js
index 60caf556..f6191807 100644
--- a/buyer/src/pages/home/enumeration.js
+++ b/buyer/src/pages/home/enumeration.js
@@ -17,6 +17,10 @@ export const orderStatusList = [
name: '待发货',
status: 'UNDELIVERED'
},
+ {
+ name: '部分发货',
+ status: 'PARTS_DELIVERED'
+ },
{
name: '已发货',
status: 'DELIVERED'
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 0b8c503b..52ab75c4 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -267,6 +267,10 @@ export default {
return h("div", [
h("tag", { props: { color: "geekblue" } }, "待自提"),
]);
+ } else if (params.row.orderStatus == "PARTS_DELIVERED") {
+ return h("div", [
+ h("tag", { props: { color: "cyan" } }, "部分发货"),
+ ]);
} else if (params.row.orderStatus == "DELIVERED") {
return h("div", [
h("tag", { props: { color: "cyan" } }, "已发货"),
@@ -320,6 +324,7 @@ export default {
{title: '未付款', value: 'UNPAID'},
{title: '已付款', value: 'PAID'},
{title: '待发货', value: 'UNDELIVERED'},
+ {title: '部分发货', value: 'PARTS_DELIVERED'},
{title: '已发货', value: 'DELIVERED'},
{title: '待核验', value: 'TAKE'},
{title: '待自提', value: 'STAY_PICKED_UP'},
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 146ef7a7..29547ca8 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -36,6 +36,7 @@
+
@@ -233,10 +234,14 @@ export default {
return h("div", [
h("tag", { props: { color: "geekblue" } }, "待发货"),
]);
- }else if (params.row.orderStatus == "STAY_PICKED_UP") {
+ } else if (params.row.orderStatus == "STAY_PICKED_UP") {
return h("div", [
h("tag", { props: { color: "geekblue" } }, "待自提"),
]);
+ } else if (params.row.orderStatus == "PARTS_DELIVERED") {
+ return h("div", [
+ h("tag", { props: { color: "cyan" } }, "部分发货"),
+ ]);
} else if (params.row.orderStatus == "DELIVERED") {
return h("div", [
h("tag", { props: { color: "cyan" } }, "已发货"),