From c18746fcf5df61275d025f2fdba3635041096aaf Mon Sep 17 00:00:00 2001
From: yangchunlong <292345300@qq.com>
Date: Tue, 14 Oct 2025 09:31:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E5=BE=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/foundationMaterial.ts         |  3 +++
 src/hooks/useTable.ts                         | 16 ++++++++++++---
 .../set/material/constant/list/search.ts      | 16 +++++++++++++++
 .../set/material/constant/list/table.ts       | 20 +++++++++++++++++++
 src/views/foundation/set/material/index.vue   |  2 +-
 src/views/home/index.vue                      |  2 +-
 6 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/api/modules/foundationMaterial.ts b/src/api/modules/foundationMaterial.ts
index a1dc6ab..53286ad 100644
--- a/src/api/modules/foundationMaterial.ts
+++ b/src/api/modules/foundationMaterial.ts
@@ -6,6 +6,9 @@ import http from "@/api";
 
 //物料分页列表
 export const getMaterialListApi = (params: any) => {
+    if (params.disabled && params.disabled === "启用") {
+        params.disabled = 0;
+    }
     return http.get<any>(`material`, params);
 };
 //刷新 /admapi/material/reload
diff --git a/src/hooks/useTable.ts b/src/hooks/useTable.ts
index 87fcf3d..35cb455 100644
--- a/src/hooks/useTable.ts
+++ b/src/hooks/useTable.ts
@@ -31,7 +31,7 @@ export const useTable = (
         }
     });
 
-    //数据处理
+    //訂閲数据处理
     const initSubscribeData = () => {
         if (routeName === "foundationSubscribeList") {
             if (Array.isArray(state.totalParam?.org_number) && state.totalParam?.org_number?.length) {
@@ -64,6 +64,13 @@ export const useTable = (
             }
         }
     };
+
+    //其他數據處理
+    const initData = () => {
+        if (state.totalParam?.warehouse_number) {
+            state.totalParam.warehouse_number = state.totalParam?.warehouse_number.split("_")[0];
+        }
+    };
     //删除临时参数和空值参数
     const deleteParams = () => {
         const KEY = ["Time", "customer_number1", "customer_numbers"];
@@ -81,12 +88,14 @@ export const useTable = (
         if (!api) return;
 
         try {
-            initSubscribeData();
-            deleteParams();
+            await initSubscribeData();
+            await deleteParams();
+            await initData();
             let params = {
                 ...state.totalParam,
                 ...pageParam.value
             };
+
             const { data } = await api(params);
             state.tableData = data.data || [];
             clearSelection && clearSelection();
@@ -136,6 +145,7 @@ export const useTable = (
             state.totalParam = {};
             // 同步到查询参数
             state.searchParam = { ...newVal };
+            console.log(state.searchParam, "=  state.searchParam=");
             // 同步到参数快照
             state.totalParam = { ...newVal, ...pageParam.value };
         },
diff --git a/src/views/foundation/set/material/constant/list/search.ts b/src/views/foundation/set/material/constant/list/search.ts
index 416b991..6d68b34 100644
--- a/src/views/foundation/set/material/constant/list/search.ts
+++ b/src/views/foundation/set/material/constant/list/search.ts
@@ -34,6 +34,22 @@ export const FORM_DATA: FormItem[] = [
         placeholder: "请输入品线",
         type: "input",
         label: "品线: "
+    },
+    {
+        prop: "disabled",
+        placeholder: "请选择",
+        type: "select",
+        label: "物料状态: ",
+        options: [
+            {
+                value: 1,
+                label: "禁用"
+            },
+            {
+                value: "启用",
+                label: "启用"
+            }
+        ]
     }
 ];
 
diff --git a/src/views/foundation/set/material/constant/list/table.ts b/src/views/foundation/set/material/constant/list/table.ts
index 59145ca..fe0444d 100644
--- a/src/views/foundation/set/material/constant/list/table.ts
+++ b/src/views/foundation/set/material/constant/list/table.ts
@@ -1,3 +1,4 @@
+import { RenderScope } from "@/components/ProTable/interface";
 export const COLUMNS = [
     { type: "selection", fixed: "left", width: 40 },
     {
@@ -69,5 +70,24 @@ export const COLUMNS = [
         label: "SPU",
         prop: "spu",
         width: 200
+    },
+    {
+        align: "left",
+        label: "物料状态",
+        prop: "disabled",
+        width: 200,
+        render: (scope: RenderScope<any>): VNode | string | any => {
+            const OBJ: any = {
+                0: "启用",
+                1: "禁用"
+            };
+            return OBJ[scope.row.disabled];
+        }
+    },
+    {
+        align: "left",
+        label: "更新时间",
+        prop: "updated_at",
+        width: 200
     }
 ];
diff --git a/src/views/foundation/set/material/index.vue b/src/views/foundation/set/material/index.vue
index 50c8d63..42ab52c 100644
--- a/src/views/foundation/set/material/index.vue
+++ b/src/views/foundation/set/material/index.vue
@@ -66,7 +66,7 @@ const selectionChange = (selection: any) => {
 };
 const handleButtonClickCallback = (item: any) => {
     const { type } = item;
-    // dataStore.selectionList, proTableRef
+
     btnClick[type]({
         selectionList: dataStore.selectionList,
         proTableRef,
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 0fa0cc7..caa1600 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -39,7 +39,7 @@ const getWarehousesList = async () => {
             data.forEach((item: any) => {
                 options.push({
                     id: item.id,
-                    value: item.warehouse_number,
+                    value: item.warehouse_number + "_" + item.id,
                     label: item.warehouse_name
                 });
             });