From 481927a1de6ed417d29d98f0e8acf1b6d28f940c Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 17 May 2024 16:16:03 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=AB=E6=96=99=E6=A0=87=E7=AD=BE-?=
 =?UTF-8?q?-=E6=96=B0=E5=A2=9E--=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2--=E5=B1=95=E7=A4=BA=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=202=E3=80=81=20=20=20=20la?=
 =?UTF-8?q?bel:=20'=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7',?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callmaterials/callmaterials.data.ts       | 23 +++++++++++++++----
 .../labelManage/callmaterials/index.vue       |  4 ++--
 .../purchasereturnRequestMain.data.ts         | 10 ++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index eb1e78e45..216b92563 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -3,6 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as PackageunitApi from '@/api/wms/packageunit'
@@ -68,12 +70,23 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        isSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        }]
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index 5e23364c5..dea316f10 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -87,8 +87,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if (formField == 'itemCode') {
       setV['itemCode'] = val[0]['code']
     } else  if (formField == 'packUnit') {
-      setV['uom'] = val[0]['unit']
-      setV['packUnit'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+      setV['packUnit'] = val[0]['packUnit']
     }else {
       setV[formField] = val[0][searchField]
     }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index f99cf21fb..2dbadc3fe 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -41,6 +41,16 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '采购收货记录单号',
+    field: 'number',
+    fixed: 'left',
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+    isSearch: true
+  },
   {
     label: '发货单号',
     field: 'asnNumber',