From c41ff0fb3f18930d67f682587c1a6c4be8a8b62b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 28 Jun 2024 11:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE(=E5=8C=85=E6=8B=AC=E5=B7=B2?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=EF=BC=8C=E5=B7=B2=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                    | 12 ++++++++++++
 src/views/wms/inventoryManage/balance/index.vue |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 68161dc16..839ac877a 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -41,6 +41,18 @@ export const getBalancePage = async (params) => {
     return await request.get({ url: `/wms/balance/page`, params })
   }
 }
+
+// 查询库存余额列表(包括已冻结，已失效的物料)
+export const getBalancePageAll = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorAll', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageAll`, params })
+  }
+}
+
 // 查询库存余额列表
 export const getBalancePageReturn= async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 8a372224e..595b8ceb1 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -88,7 +88,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: BalanceApi.getBalancePage // 分页接口
+  getListApi: BalanceApi.getBalancePageAll // 分页接口
 })
 
 // 获得表格的各种操作