From dd6bb143bb7c8bf33665aada65ac538e2e12c2ca Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 29 May 2024 11:17:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceipt/unplannedreceiptRequestMain/index.vue  | 1 +
 .../unplannedreceiptRequestMain.data.ts                     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 167761dc5..25d4b91b0 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         } else {
           row['itemCode'] = val[0]['code']
           row['uom'] = val[0]['uom']
+          row['singlePrice'] = val[0]['price']
         }
       } else if(formField === 'costcentreCode'){
         row['costcentreCode'] = val[0]['costcentreCode']
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 0df221d91..502d4cfe0 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -532,6 +532,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -543,6 +544,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -581,7 +583,8 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {
@@ -602,6 +605,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       type: 'InputNumber',
       min: 0,
       precision: 6,
+      disabled: true
     },
   },
   {

From d6d477725d898deaddadb366bdce23fe5630e04a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 29 May 2024 11:27:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/upShelfStrategy/AddForm.vue               | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index c1c28fdab..48fa418c5 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -674,19 +674,23 @@ const buttonBaseClick = (val, item) => {
 // 获取供应商列表
 const getFormSupplierList = async () => {
 
-  options.originSupplierList = await getSupplierList()
+  options.originSupplierList = await getSupplierList(null)
   options.supplierList = [...options.originSupplierList]
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
 
-  options.originSupplierList = await getCustomerList()
+  options.originSupplierList = await getCustomerList(null)
   options.supplierList = [...options.originSupplierList]
 }
 const filterMethod = (query: string) => {
   if (query) {
     options.supplierList = options.originSupplierList.filter((item) => {
-      return item.name.includes(query)
+      if(item.name==''){
+        return item.code.includes(query)
+      }else{
+        return item.name.includes(query)
+      }
     })
   } else {
     options.supplierList = [...options.originSupplierList]