From 24fffc0b49063a56f739d3bcf455962f97338a19 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 12 Mar 2024 10:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factoryModeling/location/location.data.ts | 32 +++++++++----------
 .../itemManage/itempackage/index.vue          |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 2765c0899..9f77b5873 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -119,29 +119,29 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: 'ERP库位类型',
-    field: 'erpLocationCode',
-    dictType: DICT_TYPE.ERP_LOCATION,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
   // {
-  //   label: '类型',
-  //   field: 'type',
-  //   dictType: DICT_TYPE.LOCATION_TYPE,
+  //   label: 'ERP库位类型',
+  //   field: 'erpLocationCode',
+  //   dictType: DICT_TYPE.ERP_LOCATION,
   //   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',
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 5cac13b03..3bb0d6bc3 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -60,7 +60,7 @@
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
-    url="/wms/itempackage/import"
+    url="/wms/itempackaging/import"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
   />