|
|
|
@ -482,6 +482,26 @@
|
|
|
|
|
</JnpfPopupSelectInnerName>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="库存数量"
|
|
|
|
|
v-if="judgeShow('warehousingproduct-warehousingUnitId')" prop="inventoryNo"
|
|
|
|
|
width="120">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign" v-if="
|
|
|
|
|
judgeRequired(
|
|
|
|
|
'warehousingproductList-warehousingUnitId'
|
|
|
|
|
)
|
|
|
|
|
">*</span>库存数量
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.inventoryNo" @change="
|
|
|
|
|
changeData(
|
|
|
|
|
'warehousingproduct-warehousingUnitId',
|
|
|
|
|
scope.$index
|
|
|
|
|
)
|
|
|
|
|
" placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="出库单位"
|
|
|
|
|
v-if="judgeShow('warehousingproduct-warehousingUnitId')" prop="warehousingUnitId"
|
|
|
|
|
width="120">
|
|
|
|
@ -933,21 +953,21 @@ export default {
|
|
|
|
|
let idx = index
|
|
|
|
|
for (let i = 0; i < val2.length; i++) {
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
// this.dataForm.warehousingProductList[idx].storageAreaId = undefined
|
|
|
|
|
// this.dataForm.warehousingProductList[idx].batchNo = undefined
|
|
|
|
|
// this.dataForm.warehousingProductList[idx].produceDate = undefined
|
|
|
|
|
// this.dataForm.warehousingProductList[idx].inventoryNo = undefined
|
|
|
|
|
this.dataForm.warehousingProductList[idx].storageAreaId = undefined
|
|
|
|
|
this.dataForm.warehousingProductList[idx].batchNo = undefined
|
|
|
|
|
this.dataForm.warehousingProductList[idx].produceDate = undefined
|
|
|
|
|
this.dataForm.warehousingProductList[idx].inventoryNo = undefined
|
|
|
|
|
this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
|
|
|
|
|
this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
|
|
|
|
|
this.dataForm.warehousingProductList[idx].produceDate = val2[0].produce_date
|
|
|
|
|
// this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
|
|
|
|
|
this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
|
|
|
|
|
} else {
|
|
|
|
|
let item = JSON.parse(JSON.stringify(this.dataForm.warehousingProductList[index]))
|
|
|
|
|
this.createwarehousingproductList(item)
|
|
|
|
|
this.dataForm.warehousingProductList[idx].storageAreaId = val2[i].cargoId
|
|
|
|
|
this.dataForm.warehousingProductList[idx].batchNo = val2[i].batch_number
|
|
|
|
|
this.dataForm.warehousingProductList[idx].produceDate = val2[i].produce_date
|
|
|
|
|
// this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
|
|
|
|
|
this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
|
|
|
|
|
}
|
|
|
|
|
idx++
|
|
|
|
|
}
|
|
|
|
@ -1102,7 +1122,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
if (!e.notificationStorageNumber) {
|
|
|
|
|
this.$message({
|
|
|
|
|
message: '通知出库数量',
|
|
|
|
|
message: '通知出库数量不能为空',
|
|
|
|
|
type: 'error',
|
|
|
|
|
duration: 1000
|
|
|
|
|
});
|
|
|
|
|