diff --git a/src/views/modules/production-pick/productionPicking.vue b/src/views/modules/production-pick/productionPicking.vue index f55ac2c..e49309d 100644 --- a/src/views/modules/production-pick/productionPicking.vue +++ b/src/views/modules/production-pick/productionPicking.vue @@ -103,14 +103,12 @@ export default { this.$message.error('请先选择仓库'); return; } - this.loading = true; const params = { warehouseId: currentWarehouse, site: localStorage.getItem('site'), status: '待出库', }; - getProductionOutboundList(params).then(({ data }) => { this.loading = false; if (data && data.code === 0) { @@ -132,7 +130,6 @@ export default { this.$message.error('请先选择仓库'); return; } - this.loading = true; const params = { warehouseId: currentWarehouse, @@ -140,7 +137,6 @@ export default { site: localStorage.getItem('site'), status: '待出库' }; - getProductionOutboundList(params).then(({ data }) => { this.loading = false; if (data && data.code === 0) { diff --git a/src/views/modules/purchase-return/purchaseReturnDetail.vue b/src/views/modules/purchase-return/purchaseReturnDetail.vue index 9129ea8..d9b6ce4 100644 --- a/src/views/modules/purchase-return/purchaseReturnDetail.vue +++ b/src/views/modules/purchase-return/purchaseReturnDetail.vue @@ -136,7 +136,7 @@
NO.
物料编码
需求数量
-
可用数量
+
出库数量
@@ -214,7 +214,6 @@ export default { site: localStorage.getItem('site'), buNo: this.buNo }; - validateLabelWithReturn(params).then(({ data }) => { if (data && data.code === 0) { // 检查是否已经扫描过 @@ -223,16 +222,15 @@ export default { this.$message.warning('该标签已扫描,请勿重复扫描'); return; } - // 添加到列表顶部(最后扫描的在最上面) this.labelList.unshift({ id: Date.now(), labelCode: labelCode, partNo: data.data.partNo, quantity: data.data.quantity, - batchNo: data.data.batchNo + batchNo: data.data.batchNo, + locationId: data.data.locationId }); - this.$message.success('操作成功'); } else { this.$message.error(data.msg || '该标签与退货单不符,请检查'); @@ -260,7 +258,6 @@ export default { this.$message.warning('请先扫描标签'); return; } - const params = { site: this.returnInfo.site, buNo: this.returnInfo.buNo, @@ -270,21 +267,21 @@ export default { labelCode: label.labelCode, partNo: label.partNo, quantity: label.quantity, - batchNo: label.batchNo + batchNo: label.batchNo, + locationId: label.locationId })) - }; - + } confirmPurchaseReturn(params).then(({ data }) => { if (data && data.code === 0) { - this.$message.success('退货成功'); - this.$router.back(); + this.$message.success('退货成功') + this.$router.back() } else { - this.$message.error(data.msg || '退货失败'); + this.$message.error(data.msg || '退货失败') } }).catch(error => { - console.error('退货失败:', error); - this.$message.error('退货失败'); - }); + console.error('退货失败:', error) + this.$message.error('退货失败') + }) }, // 打印标签 diff --git a/src/views/modules/sales/salesOutboundDetail.vue b/src/views/modules/sales/salesOutboundDetail.vue index 6165bce..98156b6 100644 --- a/src/views/modules/sales/salesOutboundDetail.vue +++ b/src/views/modules/sales/salesOutboundDetail.vue @@ -136,7 +136,7 @@
NO.
物料编码
需求数量
-
可用数量
+
出库数量
@@ -214,7 +214,6 @@ export default { site: localStorage.getItem('site'), buNo: this.buNo }; - validateLabelWithOutbound(params).then(({ data }) => { if (data && data.code === 0) { // 检查是否已经扫描过 @@ -223,16 +222,15 @@ export default { this.$message.warning('该标签已扫描,请勿重复扫描'); return; } - // 添加到列表顶部(最后扫描的在最上面) this.labelList.unshift({ id: Date.now(), labelCode: labelCode, partNo: data.data.partNo, quantity: data.data.quantity, - batchNo: data.data.batchNo + batchNo: data.data.batchNo, + locationId: data.data.locationId }); - this.$message.success('操作成功'); } else { this.$message.error(data.msg || '该标签与出库单不符,请检查'); @@ -260,7 +258,6 @@ export default { this.$message.warning('请先扫描标签'); return; } - const params = { site: this.outboundInfo.site, buNo: this.outboundInfo.buNo, @@ -270,10 +267,10 @@ export default { labelCode: label.labelCode, partNo: label.partNo, quantity: label.quantity, - batchNo: label.batchNo + batchNo: label.batchNo, + locationId: label.locationId })) }; - confirmSalesOutbound(params).then(({ data }) => { if (data && data.code === 0) { this.$message.success('出库成功');