From 7d3ee0e1dda1474a5dd4da987e9e3a3766f63c7d Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 24 Jun 2026 16:35:58 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2-=E4=BA=A7=E5=93=81=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/product/product/index.ts |  2 +-
 src/views/erp/stock/stock/index.vue  | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/api/erp/product/product/index.ts b/src/api/erp/product/product/index.ts
index 38eaa599..1f176047 100644
--- a/src/api/erp/product/product/index.ts
+++ b/src/api/erp/product/product/index.ts
@@ -37,7 +37,7 @@ export const ProductApi = {
   },
 
   // 查询产品精简列表
-  getProductSimpleList: async (params?: { categoryId?: string | number }) => {
+  getProductSimpleList: async (params?: { categoryId?: string | number; categoryType?: number }) => {
     return await request.get({ url: `/erp/product/simple-list-all`, params })
   },
   // 查询原料精简列表
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index 5b4be8d5..9f3c577d 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -160,11 +160,11 @@
           {{ formatStockCount(row.totalBaseCount) }}
         </template>
       </el-table-column>
-      <el-table-column :label="t('ErpStock.Stock.count')" align="center" sortable prop="count" min-width="120">
+      <!-- <el-table-column :label="t('ErpStock.Stock.count')" align="center" sortable prop="count" min-width="120">
         <template #default="{ row }">
           {{ formatStockCount(row.count) }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="t('ErpStock.Stock.unit')" align="center" prop="unitName" min-width="90" sortable />
       <el-table-column :label="t('ErpStock.Stock.latestInTime')" align="center" min-width="180">
         <template #default="{ row }">
@@ -286,6 +286,15 @@ const buildQueryParams = () => {
   )
 }
 
+const getProductList = async () => {
+  productList.value = await ProductApi.getProductSimpleList(
+    queryParams.categoryType !== undefined ? { categoryType: queryParams.categoryType } : undefined
+  )
+  if (queryParams.productId && !productList.value.some((item) => item.id === queryParams.productId)) {
+    queryParams.productId = undefined
+  }
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -305,17 +314,19 @@ const handleQuery = () => {
 }
 
 /** 重置按钮操作 */
-const resetQuery = () => {
+const resetQuery = async () => {
   queryFormRef.value.resetFields()
   activeName.value = ''
   queryParams.categoryType = undefined
+  await getProductList()
   handleQuery()
 }
 
-const handleTabClick = (tab: any) => {
+const handleTabClick = async (tab: any) => {
   const value = String(tab.paneName || '')
   activeName.value = value
   queryParams.categoryType = value ? Number(value) : undefined
+  await getProductList()
   handleQuery()
 }
 
@@ -369,7 +380,7 @@ onMounted(async () => {
   await dictStore.setDictMap()
   await getList()
   // 加载产品、仓库列表
-  productList.value = await ProductApi.getProductSimpleList()
+  await getProductList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
 })
 </script>