diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue index 3c99f4e4..fa59ca78 100644 --- a/src/views/business/businessHandling/directApply.vue +++ b/src/views/business/businessHandling/directApply.vue @@ -394,6 +394,8 @@ export default { { label: '设备编码', prop: 'maCode' }, { label: '计量单位', prop: 'unitName' }, { label: '在用数量', prop: 'useNum' }, + { label: '待转数量', prop: 'waitTransNum' }, + { label: '可转数量', prop:'transNum' }, { label: '领料人', prop: 'leasePerson' }, { label: '领料日期', prop: 'startTime' }, { label: '备注', prop: 'remark' }, @@ -911,7 +913,7 @@ export default { currentPageSelectedRows.forEach(row => { const completeRow = { ...row, - directNum: row.directNum || row.useNum, + directNum: row.directNum || row.transNum, isActive: true } this.selectedDataArray.push(completeRow) @@ -922,8 +924,8 @@ export default { this.equipmentList.forEach(item => { const isSelected = currentPageSelectedRows.some(selectedRow => this.getRowKey(selectedRow) === this.getRowKey(item)) item.isActive = isSelected - if (isSelected && !item.directNum && item.useNum) { - item.directNum = item.useNum + if (isSelected && !item.directNum && item.transNum) { + item.directNum = item.transNum } else if (!isSelected && !this.isEdit && !this.isDetail) { item.directNum = undefined } @@ -946,10 +948,10 @@ export default { } else { row.directNum = Number(String(row.directNum).replace(/[^\d]/g, '')) } - if (row.directNum > row.useNum) { - this.$message.error('直转数量不能大于领料数量') + if (row.directNum > row.transNum) { + this.$message.error('直转数量不能大于可转数量') this.$nextTick(() => { - row.directNum = row.useNum + row.directNum = row.transNum }) } diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue index 1a49a63d..fcc612f8 100644 --- a/src/views/material/purchase/goodsAccept/index.vue +++ b/src/views/material/purchase/goodsAccept/index.vue @@ -213,7 +213,7 @@