diff --git a/src/views/modules/production-return/productionReturnPDAIssueList.vue b/src/views/modules/production-return/productionReturnPDAIssueList.vue index b608a41..f63d4d3 100644 --- a/src/views/modules/production-return/productionReturnPDAIssueList.vue +++ b/src/views/modules/production-return/productionReturnPDAIssueList.vue @@ -686,6 +686,8 @@ export default { // 确认生产退料 confirmReturn() { + // 先从页面列表移除零数量标签,再校验退料信息 + this.labelList = this.labelList.filter((label) => label.quantity && Number(label.quantity) !== 0) if (this.labelList.length === 0) { this.$message.warning('请先扫描退料标签') return @@ -703,26 +705,9 @@ export default { return } - const hasInvalidLabel = this.labelList.some((label) => { - const isInWh = label.isInWh - const quantity = Number(label.quantity) - return isInWh === 'Y' && !isNaN(quantity) && quantity === 0 - }) - - if (hasInvalidLabel) { - this.$message.warning('立库已有标签不能有数量') + // 立库已有标签不提交 + const labelLists = this.labelList.filter((label) => label.isInWh !== 'Y') - return - } - - // 从 labelList 中移除 isInWh 为 'Y' 或 quantity 为 0 的标签 - let labelLists = this.labelList.filter((label) => { - return !( - label.isInWh === 'Y' || - (Number(label.quantity) === 0 || !label.quantity) - ) - }) - // 如果过滤后没有标签了,提示用户 if (labelLists.length === 0) { this.$message.warning('没有可退料的标签') diff --git a/src/views/modules/production-return/productionReturnPickingDetail.vue b/src/views/modules/production-return/productionReturnPickingDetail.vue index 40d04d8..67d03ec 100644 --- a/src/views/modules/production-return/productionReturnPickingDetail.vue +++ b/src/views/modules/production-return/productionReturnPickingDetail.vue @@ -653,6 +653,8 @@ export default { // 确认生产退料 confirmReturn() { + // 先从页面列表移除零数量标签,再校验退料信息 + this.labelList = this.labelList.filter((label) => label.quantity && Number(label.quantity) !== 0) if (this.labelList.length === 0) { this.$message.warning('请先扫描退料标签') return @@ -669,26 +671,9 @@ export default { return } - const hasInvalidLabel = this.labelList.some((label) => { - const isInWh = label.isInWh - const quantity = Number(label.quantity) - return isInWh === 'Y' && !isNaN(quantity) && quantity === 0 - }) - - if (hasInvalidLabel) { - this.$message.warning('立库已有标签不能有数量') - - return - } + // 立库已有标签不提交 + const labelLists = this.labelList.filter((label) => label.isInWh !== 'Y') - // 从 labelList 中移除 isInWh 为 'Y' 或 quantity 为 0 的标签 - let labelLists = this.labelList.filter((label) => { - return !( - label.isInWh === 'Y' || - (Number(label.quantity) === 0 || !label.quantity) - ) - }) - // 如果过滤后没有标签了,提示用户 if (labelLists.length === 0) { this.$message.warning('没有可退料的标签')