From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/business/finishedProductSampling/index.vue | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/views/business/finishedProductSampling/index.vue b/src/views/business/finishedProductSampling/index.vue
index b4f9986..e013681 100644
--- a/src/views/business/finishedProductSampling/index.vue
+++ b/src/views/business/finishedProductSampling/index.vue
@@ -273,6 +273,7 @@
import {mapGetters} from "vuex";
export default {
+ name: 'FinishedProductSampling',
data() {
return {
stockList: [],
@@ -350,31 +351,29 @@
this.tableLoading = true
this.stockList = []
const newReqParam = this.getFinalParam()
- getIfsStock(newReqParam)
- .then((response) => {
- const resData = response.data
- this.queryReport.total = resData.total
- const resStockList = resData.data
- resStockList.forEach((item) => {
- this.stockList.push({
- partNo: item.PART_NO,
- partName: item.PART_DESC,
- warehouseName: item.WAREHOUSE_ID,
- locationName: item.LOCATION_DESC,
- locationNo: item.LOCATION_NO,
- partBatchNo: item.LOT_BATCH_NO,
- stockQuantity: item.QTY_ONHAND,
- availableStockQuantity: item.QTY_AVAILABLE,
- outerColor: item.ATTR4,
- customerOrderNo: item.ATTR6,
- inSource: item.ATTR23,
- })
+ getIfsStock(newReqParam).then((response) => {
+ this.tableLoading = false
+ const resData = response.data
+ this.queryReport.total = resData.total
+ const resStockList = resData.data
+ resStockList.forEach((item) => {
+ this.stockList.push({
+ partNo: item.PART_NO,
+ partName: item.PART_DESC,
+ warehouseName: item.WAREHOUSE_ID,
+ locationName: item.LOCATION_DESC,
+ locationNo: item.LOCATION_NO,
+ partBatchNo: item.LOT_BATCH_NO,
+ stockQuantity: item.QTY_ONHAND,
+ availableStockQuantity: item.QTY_AVAILABLE,
+ outerColor: item.ATTR4,
+ customerOrderNo: item.ATTR6,
+ inSource: item.ATTR23,
})
- this.tableLoading = false
})
- .catch(() => {
- this.tableLoading = false
- })
+ }).catch(() => {
+ this.tableLoading = false
+ })
},
getFinalParam() {
const newReqParam = {
--
Gitblit v1.9.3