From 696e85cf6422c703fbba63df097320bd813d9926 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 14 七月 2026 15:40:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/basicData/mdm/data.ts |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/views/basicData/mdm/data.ts b/src/views/basicData/mdm/data.ts
index 35507c1..f294908 100644
--- a/src/views/basicData/mdm/data.ts
+++ b/src/views/basicData/mdm/data.ts
@@ -4,9 +4,8 @@
 import { CommonStatusEnum, DICT_TYPE } from "#/packages/constants/src";
 import { getDictOptions } from "#/packages/effects/hooks/src";
 
-import { z } from "#/adapter/form";
-import { getUnitPage } from "#/api/mdm/unit";
-import { getWarehouseSimpleList } from "#/api/erp/stock/warehouse";
+import { z } from '#/adapter/form';
+import { getUnitPage } from '#/api/mdm/unit';
 
 /** 鐗╂枡绫诲瀷閫夐」 */
 export const ITEM_TYPE_OPTIONS = [
@@ -154,15 +153,11 @@
       },
     },
     {
-      component: "ApiSelect",
-      fieldName: "warehouseId",
-      label: "榛樿浠撳簱",
+      component: 'Input',
+      fieldName: 'warehouseId',
+      label: '榛樿浠撳簱',
       componentProps: {
-        placeholder: "璇烽�夋嫨榛樿浠撳簱",
-        allowClear: true,
-        api: getWarehouseSimpleList,
-        labelField: "name",
-        valueField: "id",
+        placeholder: '璇疯緭鍏ラ粯璁や粨搴揑D',
       },
     },
     {
@@ -240,9 +235,10 @@
       },
     },
     {
-      component: "Switch",
-      fieldName: "isBatchManaged",
-      label: "鎵规绠$悊",
+      component: 'Switch',
+      fieldName: 'isBatchManaged',
+      label: '鎵规绠$悊',
+      defaultValue: true,
       componentProps: {
         class: "w-auto",
         checkedChildren: "鏄�",

--
Gitblit v1.9.3