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

装柜拆单兼容按入仓记录放入

parent 36900e21
...@@ -218,6 +218,8 @@ export default { ...@@ -218,6 +218,8 @@ export default {
appendToBody: Boolean, appendToBody: Boolean,
// 仓库ID,选择储位要用到 // 仓库ID,选择储位要用到
warehouseId: Number, warehouseId: Number,
// 数量是否必须
quantityshow: Boolean
}, },
data(){ data(){
return { return {
......
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')"> <el-table-column :label="$t('操作')">
<template v-slot="{ row, column, $index}"> <template v-slot="{ row, column, $index}">
<el-tag v-if="getWarehouseInLeftData(row.id,'num') >= row.cartonsNum" disabled size="mini" type="primary" >{{$t('已拆完')}}</el-tag> <el-tag v-if="getWarehouseInSplitData(row.id,'num') >= row.cartonsNum" disabled size="mini" type="primary" >{{$t('已拆完')}}</el-tag>
<el-button v-else size="mini" type="primary" @click="putInRecord(row)">放入</el-button> <el-button v-else size="mini" type="primary" @click="putInRecord(row)">放入</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -349,9 +349,9 @@ ...@@ -349,9 +349,9 @@
{{row.volume}} {{row.volume}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收费体积(m³)" prop="chargeVolume"></el-table-column> <!--<el-table-column label="收费体积(m³)" prop="chargeVolume"></el-table-column>-->
<el-table-column label="入仓重量(Kg)" prop="weight"></el-table-column> <el-table-column label="入仓重量(Kg)" prop="weight"></el-table-column>
<el-table-column label="收费重量(Kg)" prop="chargeWeight"></el-table-column> <!--<el-table-column label="收费重量(Kg)" prop="chargeWeight"></el-table-column>-->
<el-table-column :label="$t('数量')" width="130px" prop="quantity"></el-table-column> <el-table-column :label="$t('数量')" width="130px" prop="quantity"></el-table-column>
<el-table-column :label="$t('快递单号')" prop="expressNo"></el-table-column> <el-table-column :label="$t('快递单号')" prop="expressNo"></el-table-column>
<el-table-column :label="$t('储位')" prop="orderLocationBackVOList"> <el-table-column :label="$t('储位')" prop="orderLocationBackVOList">
...@@ -714,8 +714,8 @@ export default { ...@@ -714,8 +714,8 @@ export default {
return specsRecordVOList return specsRecordVOList
} }
}, },
// 根据入仓ID获取剩余数据 // 根据入仓ID获取拆出数据
getWarehouseInLeftData(){ getWarehouseInSplitData(){
return (warehouseInId, field) => { return (warehouseInId, field) => {
let total = new Decimal(0) let total = new Decimal(0)
this.getWarehouseInspecsRecordVOList(warehouseInId).forEach(item => { this.getWarehouseInspecsRecordVOList(warehouseInId).forEach(item => {
...@@ -1091,16 +1091,7 @@ export default { ...@@ -1091,16 +1091,7 @@ export default {
putInRecord(row){ putInRecord(row){
this.currentPutIn = row this.currentPutIn = row
// 此条入仓记录已拆出的入仓记录,这样在放入的时候可以确保不超过此入仓记录的数量 // 此条入仓记录已拆出的入仓记录,这样在放入的时候可以确保不超过此入仓记录的数量
let specsRecordVOList = [] let specsRecordVOList = this.getWarehouseInspecsRecordVOList(getWarehouseInspecsRecordVOList)
this.splitData.forEach(split => {
split.orderSplitItemBackVOList.forEach(splitItem => {
splitItem.specsRecordVOList.forEach(specs => {
if(specs.warehouseInId === row.id){
specsRecordVOList.push(specs)
}
})
})
})
this.currentPutIn.specsRecordVOList = specsRecordVOList this.currentPutIn.specsRecordVOList = specsRecordVOList
}, },
// 放入回调 // 放入回调
......
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