From b3d32863645bb26e7945dd3bc623bceb82136354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 5 Feb 2024 09:39:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=B1=BB=E5=9E=8B=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=20=E8=A1=A5=E5=85=A8=E5=BA=93=E5=8C=BA=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../areabasic/areabasic.data.ts               |  3 ++
 .../factoryModeling/location/location.data.ts | 30 +++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 14bf2a9c3..630c69b7b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -225,4 +225,7 @@ export const AreaRules = reactive({
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ],
 })
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index d92288446..8c8308e31 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -130,18 +130,18 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '类型',
-    field: 'type',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '类型',
+  //   field: 'type',
+  //   dictType: DICT_TYPE.LOCATION_TYPE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '巷道',
     field: 'aisle',
@@ -396,9 +396,9 @@ export const LocationRules = reactive({
   erpLocationCode: [
     { required: true, message: '请选择ERP库位类型', trigger: 'change' }
   ],
-  type: [
-    { required: true, message: '请选择类型', trigger: 'change' }
-  ],
+  // type: [
+  //   { required: true, message: '请选择类型', trigger: 'change' }
+  // ],
   pickPriority: [
     { required: true, message: '请输入拣料优先级', trigger: 'blur' }
   ],