diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue index 058d6620..7e6fe9ab 100644 --- a/manager/src/views/distribution/distributionOrder.vue +++ b/manager/src/views/distribution/distributionOrder.vue @@ -102,19 +102,7 @@ slot: 'goodsMsg', minWidth: 150 }, - { - title: "退款金额", - key: "returnMoney", - minWidth:80, - sortable: false, - render: (h, params) => { - if(params.row.sellBackRebate == null){ - return h("div", this.$options.filters.unitPrice(0, '¥')); - }else{ - return h("div", this.$options.filters.unitPrice(params.row.sellBackRebate, '¥')); - } - } - }, + { title: "分销商", key: "distributionName", @@ -134,7 +122,7 @@ }, { title: "佣金金额", - key: "rebateGrade", + key: "rebate", minWidth:80, sortable: false, render: (h, params) => { @@ -237,11 +225,11 @@ }, filterStatusColor (status) { // 状态tag标签颜色 const arr = [ - {status: 'WAIT_BILL', color: 'magenta'}, - {status: 'WAIT_CASH', color: 'warning'}, - {status: 'COMPLETE_CASH', color: 'success'}, - {status: 'CANCEL', color: 'default'}, - {status: 'REFUND', color: 'error'}, + {status: 'WAIT_BILL', color: 'blue'}, + {status: 'WAIT_CASH', color: 'orange'}, + {status: 'COMPLETE_CASH', color: 'green'}, + {status: 'CANCEL', color: 'red'}, + {status: 'REFUND', color: 'magenta'}, ] for (let i=0;i { - if (params.row.orderPrice == null) { - return h("div", this.$options.filters.unitPrice(0, "¥")); - } else { - return h( - "div", - this.$options.filters.unitPrice(params.row.orderPrice, "¥") - ); - } - }, - }, - { - title: "退款金额", - key: "returnMoney", - width: 130, - sortable: false, - render: (h, params) => { - if (params.row.orderPrice == null) { - return h("div", this.$options.filters.unitPrice(0, "¥")); - } else { - return h( - "div", - this.$options.filters.unitPrice(params.row.returnMoney, "¥") - ); - } - }, - }, + { title: "商品名称", key: "goodsName", @@ -94,27 +63,32 @@ export default { sortable: false, render: (h, params) => { if (params.row.distributionOrderStatus == "COMPLETE_CASH") { - return h("div", "提现完成"); + return h("Tag", { props: { color: "green" } },"提现完成"); } else if (params.row.distributionOrderStatus == "WAIT_BILL") { - return h("div", "待结算"); + return h("Tag", { props: { color: "blue" } } ,"待结算"); } else if (params.row.distributionOrderStatus == "WAIT_CASH") { - return h("div", "待提现"); + return h("Tag", { props: { color: "orange" } }, "待提现"); + } else if (params.row.distributionOrderStatus == "CANCEL") { + return h("Tag", { props: { color: "red" } }, "订单已取消"); + }else if (params.row.distributionOrderStatus == "REFUND") { + return h("Tag", { props: { color: "magenta" } }, "退款"); } + }, }, { title: "佣金金额", - key: "rebateGrade", + key: "rebate", width: 120, sortable: false, render: (h, params) => { - if (params.row.rebateGrade == null) { + if (params.row.rebate == null) { return h("div", this.$options.filters.unitPrice(0, "¥")); } else { return h( "div", - this.$options.filters.unitPrice(params.row.rebateGrade, "¥") + this.$options.filters.unitPrice(params.row.rebate, "¥") ); } },