|
|
|
@ -275,13 +275,18 @@ |
|
|
|
|
<a-tag color="green">已发货</a-tag> |
|
|
|
|
</a-descriptions-item> |
|
|
|
|
</a-descriptions> |
|
|
|
|
<div class="deliver-goods-list clearfix"> |
|
|
|
|
<div class="goods-item" v-for="(goods, idx) in item.goods" :key="idx"> |
|
|
|
|
<a-tooltip> |
|
|
|
|
<template slot="title">{{ goods.goods_name ? goods.goods_name : '' }}</template> |
|
|
|
|
<img class="goods-img" :src="goods.goods_image ? goods.goods_image : ''" alt="商品图片" /> |
|
|
|
|
<div class="title">共{{ goods.delivery_num }}件</div> |
|
|
|
|
</a-tooltip> |
|
|
|
|
<div style="display: flex; justify-content: space-between"> |
|
|
|
|
<div class="deliver-goods-list clearfix" style="width: 66.66%"> |
|
|
|
|
<div class="goods-item" v-for="(goods, idx) in item.goods" :key="idx"> |
|
|
|
|
<a-tooltip> |
|
|
|
|
<template slot="title">{{ goods.goods_name ? goods.goods_name : '' }}</template> |
|
|
|
|
<img class="goods-img" :src="goods.goods_image ? goods.goods_image : ''" alt="商品图片" /> |
|
|
|
|
<div class="title">共{{ goods.delivery_num }}件</div> |
|
|
|
|
</a-tooltip> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<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> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</a-tab-pane> |
|
|
|
@ -373,6 +378,7 @@ |
|
|
|
|
<RemarkFormEdit ref="RemarkFormEdit" @handleSubmit="handleRefresh" /> |
|
|
|
|
<RemarkFormAdd ref="RemarkFormAdd" @handleSubmit="handleRefresh" /> |
|
|
|
|
<JingDong ref="JingDong" @handleSubmit="handleRefresh" /> |
|
|
|
|
<DeliveryFormEdit ref="DeliveryFormEdit" @handleSubmit="handleRefresh" /> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
@ -389,6 +395,7 @@ import { |
|
|
|
|
RemarkFormEdit, |
|
|
|
|
JingDong, |
|
|
|
|
RemarkFormAdd, |
|
|
|
|
DeliveryFormEdit, |
|
|
|
|
} from './modules' |
|
|
|
|
import { Ueditor } from '@/components' |
|
|
|
|
import { |
|
|
|
@ -449,6 +456,7 @@ export default { |
|
|
|
|
JingDong, |
|
|
|
|
RemarkFormAdd, |
|
|
|
|
RemarkFormEdit, |
|
|
|
|
DeliveryFormEdit, |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
@ -561,7 +569,10 @@ export default { |
|
|
|
|
} |
|
|
|
|
return ColorEnum[orderStatus] |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 修改物流 |
|
|
|
|
onClickEditDelivery(record) { |
|
|
|
|
this.$refs.DeliveryFormEdit.show(record) |
|
|
|
|
}, |
|
|
|
|
// 订单发货 |
|
|
|
|
handleDelivery() { |
|
|
|
|
const { record } = this |
|
|
|
|