From cb47d3f3a14219534644a19040a791b02c6a8efe Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 25 Nov 2024 16:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue        |  7 +++-
 .../relegateRequestMain.data.ts               | 39 +++++++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 4e1b6747a..5288c8a37 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -195,8 +195,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['fromLocationCode'] = item['locationCode']
           newRow['toLocationCode'] = item['locationCode']
           newRow['inventoryStatus'] = item['inventoryStatus']
-          newRow['packUnit'] = item['packUnit']
-          newRow['packQty'] = item['packQty']
+          // newRow['packUnit'] = item['packUnit']
+          // newRow['packQty'] = item['packQty']
           tableData.value.push(newRow)
         })
         let itemCodes = []
@@ -234,6 +234,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         // console.log(row['itemCode']);
         // ItembasicApi.getItemListByCodes(row['itemCode'])
         row['downItemCode'] = val[0]['code']
+      } else if (formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       }  else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 0c61fb19e..bb1cec0eb 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -446,14 +446,18 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '包装规格信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
+        },{
+          key: 'downItemCode',
+          value: 'downItemCode',
+          message: '请选择物料代码',
+          isTableRowValue: true, 
+          isMainValue:false
         }],
         verificationParams: [{
           key: 'code',
@@ -464,6 +468,33 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true
         }], // 失去焦点校验参数
       }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '包装规格信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'downItemCode',
+        value: 'downItemCode',
+        message: '请选择物料代码',
+        isTableRowValue: true, 
+        isMainValue:false
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }], // 失去焦点校验参数
     }
   },
   {