|
|
@ -73,6 +73,18 @@ |
|
|
|
>发货</a-button |
|
|
|
>发货</a-button |
|
|
|
> |
|
|
|
> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="action-item" v-if="$auth('/order/list/all.deliver')"> |
|
|
|
|
|
|
|
<a-button |
|
|
|
|
|
|
|
v-if=" |
|
|
|
|
|
|
|
record.pay_status == PayStatusEnum.SUCCESS.value && |
|
|
|
|
|
|
|
inArray(record.delivery_type, [DeliveryTypeEnum.EXPRESS.value, DeliveryTypeEnum.NOTHING.value]) && |
|
|
|
|
|
|
|
record.delivery_status != DeliveryStatusEnum.DELIVERED.value && |
|
|
|
|
|
|
|
!inArray(record.order_status, [OrderStatusEnum.CANCELLED.value, OrderStatusEnum.APPLY_CANCEL.value]) |
|
|
|
|
|
|
|
" |
|
|
|
|
|
|
|
@click="handleForcecancel" |
|
|
|
|
|
|
|
>强制取消</a-button |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
</div> |
|
|
|
<div class="action-item" v-if="$auth('/order/list/all.extract')"> |
|
|
|
<div class="action-item" v-if="$auth('/order/list/all.extract')"> |
|
|
|
<a-button |
|
|
|
<a-button |
|
|
|
v-if=" |
|
|
|
v-if=" |
|
|
@ -285,7 +297,11 @@ |
|
|
|
</a-tooltip> |
|
|
|
</a-tooltip> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="action-item" style="width: 33.33%" v-if="record.delivery_status==DeliveryStatusEnum.DELIVERED.value &&item.delivery_method==10"> |
|
|
|
<div |
|
|
|
|
|
|
|
class="action-item" |
|
|
|
|
|
|
|
style="width: 33.33%" |
|
|
|
|
|
|
|
v-if="record.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.delivery_method == 10" |
|
|
|
|
|
|
|
> |
|
|
|
<a-button type="primary" @click="onClickEditDelivery(item)">修改物流信息</a-button> |
|
|
|
<a-button type="primary" @click="onClickEditDelivery(item)">修改物流信息</a-button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
@ -566,7 +582,21 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
return ColorEnum[orderStatus] |
|
|
|
return ColorEnum[orderStatus] |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
handleForcecancel() { |
|
|
|
|
|
|
|
const { orderId } = this |
|
|
|
|
|
|
|
this.isLoading = true |
|
|
|
|
|
|
|
Api.forceCancel({ orderId }) |
|
|
|
|
|
|
|
.then((result) => { |
|
|
|
|
|
|
|
if (result.status == 200) { |
|
|
|
|
|
|
|
this.$message.success('强制取消成功', 1.5) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.$message.fail('强制取消失败', 1.5) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 初始化数据 |
|
|
|
|
|
|
|
// this.initData() |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
.finally(() => (this.isLoading = false)) |
|
|
|
|
|
|
|
}, |
|
|
|
// 订单发货 |
|
|
|
// 订单发货 |
|
|
|
handleDelivery() { |
|
|
|
handleDelivery() { |
|
|
|
const { record } = this |
|
|
|
const { record } = this |
|
|
|