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" } }, "已发货"),