Commit bcfec1bf authored by dragondean@qq.com's avatar dragondean@qq.com

优化拆单,删掉多余内容

parent 9eccadc1
...@@ -585,30 +585,9 @@ export default { ...@@ -585,30 +585,9 @@ export default {
const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || [] const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || []
return list.map(item => { return list.map(item => {
let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*') let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*')
let labelArr = [
this.$t('{num}箱', {num: item.cartonsNum}),
this.$l(this.getDictDatas(this.DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE).find(dict => dict.value == item.specificationType), 'label'),
this.$t('长{boxGauge1}cm', {boxGauge1}),
this.$t('宽{boxGauge2}cm', {boxGauge2}),
this.$t('高{boxGauge3}cm', {boxGauge3}),
this.$t('方数{volume}m³', {volume: item.volume}),
this.$t('重量{weight}kg', {weight: item.weight})
]
if (item.quantityAll) {
labelArr.push(this.$t('数量{n}', {n: item.quantityAll}))
}
if (item.expressNo) {
labelArr.push(this.$t('快递{expressNo}', {expressNo: item.expressNo}))
}
if (item.orderLocationBackVOList && item.orderLocationBackVOList.length) {
labelArr.push(this.$t('储位{location}', {
location: item.orderLocationBackVOList.map(v => v.code || v.areaName + (v.locationName || '')).join(',')
}))
}
item.boxGauge1 = boxGauge1 item.boxGauge1 = boxGauge1
item.boxGauge2 = boxGauge2 item.boxGauge2 = boxGauge2
item.boxGauge3 = boxGauge3 item.boxGauge3 = boxGauge3
item.text = labelArr.join(',')
return item return item
}) })
} }
......
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<div> <div>
{{$t('可拆')}}: {{$t('可拆')}}:
{{maxSplitNum}}{{$t('箱')}}, {{maxSplitNum}}{{$t('箱')}},
{{$t('体积')}}:{{leftData('volume')}}{{$t('m³')}} {{$t('体积')}}:{{leftData('volume')}}
{{$t('重量')}}:{{leftData('weight')}}{{$t('kg')}} {{$t('重量')}}:{{leftData('weight')}}kg
{{$t('数量')}}:{{leftData('quantity')}}{{$t('个')}} {{$t('数量')}}:{{leftData('quantity')}}{{$t('个')}}
</div> </div>
</el-card> </el-card>
......
...@@ -716,30 +716,9 @@ export default { ...@@ -716,30 +716,9 @@ export default {
const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || [] const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || []
return list.map(item => { return list.map(item => {
let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*') let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*')
let labelArr = [
this.$t('{num}箱', {num: item.cartonsNum}),
this.$l(this.getDictDatas(this.DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE).find(dict => dict.value == item.specificationType), 'label'),
this.$t('长{boxGauge1}cm', {boxGauge1}),
this.$t('宽{boxGauge2}cm', {boxGauge2}),
this.$t('高{boxGauge3}cm', {boxGauge3}),
this.$t('方数{volume}m³', {volume: item.volume}),
this.$t('重量{weight}kg', {weight: item.weight})
]
if (item.quantityAll) {
labelArr.push(this.$t('数量{n}', {n: item.quantityAll}))
}
if (item.expressNo) {
labelArr.push(this.$t('快递{expressNo}', {expressNo: item.expressNo}))
}
if (item.orderLocationBackVOList && item.orderLocationBackVOList.length) {
labelArr.push(this.$t('储位{location}', {
location: item.orderLocationBackVOList.map(v => v.code || v.areaName + (v.locationName || '')).join(',')
}))
}
item.boxGauge1 = boxGauge1 item.boxGauge1 = boxGauge1
item.boxGauge2 = boxGauge2 item.boxGauge2 = boxGauge2
item.boxGauge3 = boxGauge3 item.boxGauge3 = boxGauge3
item.text = labelArr.join(',')
return item return 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