From eeb3b5bb16d760f232ac2e7a26fdfa37c9a78125 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 15 Mar 2024 15:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=8C=BA=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemarea/index.vue              | 18 +++++++++++-------
 .../itemManage/itemarea/itemarea.data.ts       | 17 +++++++++++++++++
 .../inventorymoveRequestMain/index.vue         |  2 ++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index c89bde0ee..132062985 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -115,18 +115,22 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
-      if(formField == 'locationGroupCode') {
-        row['locationGroupCode'] = val[0]['code']
-      }else if(formField == 'locationCode') {
+      if(formField == 'locationCode') {
         row['locationCode'] = val[0]['code']
       }else{ 
         row[formField] = val[0][searchField]
       }
+    }else{
+      const setV = {}
+      if(formField == 'areaCode') {
+        console.log(val[0]);
+        setV['areaCode'] = val[0]['code']
+        setV['areaType'] = val[0]['type']
+      }else{ 
+        setV[formField] = setV[0][searchField]
+      }
+      formRef.setValues(setV)
     }
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-    
   })
 }
 // 查询页面返回——详情
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index caa6c1f06..43e97c5fd 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -68,6 +68,23 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '入库包装规格',
     field: 'inPackUnit',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index d02106a9e..a35ce47cc 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -597,6 +597,8 @@ const submitForm = async (formType, data) => {
   let isExist = false
   tableData.value.forEach(item => {
    let rs =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber))
+   console.log(rs);
+   
    if(rs.length > 1) isExist = true
   })
   if (isExist) {