From 6f5acd850c7776159f737535c43413ce34d350f6 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 08:35:05 +0800
Subject: [PATCH] =?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

---
 .../strategySetting/strategy/upShelfStrategy/AddForm.vue   | 2 +-
 .../customerreturn/customerreturnRequestMain/index.vue     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 75e35be3e..69b2ddad1 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -687,7 +687,7 @@ const filterMethod = (query: string) => {
       return item.name.includes(query)
     })
   } else {
-    options.supplierList = []
+    options.supplierList = [...options.orignSupplierList]
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 4ed29a7e3..ee33f9cee 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -147,6 +147,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     })
 
     console.log(128, customerCode.value)
+    
     if (type == 'tableForm') {
       if(formField == 'packingNumber') {
         row['packingNumber'] = val[0]['packingNumber']
@@ -156,6 +157,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['fromLocationCode'] = val[0]['locationCode']
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
+      }else if(formField == 'toLocationCode') {
+        //到库位代码
+        row['toLocationCode'] = val[0]['code']
       } else {
         row[formField] = val[0][searchField]
       }
@@ -172,11 +176,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // 获取子表数据 
         DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']})
         .then(res => {
+          
           res.list.forEach(obj => {
             let value = null
             value = obj.fromLocationCode
             obj.fromLocationCode = obj.toLocationCode
-            obj.toLocationCode = value
+            obj.toLocationCode = ''
             CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{
               if(item.field == 'packingNumber') {
               item.isInpuFocusShow = false