Commit 25888b31 authored by zhengyi's avatar zhengyi

订单相关-到仓详情页面不显示未到仓数据

parent 70443c28
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('到仓详情')" name="seven"> <el-tab-pane :label="$t('到仓详情')" name="seven">
<check-detail-prod :list="getWarehouseCheckInfo(order.orderItemVOList)" <check-detail-prod :list="warehouseCheckInfoData"
:attr-list="attrList" :attr-list="attrList"
:prod-type-list="prodTypeList" :prod-type-list="prodTypeList"
:currency-map="currencyMap" :currency-map="currencyMap"
...@@ -498,6 +498,7 @@ export default { ...@@ -498,6 +498,7 @@ export default {
packAfterData:null,//显示打包历史详情 packAfterData:null,//显示打包历史详情
attrList: [], attrList: [],
orderItemDeletedData:[],//退仓品名 orderItemDeletedData:[],//退仓品名
warehouseCheckInfoData:[],//到仓详情
prodTypeList:[],//商品类型列表 prodTypeList:[],//商品类型列表
type:1 type:1
} }
...@@ -598,18 +599,7 @@ export default { ...@@ -598,18 +599,7 @@ export default {
handleChange(val){ handleChange(val){
this.showText = val.length>0? this.$t('隐藏') : this.$t('显示更多') this.showText = val.length>0? this.$t('隐藏') : this.$t('显示更多')
}, },
getWarehouseCheckInfo(){
return (itemList) => {
let warehouseCheckInfoData = [];
for (let index in itemList) {
let item = itemList[index];
if (item.warehouseCheckInfoVO) {
warehouseCheckInfoData.push(item)
}
}
return warehouseCheckInfoData;
};
},
getAirCompany(){ getAirCompany(){
getSupplier(this.order.airlineCompany).then(res => { getSupplier(this.order.airlineCompany).then(res => {
this.$set(this.order,'companyName',this.$l(res.data,'company')) this.$set(this.order,'companyName',this.$l(res.data,'company'))
...@@ -629,6 +619,12 @@ export default { ...@@ -629,6 +619,12 @@ export default {
getOrder(that.orderId).then(response => { getOrder(that.orderId).then(response => {
that.order = response.data; that.order = response.data;
if(that.order.airlineCompany) that.getAirCompany() if(that.order.airlineCompany) that.getAirCompany()
for (let index in this.order.orderItemVOList) {
let item = this.order.orderItemVOList[index];
if (item.warehouseCheckInfoVO) {
this.warehouseCheckInfoData.push(item)
}
}
}); });
}, },
//退仓品名 //退仓品名
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment