Commit 4c1a9c56 authored by 我在何方's avatar 我在何方

打包详情箱优化

parent 0b6add3e
...@@ -56,6 +56,7 @@ export default { ...@@ -56,6 +56,7 @@ export default {
created(){ created(){
this.show = true this.show = true
console.log(this.orderItemId)
if(this.order && this.orderItemId){ if(this.order && this.orderItemId){
this.queryParams.orderId = this.order.orderId; this.queryParams.orderId = this.order.orderId;
this.queryParams.orderItemId = this.orderItemId; this.queryParams.orderItemId = this.orderItemId;
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<el-table-column :label="$t('箱数')" prop="cartonsNum"> <el-table-column :label="$t('箱数')" prop="cartonsNum">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{row.cartonsNum}}</span> <span>{{row.cartonsNum}}</span>
<el-button v-if="row.orderWarehouseInDetailsVOList" type="text" @click="seeBox(row.orderWarehouseInDetailsVOList)">({{$t('混箱')}})</el-button> <el-button v-if="row.orderWarehouseInDetailsVOList&&row.orderWarehouseInDetailsVOList.length>0" type="text" @click="seeBox(row.orderWarehouseInDetailsVOList)">({{$t('混箱')}})</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入仓类型')" prop="cartonsNum"> <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
...@@ -317,7 +317,21 @@ export default { ...@@ -317,7 +317,21 @@ export default {
this.boxShow = false this.boxShow = false
}, },
seeBox(data){ seeBox(data){
this.boxData = data data.forEach(e => {
let bg = {}
if (e.boxGauge) {
const boxGauge = e.boxGauge.split('*')
// e.boxGauge1 = boxGauge[0]
// e.boxGauge2 = boxGauge[1]
// e.boxGauge3 = boxGauge[2]
bg = {
boxGauge1: boxGauge[0],
boxGauge2: boxGauge[1],
boxGauge3: boxGauge[2]
}
}
this.boxData.push({...e, ...bg})
})
this.boxShow = true this.boxShow = true
}, },
/** 获取产品属性列表 */ /** 获取产品属性列表 */
......
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
}) })
}, },
seePackLog(){ seePackLog(){
this.$emit('openPackHistory',2) this.$emit('openPackHistory',this.orderItemId)
} }
} }
} }
......
...@@ -868,9 +868,8 @@ export default { ...@@ -868,9 +868,8 @@ export default {
return JSON.parse(note) return JSON.parse(note)
}, },
//查看打包历史 //查看打包历史
openPackHistory(){ openPackHistory(id){
this.shopPackId = id
this.shopPackId = this.showWarehouseInItemId
}, },
//查看打包历史详情 //查看打包历史详情
showPackDetail(packAfterData){ showPackDetail(packAfterData){
......
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