Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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]
   }
 }
 

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