This commit is contained in:
parent
80450ea699
commit
aeec7bf8c3
|
|
@ -257,6 +257,7 @@
|
||||||
/>
|
/>
|
||||||
<el-table-column align="center" label="计量单位" prop="unitName" />
|
<el-table-column align="center" label="计量单位" prop="unitName" />
|
||||||
<el-table-column align="center" label="当前库存" prop="storageNum" />
|
<el-table-column align="center" label="当前库存" prop="storageNum" />
|
||||||
|
<el-table-column align="center" label="待出库数量" prop="pendingOutNum" />
|
||||||
<el-table-column label="预领数量" prop="preNum" align="center">
|
<el-table-column label="预领数量" prop="preNum" align="center">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-input
|
<el-input
|
||||||
|
|
@ -745,6 +746,7 @@ export default {
|
||||||
fullPath: path.join(' / '),
|
fullPath: path.join(' / '),
|
||||||
searchKey: path.join('').toLowerCase(),
|
searchKey: path.join('').toLowerCase(),
|
||||||
storageNum: node.storageNum || 0,
|
storageNum: node.storageNum || 0,
|
||||||
|
pendingOutNum:node.pendingOutNum || 0,
|
||||||
maTypeName: parents[parents.length - 1] || '',
|
maTypeName: parents[parents.length - 1] || '',
|
||||||
specificationType: node.typeName,
|
specificationType: node.typeName,
|
||||||
unitName: node.unitName,
|
unitName: node.unitName,
|
||||||
|
|
@ -902,8 +904,9 @@ export default {
|
||||||
this.$message.error(`第 ${i + 1} 行的 ${'预领数量必须大于0'} `);
|
this.$message.error(`第 ${i + 1} 行的 ${'预领数量必须大于0'} `);
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(this.equipmentList[i].preNum - this.equipmentList[i].alNum > this.equipmentList[i].storageNum){
|
if(this.equipmentList[i].storageNum-this.equipmentList[i].pendingOutNum<this.equipmentList[i].preNum){
|
||||||
this.$message.error(`第 ${i + 1} 行的 ${'预领数量不可大于库存量'} `);
|
// if(this.equipmentList[i].preNum - this.equipmentList[i].alNum > this.equipmentList[i].storageNum){
|
||||||
|
this.$message.error(`第 ${i + 1} 行的 ${'预领数量不可大于可领数量'} `);
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue