zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

核销自提订单

master
chc 2023-02-02 17:06:32 +08:00
parent 5a93abb946
commit 4780ae5b18
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
seller/src/views/order/order/orderDetail.vue
View File

@ -117,7 +117,7 @@
</template> </template>
</Col> </Col>
<Col span="12"> <Col span="12">
<div class="div-item"> <div class="div-item" v-if="orderInfo.order.deliveryMethod != 'SELF_PICK_UP'">
<div class="div-item-left">收货信息：</div> <div class="div-item-left">收货信息：</div>
<div class="div-item-right"> <div class="div-item-right">
{{ orderInfo.order.consigneeName }} {{ orderInfo.order.consigneeName }}
@ -126,6 +126,13 @@
{{ orderInfo.order.consigneeDetail }} {{ orderInfo.order.consigneeDetail }}
</div> </div>
</div> </div>
<div class="div-item" v-if="orderInfo.order.deliveryMethod == 'SELF_PICK_UP'">
<div class="div-item-left">自提信息：</div>
<div class="div-item-right">
{{ orderInfo.order.storeAddressPath }}
{{ orderInfo.order.storeAddressMobile }}
</div>
</div>
<div class="div-item"> <div class="div-item">
<div class="div-item-left">支付方式：</div> <div class="div-item-left">支付方式：</div>
<div class="div-item-right"> <div class="div-item-right">

5
seller/src/views/order/order/orderList.vue
View File

@ -39,6 +39,7 @@
<Option value="DELIVERED">已发货</Option> <Option value="DELIVERED">已发货</Option>
<Option value="COMPLETED">已完成</Option> <Option value="COMPLETED">已完成</Option>
<Option value="CANCELLED">已取消</Option> <Option value="CANCELLED">已取消</Option>
<Option value="STAY_PICKED_UP">待自提</Option>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="订单类型" prop="orderType"> <Form-item label="订单类型" prop="orderType">
@ -225,6 +226,10 @@ export default {
return h("div", [ return h("div", [
h("tag", { props: { color: "geekblue" } }, "待发货"), h("tag", { props: { color: "geekblue" } }, "待发货"),
]); ]);
}else if (params.row.orderStatus == "STAY_PICKED_UP") {
return h("div", [
h("tag", { props: { color: "geekblue" } }, "待自提"),
]);
} else if (params.row.orderStatus == "DELIVERED") { } else if (params.row.orderStatus == "DELIVERED") {
return h("div", [ return h("div", [
h("tag", { props: { color: "cyan" } }, "已发货"), h("tag", { props: { color: "cyan" } }, "已发货"),