diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue
index b209262..fee04e9 100644
--- a/src/components/SearchForm/index.vue
+++ b/src/components/SearchForm/index.vue
@@ -348,7 +348,7 @@ const handleTagRemove = (item: any) => {
         item.options = [];
     }
     const { prop } = item;
-    if (prop === "kd_warehouse_number" || prop === "kd_subwarehouse") {
+    if (prop === "kd_warehouse_number" || prop === "kd_subwarehouse_number") {
         emits("selectMultipleRemoveTag", { item, org_number: _searchParams.value[prop] });
     }
 };
diff --git a/src/hooks/useTable.ts b/src/hooks/useTable.ts
index 97bb238..03cbe5b 100644
--- a/src/hooks/useTable.ts
+++ b/src/hooks/useTable.ts
@@ -73,8 +73,8 @@ export const useTable = (
                 state.totalParam.kd_warehouse_number = state.totalParam.kd_warehouse_number.join(",");
             }
             //金蝶子仓库
-            if (Array.isArray(state.totalParam?.kd_subwarehouse) && state.totalParam?.kd_subwarehouse?.length) {
-                state.totalParam.kd_subwarehouse = state.totalParam.kd_subwarehouse.join(",");
+            if (Array.isArray(state.totalParam?.kd_subwarehouse_number) && state.totalParam?.kd_subwarehouse_number?.length) {
+                state.totalParam.kd_subwarehouse_number = state.totalParam.kd_subwarehouse_number.join(",");
             }
         }
     };
diff --git a/src/views/foundation/set/warehouse/constant/list/details.ts b/src/views/foundation/set/warehouse/constant/list/details.ts
index 2b93495..a1b23f5 100644
--- a/src/views/foundation/set/warehouse/constant/list/details.ts
+++ b/src/views/foundation/set/warehouse/constant/list/details.ts
@@ -20,7 +20,7 @@ export const DETAILS_FORM_DATA: any[] = [
         options: []
     },
     {
-        prop: "kd_subwarehouse",
+        prop: "kd_subwarehouse_number",
         placeholder: "请选择",
         type: "selectMultiples",
         label: "金蝶子仓库:",
diff --git a/src/views/foundation/set/warehouse/constant/list/search.ts b/src/views/foundation/set/warehouse/constant/list/search.ts
index 51ea56c..c7398b9 100644
--- a/src/views/foundation/set/warehouse/constant/list/search.ts
+++ b/src/views/foundation/set/warehouse/constant/list/search.ts
@@ -30,15 +30,16 @@ export const FORM_DATA: FormItem[] = [
         label: "金蝶仓库: ",
         options: []
     },
+
     {
-        prop: "kd_subwarehouse",
+        prop: "kd_subwarehouse_number",
         placeholder: "请输入金蝶子仓库",
         type: "selectRemoteKDSubwarehouse",
         label: "金蝶子仓库: ",
         options: []
     },
     {
-        prop: "operator_name",
+        prop: "operator",
         placeholder: "请输入更新人",
         type: "input",
         label: "更新人: "
diff --git a/src/views/foundation/set/warehouse/constant/list/table.ts b/src/views/foundation/set/warehouse/constant/list/table.ts
index 8b50b6b..09da411 100644
--- a/src/views/foundation/set/warehouse/constant/list/table.ts
+++ b/src/views/foundation/set/warehouse/constant/list/table.ts
@@ -1,4 +1,4 @@
-// import { RenderScope } from "@/components/ProTable/interface";
+import { RenderScope } from "@/components/ProTable/interface";
 export const COLUMNS = [
     { type: "selection", fixed: "left", width: 40 },
     {
@@ -18,9 +18,18 @@ export const COLUMNS = [
     {
         align: "left",
         label: "金蝶子仓库",
-        prop: "kd_subwarehouse",
+        prop: "kd_subwarehouse_number",
+        width: 400,
         fixed: true,
-        width: 200
+        render: (scope: RenderScope<any>): VNode | string | any => {
+            let arr: any = [];
+            if (Array.isArray(scope.row.kd_subwarehouse) && scope.row.kd_subwarehouse.length) {
+                scope.row.kd_subwarehouse?.forEach((item: any) => {
+                    arr.push(item.subwarehouse_name);
+                });
+            }
+            return Array.isArray(arr) && arr.length ? arr.join(",") : "";
+        }
     },
     {
         align: "left",
@@ -34,15 +43,22 @@ export const COLUMNS = [
         prop: "lx_warehouse_name",
         width: 200
     },
+    {
+        align: "left",
+        label: "备注",
+        prop: "remark",
+        width: 200
+    },
     {
         align: "left",
         label: "更新人",
-        prop: "creator"
+        prop: "operator"
     },
 
     {
         align: "left",
         label: "更新时间",
-        prop: "created_at"
+        prop: "updated_at",
+        width: 200
     }
 ];
diff --git a/src/views/foundation/set/warehouse/index.vue b/src/views/foundation/set/warehouse/index.vue
index e25e208..487c8b7 100644
--- a/src/views/foundation/set/warehouse/index.vue
+++ b/src/views/foundation/set/warehouse/index.vue
@@ -40,9 +40,10 @@
                     @selectMultipleRemoveTag="handleSelectMultipleRemoveTag"
                 />
             </template>
-            <template #platform_store_name="scope">
+
+            <template #kd_warehouse_name="scope">
                 <a @click="handleOpen(scope.row)" class="break-word to-details">
-                    {{ scope.row.platform_store_name }}
+                    {{ scope.row.kd_warehouse_name }}
                 </a>
             </template>
         </ProTable>
@@ -156,8 +157,20 @@ const getWarehouseDetails = async (id: any) => {
     if (result?.code === 0) {
         dataStore.dialogVisible = true;
         dataStore.title = "编辑金蝶子仓与各系统仓库关系";
-        setAccessSystem(result?.data?.access_system);
         dataStore.detailsRuleForm = result?.data;
+        //临时变量存储金蝶和金蝶子仓库
+        let kd_warehouse_number = dataStore?.detailsRuleForm?.kd_warehouse_number;
+        let kd_subwarehouse = dataStore?.detailsRuleForm?.kd_subwarehouse;
+        //判断金蝶仓库和金蝶子仓库是否存在
+        if (kd_warehouse_number && Array.isArray(kd_subwarehouse) && kd_subwarehouse.length) {
+            let kd_subwarehouse_number: any[] = [];
+            dataStore?.detailsRuleForm?.kd_subwarehouse?.forEach((item: any) => {
+                kd_subwarehouse_number.push(item.subwarehouse_number);
+            });
+            nextTick(() => {
+                dataStore.detailsRuleForm.kd_subwarehouse_number = kd_subwarehouse_number;
+            });
+        }
     }
 };
 //获取金蝶仓库
@@ -259,9 +272,9 @@ const handleCommit = () => {
         return useMsg("warning", "金蝶仓库不能为空 !");
     }
     //将金蝶子仓库转换为字符串
-    let kd_subwarehouse = params.kd_subwarehouse;
-    if (Array.isArray(kd_subwarehouse) && kd_subwarehouse.length) {
-        params.kd_subwarehouse = kd_subwarehouse.join(",");
+    let kd_subwarehouse_number = params.kd_subwarehouse_number;
+    if (Array.isArray(kd_subwarehouse_number) && kd_subwarehouse_number.length) {
+        params.kd_subwarehouse_number = kd_subwarehouse_number.join(",");
     }
 
     if (dataStore.title === "新增金蝶子仓与各系统仓库关系") {
@@ -301,20 +314,6 @@ const handleSelectMultipleRemoveTag = (params: any) => {
     const { item } = params;
     const { prop } = item;
     const paramValue = dataStore.initParam[prop]; // 获取当前参数值
-    console.log(paramValue, "=============");
-    // // 核心：兼容多种参数类型，解析为「去重数组」（容错处理）
-    // let remainingValues: string[] = [];
-    // if (typeof paramValue === "string" && paramValue.trim()) {
-    //     // 情况1：参数是有效字符串 → 分割为数组
-    //     remainingValues = Array.from(new Set(paramValue.split(",").filter(val => val.trim())));
-    // } else if (Array.isArray(paramValue)) {
-    //     // 情况2：参数是数组 → 直接去重
-    //     remainingValues = Array.from(new Set(paramValue.filter(val => val && val.trim())));
-    // } else {
-    //     // 情况3：参数是undefined/null/空值 → 空数组
-    //     remainingValues = [];
-    // }
-
     // 根据字段标识分发处理逻辑
     switch (prop) {
         case "use_org_number":
@@ -323,7 +322,7 @@ const handleSelectMultipleRemoveTag = (params: any) => {
         case "kd_warehouse_number":
             handleKdWarehouseTagRemove(paramValue);
             break;
-        case "kd_subwarehouse":
+        case "kd_subwarehouse_number":
             handleKdSubWarehouseTagRemove(paramValue);
             break;
         default:
@@ -352,7 +351,7 @@ const handleOrgTagRemove = (remainingOrgValues: any[]) => {
     dataStore.formData[1].options = filteredWarehouses;
 
     // 4. 重置子仓库状态（仓库变化后必须清空）
-    dataStore.initParam.kd_subwarehouse = "";
+    dataStore.initParam.kd_subwarehouse_number = "";
     dataStore.formData[2].options = [];
 };
 
@@ -373,7 +372,7 @@ const handleKdWarehouseTagRemove = (remainingWarehouseValues: any[]) => {
     }
 
     // 3. 重置子仓库状态（清空已选+更新选项）
-    dataStore.initParam.kd_subwarehouse = "";
+    dataStore.initParam.kd_subwarehouse_number = "";
     dataStore.formData[2].options = [];
     dataStore.formData[2].options = filteredSubWarehouses;
 };
@@ -391,8 +390,11 @@ watch(
     () => dataStore.dialogVisible,
     (newVal: any) => {
         if (newVal) {
+            //金蝶倉庫
             getSetWarehouseKingdeeList();
+            //领星仓库
             getSetWarehouseSubwarehousesLingXingList();
+            //聚水潭仓库
             getSetWarehouseSubwarehousesJushuitanList();
         }
     },
@@ -406,11 +408,11 @@ watch(
     (newVal: any) => {
         if (newVal) {
             dataStore.detailsRuleForm.kd_warehouse_number = "";
-            dataStore.detailsRuleForm.kd_subwarehouse = "";
+            dataStore.detailsRuleForm.kd_subwarehouse_number = "";
             getSetWarehouseKingdeeList();
         } else {
             dataStore.detailsRuleForm.kd_warehouse_number = "";
-            dataStore.detailsRuleForm.kd_subwarehouse = "";
+            dataStore.detailsRuleForm.kd_subwarehouse_number = "";
         }
     }
 );
@@ -419,10 +421,10 @@ watch(
     () => dataStore.detailsRuleForm.kd_warehouse_number,
     (newVal: any) => {
         if (newVal) {
-            dataStore.detailsRuleForm.kd_subwarehouse = "";
+            dataStore.detailsRuleForm.kd_subwarehouse_number = "";
             getSetWarehouseSubwarehousesList();
         } else {
-            dataStore.detailsRuleForm.kd_subwarehouse = "";
+            dataStore.detailsRuleForm.kd_subwarehouse_number = "";
         }
     }
 );