|
|
|
@ -2,79 +2,90 @@ |
|
|
|
<view class="order-send-out"> |
|
|
|
<view class="oso-header"> |
|
|
|
<view class="oh-tit">收货人信息</view> |
|
|
|
<view class="oh-mode">配送方式：快递</view> |
|
|
|
<view class="oh-name">李晓娜<text>18087690993</text></view> |
|
|
|
<view class="oh-addr">广东省广州市白云区丛云路万事达广场A302</view> |
|
|
|
<view class="oh-mode">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view> |
|
|
|
<view class="oh-name">{{ order_custom.name || '-' }}<text>{{ order_custom.phone || '-' }}</text></view> |
|
|
|
<view class="oh-addr">{{ order_custom.address || '-' }}</view> |
|
|
|
</view> |
|
|
|
<view class="oh-tab"> |
|
|
|
<view class="ot-item"> |
|
|
|
<view class="active"> |
|
|
|
<view class="ot-item" @click="tabChange(0)"> |
|
|
|
<view :class="[curTab == 0? 'active' : '']"> |
|
|
|
<view class="oi-txt">待发货</view> |
|
|
|
<view class="oi-num">999</view> |
|
|
|
<view class="oi-num" v-if="waitdeliverLs.length">{{ waitdeliverLs.length || 0 }}</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="ot-item"> |
|
|
|
<view> |
|
|
|
<view class="oi-txt">待发货</view> |
|
|
|
<view class="ot-item" @click="tabChange(1)"> |
|
|
|
<view :class="[curTab == 1? 'active' : '']"> |
|
|
|
<view class="oi-txt">已发货</view> |
|
|
|
<view class="oi-num" v-if="shippedLs.length">{{ shippedLs.length || 0 }}</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="oh-section"> |
|
|
|
<!-- 待发货 --> |
|
|
|
<view class="os-wait" v-if="false"> |
|
|
|
<view class="oh-box ow-goods"> |
|
|
|
<view class="os-wait" v-if="curTab == 0"> |
|
|
|
<!-- 没数据 --> |
|
|
|
<view class="os-null" v-if="!waitdeliverLs.length"> |
|
|
|
<image></image> |
|
|
|
<view>无已发货</view> |
|
|
|
</view> |
|
|
|
<view class="oh-box ow-goods" v-else> |
|
|
|
<view class="og-header"> |
|
|
|
<view class="oh-tit"><text>*</text>请选择商品发货</view> |
|
|
|
<view class="oh-select"> |
|
|
|
<view>全选</view> |
|
|
|
<view></view> |
|
|
|
<view @click="sendOutSelectAll">全选</view> |
|
|
|
<view> |
|
|
|
<image v-if="isSelectedAllSendOut" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="og-list"> |
|
|
|
<view class="ol-item"> |
|
|
|
<view class="oi-select"></view> |
|
|
|
<image></image> |
|
|
|
<view class="ol-item" v-for="(e, i) in waitdeliverLs" :key="i" @click="goodsItemClick(e)"> |
|
|
|
<view class="oi-select"> |
|
|
|
<image v-if="selectedSendOutIds.includes(e.product_id)" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image> |
|
|
|
</view> |
|
|
|
<image mode="aspecfFill" :src="e.product_imgs"></image> |
|
|
|
<view class="oi-info"> |
|
|
|
<view class="oi-tit">克洛斯威羽毛球拍2支装C8正品碳素成人进攻型羽毛球比赛用</view> |
|
|
|
<view class="oi-tit">{{ e.product_name || '-' }}</view> |
|
|
|
<view class="oi-spec">比赛专用；黑色</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="oh-box ow-warehouse"> |
|
|
|
<view class="oh-box ow-warehouse" > |
|
|
|
<view class="oh-tit"><text>*</text>发货仓库</view> |
|
|
|
<picker> |
|
|
|
<picker :range="warehouseList" range-key="esh_name" @change="warehouseChange"> |
|
|
|
<view class="ow-picker"> |
|
|
|
<input disabled placeholder="请选择发货仓库" /> |
|
|
|
<image></image> |
|
|
|
<input disabled placeholder="请选择发货仓库" :value="selectedWarehouse.esh_name" /> |
|
|
|
<image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image> |
|
|
|
</view> |
|
|
|
</picker> |
|
|
|
<view class="ow-tip">商品如果不在同一仓库，请分开发货</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="oh-box ow-logistics"> |
|
|
|
<view class="oh-tit">发货仓库</view> |
|
|
|
<view class="oh-tit">发货物流</view> |
|
|
|
<view class="ol-line"> |
|
|
|
<view class="ol-name"><text>* </text>发货方式</view> |
|
|
|
<view class="ol-mode"> |
|
|
|
<view class="om-item"> |
|
|
|
<view class="active"></view> |
|
|
|
<view>快递</view> |
|
|
|
<view :class="[ sendOutMethod == 0 ? 'active' : '' ]" @click="sendOutMethod = 0"></view> |
|
|
|
<view @click="sendOutMethod = 0">快递</view> |
|
|
|
</view> |
|
|
|
<view class="om-item"> |
|
|
|
<view></view> |
|
|
|
<view>无需快递</view> |
|
|
|
<view :class="[ sendOutMethod == 1 ? 'active' : '' ]" @click="sendOutMethod = 1"></view> |
|
|
|
<view @click="sendOutMethod = 1">无需快递</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<block v-if="sendOutMethod == 0"> |
|
|
|
<view class="ol-line"> |
|
|
|
<view class="ol-name"><text>* </text>物流公司</view> |
|
|
|
<view class="ol-company"> |
|
|
|
<picker> |
|
|
|
<picker :range="logisticsCompanyLs" @change="logisticsChange"> |
|
|
|
<view class="oc-ipt-frame"> |
|
|
|
<input disabled placeholder="请选择物流公司" /> |
|
|
|
<image></image> |
|
|
|
<input disabled placeholder="请选择物流公司" :value="curlogisticsName" /> |
|
|
|
<image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image> |
|
|
|
</view> |
|
|
|
</picker> |
|
|
|
</view> |
|
|
|
@ -83,27 +94,35 @@ |
|
|
|
<view class="ol-name"><text>* </text>物流单号</view> |
|
|
|
<view class="ol-company"> |
|
|
|
<view class="oc-ipt-frame"> |
|
|
|
<input placeholder="请输入物流单号" /> |
|
|
|
<input placeholder="请输入物流单号" v-model="logisticsOrderNum" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="ol-line"> |
|
|
|
</block> |
|
|
|
|
|
|
|
|
|
|
|
<view class="ol-line" v-if="sendOutMethod == 1"> |
|
|
|
<view class="ol-name"><text>* </text>备注</view> |
|
|
|
<view class="ol-company"> |
|
|
|
<view class="oc-ipt-frame"> |
|
|
|
<input placeholder="备注" /> |
|
|
|
<input placeholder="备注" v-model="sendOutRemark" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<cover-view class="ow-btn"> |
|
|
|
<cover-view class="ob-btn">确认发货</cover-view> |
|
|
|
<cover-view class="ob-btn" @click="confirmSendOutBtn">确认发货</cover-view> |
|
|
|
</cover-view> |
|
|
|
|
|
|
|
</view> |
|
|
|
<!-- 已发货 --> |
|
|
|
<view class="os-yet" v-if="false"> |
|
|
|
<view class="package-list"> |
|
|
|
<view class="os-yet" v-if="curTab == 1"> |
|
|
|
<!-- 没数据 --> |
|
|
|
<view class="os-null" v-if="!shippedLs.length"> |
|
|
|
<image></image> |
|
|
|
<view>无已发货</view> |
|
|
|
</view> |
|
|
|
<view class="package-list" v-else> |
|
|
|
<view class="pl-item" v-for="i in 2" :key="i"> |
|
|
|
<view class="pi-tit">包裹1</view> |
|
|
|
<view class="pi-express"><view>快递：顺丰速递 SF1090317923085</view><view>复制</view></view> |
|
|
|
@ -116,19 +135,197 @@ |
|
|
|
<view class="pi-total">共10件商品</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
</view> |
|
|
|
<!-- 没数据 --> |
|
|
|
<view class="os-null"> |
|
|
|
<image></image> |
|
|
|
<view>无已发货</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
|
|
|
|
<script> |
|
|
|
import { ORDER_API } from '../../../js/api'; |
|
|
|
import server from '../../../js/server'; |
|
|
|
import util from '../../../../../utils/util'; |
|
|
|
export default { |
|
|
|
computed: { |
|
|
|
order_custom(){ |
|
|
|
let { orderInfo } = this; |
|
|
|
if(orderInfo&&orderInfo.product_order_custom)return (orderInfo.product_order_custom || {}) |
|
|
|
return {}; |
|
|
|
}, |
|
|
|
// 待发货列表 |
|
|
|
waitdeliverLs(){ |
|
|
|
let { orderInfo } = this; |
|
|
|
let _list = orderInfo.product_order_goods || []; |
|
|
|
return _list.filter(e=>e.product_logistics_end == 0) || []; |
|
|
|
}, |
|
|
|
// 已发货列表 |
|
|
|
shippedLs(){ |
|
|
|
let { orderInfo } = this; |
|
|
|
let _list = orderInfo.product_order_goods || []; |
|
|
|
return _list.filter(e=>e.product_logistics_end == 1) || []; |
|
|
|
}, |
|
|
|
// 选中发货 id列表 |
|
|
|
selectedSendOutIds(){ |
|
|
|
let { selectedSendOutLs } = this; |
|
|
|
return selectedSendOutLs.map(e=>e.product_id); |
|
|
|
}, |
|
|
|
// 待发货列表全选 |
|
|
|
isSelectedAllSendOut(){ |
|
|
|
let { selectedSendOutIds, waitdeliverLs } = this; |
|
|
|
let _unLs = []; // 未被选中列表 |
|
|
|
if(!waitdeliverLs.length)return false; |
|
|
|
_unLs = waitdeliverLs.filter(ele => !selectedSendOutIds.includes(ele.product_id)); |
|
|
|
return _unLs.length == 0; |
|
|
|
} |
|
|
|
}, |
|
|
|
data(){ |
|
|
|
return { |
|
|
|
order_no: '', |
|
|
|
orderInfo: {}, |
|
|
|
curTab: 0, // 待发货 -> 0 , 已发货 -> 1 |
|
|
|
selectedSendOutLs: [], // 选中发货列表 |
|
|
|
warehouseList: [], // 仓库列表 |
|
|
|
selectedWarehouse: {}, // 选中仓库 |
|
|
|
sendOutMethod: 0, // 发货方式 ， 快递 -> 0, 无需快递 -> 1 |
|
|
|
logisticsCompanyLs: [], // 快递公司列表 |
|
|
|
curlogisticsName: '', |
|
|
|
logisticsOrderNum: '', |
|
|
|
sendOutRemark: '', |
|
|
|
} |
|
|
|
}, |
|
|
|
onLoad(options){ |
|
|
|
this.order_no = options.order_no || ''; |
|
|
|
this.getInfo(options.order_no); |
|
|
|
this.getWarehouse({}); |
|
|
|
this.getLogisticsCompanyLs({}); |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
logisticsChange(e){ |
|
|
|
let { logisticsCompanyLs } = this; |
|
|
|
this.curlogisticsName = logisticsCompanyLs[e.detail.value] || ''; |
|
|
|
}, |
|
|
|
refreshPage(){ |
|
|
|
let { order_no } = this; |
|
|
|
if(!order_no)return; |
|
|
|
this.orderInfo = {}; |
|
|
|
this.selectedSendOutLs = []; |
|
|
|
this.selectedWarehouse = []; |
|
|
|
this.sendOutMethod = 0; |
|
|
|
this.curlogisticsName = ''; |
|
|
|
this.sendOutRemark = ''; |
|
|
|
this.getInfo(order_no); |
|
|
|
}, |
|
|
|
confirmSendOutBtn: util.debounce(function(){ |
|
|
|
let { order_no, selectedSendOutIds, selectedWarehouse, sendOutMethod, curlogisticsName, logisticsOrderNum, sendOutRemark } = this; |
|
|
|
let _query = { |
|
|
|
order_no, |
|
|
|
ids: selectedSendOutIds, |
|
|
|
esh_type: selectedWarehouse.esh_type, |
|
|
|
esh_id: selectedWarehouse.esh_id, |
|
|
|
logistics_type: sendOutMethod, |
|
|
|
|
|
|
|
} |
|
|
|
if(sendOutMethod == 0){ |
|
|
|
_query['logistics_name'] = curlogisticsName; |
|
|
|
_query['logistics_no'] = logisticsOrderNum; |
|
|
|
} |
|
|
|
if(sendOutMethod == 1)_query['mark'] = sendOutRemark; |
|
|
|
this.shop2OrderLogistics(_query); |
|
|
|
}, 300,true), |
|
|
|
shop2OrderLogistics({ |
|
|
|
order_no = '', |
|
|
|
ids = [], |
|
|
|
esh_type = '', |
|
|
|
esh_id = '', |
|
|
|
logistics_type = '', |
|
|
|
logistics_name = '', |
|
|
|
logistics_no = '', |
|
|
|
}){ |
|
|
|
server.post({ |
|
|
|
url: ORDER_API.shop2OrderLogistics, |
|
|
|
data: { |
|
|
|
order_no, // 订单编号 |
|
|
|
ids, // 发货商品购物车ID数组 |
|
|
|
esh_type, // 类型 0/1 - 仓库/店铺 |
|
|
|
esh_id, // 发货仓库/店铺 ID |
|
|
|
logistics_type, // 发货方式 0/1 - 快递/无需发货 |
|
|
|
logistics_name, // 物流公司 |
|
|
|
logistics_no, // 物流单号 |
|
|
|
}, |
|
|
|
isDefaultGet: false |
|
|
|
}) |
|
|
|
.then(res=>{ |
|
|
|
if(res.data.code == 0){ |
|
|
|
util.showNone(res.data.message || '操作成功！'); |
|
|
|
setTimeout(this.refreshPage, 1200); |
|
|
|
}else{ |
|
|
|
util.showNone(res.data.message || '操作失败！'); |
|
|
|
} |
|
|
|
console.warn(res.list) |
|
|
|
}) |
|
|
|
}, |
|
|
|
warehouseChange(e){ |
|
|
|
console.warn(e); |
|
|
|
let { warehouseList } = this; |
|
|
|
if(!warehouseList || !warehouseList.length)this.selectedWarehouse = {}; |
|
|
|
this.selectedWarehouse = warehouseList[e.detail.value] || {}; |
|
|
|
}, |
|
|
|
sendOutSelectAll(){ |
|
|
|
let { isSelectedAllSendOut, waitdeliverLs } = this; |
|
|
|
this.selectedSendOutLs = isSelectedAllSendOut ? [] : [ ...waitdeliverLs ]; |
|
|
|
|
|
|
|
}, |
|
|
|
goodsItemClick(e){ |
|
|
|
let { selectedSendOutIds, selectedSendOutLs } = this; |
|
|
|
if(selectedSendOutIds.includes(e.product_id))return this.selectedSendOutLs = selectedSendOutLs.filter(ele=>ele.product_id !=e.product_id); |
|
|
|
this.selectedSendOutLs = [ ...selectedSendOutLs, e]; |
|
|
|
}, |
|
|
|
tabChange(idx){ |
|
|
|
this.curTab = idx; |
|
|
|
}, |
|
|
|
// 仓库列表 |
|
|
|
getWarehouse({ |
|
|
|
page_size = 9999, |
|
|
|
page = 1, |
|
|
|
}){ |
|
|
|
server.get({ |
|
|
|
url: ORDER_API.erpshList, |
|
|
|
data: { page_size, page }, |
|
|
|
failMsg: '加载仓库列表失败！' |
|
|
|
}) |
|
|
|
.then(res=>{ |
|
|
|
this.warehouseList = res.list || []; |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 快递公司列表 |
|
|
|
getLogisticsCompanyLs({ |
|
|
|
page_size = 9999, |
|
|
|
page = 1, |
|
|
|
}){ |
|
|
|
server.get({ |
|
|
|
url: ORDER_API.logisticsCompanyLs, |
|
|
|
data: { page_size, page }, |
|
|
|
failMsg: '加载快递公司列表失败！' |
|
|
|
}) |
|
|
|
.then(res=>{ |
|
|
|
this.logisticsCompanyLs = res.list || []; |
|
|
|
}) |
|
|
|
}, |
|
|
|
getInfo(order_no){ |
|
|
|
util.showLoad(); |
|
|
|
server.get({ |
|
|
|
url: ORDER_API.shop2OrderInfo, |
|
|
|
data: { order_no }, |
|
|
|
failMsg: '加载数据失败！' |
|
|
|
}) |
|
|
|
.then(res=>{ |
|
|
|
util.hideLoad(); |
|
|
|
let _order = res.order || {}; |
|
|
|
this.orderInfo = _order; |
|
|
|
}) |
|
|
|
}, |
|
|
|
} |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
|
|
|
@ -255,6 +452,11 @@ export default { |
|
|
|
margin-left: 20upx; |
|
|
|
border: 2upx solid #9a9a9d; |
|
|
|
border-radius: 50%; |
|
|
|
>image{ |
|
|
|
display: block; |
|
|
|
width: 100%; |
|
|
|
height: 100%; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -269,6 +471,12 @@ export default { |
|
|
|
height: 32upx; |
|
|
|
border-radius: 50%; |
|
|
|
box-shadow: 0 0 0 2upx #9A9A9D; |
|
|
|
@include centerFlex(center); |
|
|
|
>image{ |
|
|
|
display: block; |
|
|
|
width: 100%; |
|
|
|
height: 100%; |
|
|
|
} |
|
|
|
} |
|
|
|
>image{ |
|
|
|
flex-shrink: 0; |
|
|
|
@ -276,7 +484,6 @@ export default { |
|
|
|
width: 180upx; |
|
|
|
height: 180upx; |
|
|
|
border-radius: 10upx; |
|
|
|
background-color: skyblue; |
|
|
|
} |
|
|
|
.oi-info{ |
|
|
|
align-self: flex-start; |
|
|
|
@ -318,7 +525,6 @@ export default { |
|
|
|
margin-left: 20upx; |
|
|
|
width: 30upx; |
|
|
|
height: 30upx; |
|
|
|
background-color: skyblue; |
|
|
|
} |
|
|
|
} |
|
|
|
.ow-tip{ |
|
|
|
@ -404,7 +610,6 @@ export default { |
|
|
|
margin-left: 20upx; |
|
|
|
width: 30upx; |
|
|
|
height: 30upx; |
|
|
|
background-color: skyblue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
