Commit 5b84e217 authored by dragondean@qq.com's avatar dragondean@qq.com

订单详情储位的bug

parent 24b72e12
...@@ -38,10 +38,7 @@ ...@@ -38,10 +38,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('储位')" prop="orderLocationBackVOList" > <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
<template slot-scope="{row}"> <template slot-scope="{row}">
<warehouse-area-select {{getLocationName(row.orderLocationBackVOList)}}
v-model="row.orderLocationBackVOList"
readonly
:order-id="orderId"></warehouse-area-select>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -96,6 +93,15 @@ export default { ...@@ -96,6 +93,15 @@ export default {
this.getOrderWarehouseIn() this.getOrderWarehouseIn()
}, },
methods:{ methods:{
// 获取储位名称
getLocationName(locationArr){
if(!locationArr || !locationArr.length) return ''
let arr = []
locationArr.forEach(item => {
arr.push(`${item.areaName}${item.locationName || ''}`)
})
return Array.from(new Set(arr)).join(",")
},
closeDialog(){ closeDialog(){
this.show = false this.show = false
this.$emit('close'); this.$emit('close');
......
...@@ -202,10 +202,14 @@ ...@@ -202,10 +202,14 @@
</el-table-column> </el-table-column>
<el-table-column prop="" :label="$t('储位')"> <el-table-column prop="" :label="$t('储位')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<warehouse-area-select <!-- <warehouse-area-select
v-if="row.warehouseInInfoVO"
v-model="row.warehouseInInfoVO.orderLocationBackVOList" v-model="row.warehouseInInfoVO.orderLocationBackVOList"
readonly readonly
:order-id="orderId"></warehouse-area-select> :order-id="orderId"></warehouse-area-select> -->
<template v-if="row.warehouseInInfoVO">
{{getLocationName(row.warehouseInInfoVO.orderLocationMergeVOSet)}}
</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" :label="$t('快递单号')"> <el-table-column prop="" :label="$t('快递单号')">
...@@ -488,6 +492,15 @@ export default { ...@@ -488,6 +492,15 @@ export default {
console.log('2023-01-14 23:23 看到此消息则表示代码最新') console.log('2023-01-14 23:23 看到此消息则表示代码最新')
}, },
methods: { methods: {
// 获取储位名称
getLocationName(locationArr){
if(!locationArr || !locationArr.length) return ''
let arr = []
locationArr.forEach(item => {
arr.push(`${item.areaName}${item.locationName || ''}`)
})
return Array.from(new Set(arr)).join(",")
},
// 显示费用详情 // 显示费用详情
showFeeDetail(row, type){ showFeeDetail(row, type){
this.showFeeDetailDialog = true this.showFeeDetailDialog = true
......
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