From f144dc8fc85d50518e45b7b22734bed894d5c3be Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 17 Jun 2026 09:32:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86/=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8Dtabs=E6=A0=8F=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/stock/record/index.vue | 31 +++++++++++++---------
 src/views/erp/stock/stock/index.vue  | 39 ++++++++++++++--------------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue
index fb24253a..85776be5 100644
--- a/src/views/erp/stock/record/index.vue
+++ b/src/views/erp/stock/record/index.vue
@@ -16,12 +16,6 @@
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="t('ErpStock.Record.materialCategory')" prop="categoryType">
-        <el-select v-model="queryParams.categoryType" clearable
-          :placeholder="t('ErpStock.Record.placeholderMaterialCategory')" class="!w-240px">
-          <el-option v-for="item in categoryTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
       <el-form-item :label="t('ErpStock.Record.bizNo')" prop="bizNo" v-show="showAllFilters">
         <el-input v-model="queryParams.bizNo" :placeholder="t('ErpStock.Record.placeholderBizNo')" clearable
           @keyup.enter="handleQuery" class="!w-240px" />
@@ -66,6 +60,15 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="全部" name="" />
+      <el-tab-pane
+        v-for="item in categoryTypeOptions"
+        :key="item.value"
+        :label="item.label"
+        :name="String(item.value)"
+      />
+    </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
       @selection-change="handleSelectionChange">
       <el-table-column width="30" :label="t('action.select')" type="selection" />
@@ -83,12 +86,6 @@
         sortable />
       <el-table-column :label="t('ErpStock.Record.productName')" align="center" sortable prop="productName"
         min-width="160" />
-      <el-table-column :label="t('ErpStock.Record.materialCategory')" align="center" prop="categoryType" min-width="120"
-        sortable>
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="scope.row.categoryType" />
-        </template>
-      </el-table-column>
       <el-table-column :label="t('ErpStock.Record.categoryName')" align="center" prop="categoryName" min-width="120"
         sortable />
       <el-table-column :label="t('ErpStock.Record.warehouseName')" align="center" prop="warehouseName" min-width="140"
@@ -159,6 +156,7 @@ const queryParams = reactive<{
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const showAllFilters = ref(false)
+const activeName = ref('')
 const filterCount = 5
 const toggleFilters = () => {
   showAllFilters.value = !showAllFilters.value
@@ -229,6 +227,15 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
+  activeName.value = ''
+  queryParams.categoryType = undefined
+  handleQuery()
+}
+
+const handleTabClick = (tab: any) => {
+  const value = String(tab.paneName || '')
+  activeName.value = value
+  queryParams.categoryType = value ? Number(value) : undefined
   handleQuery()
 }
 
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index 1c7a16e6..cf131c6c 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -27,21 +27,6 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="t('ErpStock.Stock.category')" prop="categoryType">
-        <el-select
-          v-model="queryParams.categoryType"
-          clearable
-          :placeholder="t('ErpStock.Stock.placeholderCategory')"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in categoryTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item :label="t('ErpStock.Stock.warehouse')" prop="warehouseId">
         <el-select
@@ -85,6 +70,15 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="全部" name="" />
+      <el-tab-pane
+        v-for="item in categoryTypeOptions"
+        :key="item.value"
+        :label="item.label"
+        :name="String(item.value)"
+      />
+    </el-tabs>
     <el-table
       v-loading="loading"
       :data="list"
@@ -100,11 +94,6 @@
           {{ row.name || row.productName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column :label="t('ErpStock.Stock.category')" align="center" prop="categoryType" min-width="120" sortable>
-        <template #default="{ row }">
-          <dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="row.categoryType" />
-        </template>
-      </el-table-column>
       <el-table-column :label="t('ErpStock.Stock.subCategory')" align="center" prop="categoryName" min-width="120" sortable />
       <el-table-column :label="t('ErpStock.Stock.packagingRule')" align="center" prop="packagingRule" min-width="180" />
       <el-table-column :label="t('ErpStock.Stock.warehouse')" align="center" prop="warehouseName" min-width="140" sortable />
@@ -188,6 +177,7 @@ const queryParams = reactive<{
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const activeName = ref('')
 const productList = ref<ProductVO[]>([]) // 产品列表
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const categoryTypeOptions = computed(() => getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE))
@@ -256,6 +246,15 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
+  activeName.value = ''
+  queryParams.categoryType = undefined
+  handleQuery()
+}
+
+const handleTabClick = (tab: any) => {
+  const value = String(tab.paneName || '')
+  activeName.value = value
+  queryParams.categoryType = value ? Number(value) : undefined
   handleQuery()
 }