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/components/lili-dialog/template/marketing.vue b/manager/src/components/lili-dialog/template/marketing.vue index 4585087d..be39d636 100644 --- a/manager/src/components/lili-dialog/template/marketing.vue +++ b/manager/src/components/lili-dialog/template/marketing.vue @@ -339,15 +339,15 @@ export default { this.sortGoods("SECKILL"); }, }; - case "COUPON": - return { - title: "优惠券", - methodsed: () => { - this.showPromotionList = []; - this.activeColumns = this.pintuanColumns; - this.sortGoods("COUPON"); - }, - }; + // case "COUPON": + // return { + // title: "优惠券", + // methodsed: () => { + // this.showPromotionList = []; + // this.activeColumns = this.pintuanColumns; + // this.sortGoods("COUPON"); + // }, + // }; case "POINTS_GOODS": return { title: "积分商品", @@ -383,6 +383,8 @@ export default { getPromotion(res) { if (res.result) { this.promotionList = res.result; + // 去除优惠券 + delete this.promotionList.COUPON; Object.keys(res.result)[0] && this.typeOption(Object.keys(res.result)[0]).methodsed(); } 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/manager/src/views/page-decoration/modelForm.vue b/manager/src/views/page-decoration/modelForm.vue index 713852ce..e832a094 100644 --- a/manager/src/views/page-decoration/modelForm.vue +++ b/manager/src/views/page-decoration/modelForm.vue @@ -134,7 +134,7 @@