From da614b00cc2b6721a6deadeb51f278d5a17f732e Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期二, 04 三月 2025 09:56:38 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev --- src/views/business/finishedProductSampling/index.vue | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/views/business/finishedProductSampling/index.vue b/src/views/business/finishedProductSampling/index.vue index b4f9986..d5d732d 100644 --- a/src/views/business/finishedProductSampling/index.vue +++ b/src/views/business/finishedProductSampling/index.vue @@ -350,31 +350,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