From 9155229a28f81fb4a065786a10fa04f03baaf50c Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 17 Jun 2024 11:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleShipmentMainRequest/index.vue         |  4 +++-
 .../saleShipmentMain.data.ts                  | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index a2e6ee052..0bdb20cf5 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -117,7 +117,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['projectCode'] = val[0]['projectCode']
         row['uom'] = val[0]['uom']
       }else if(formField == 'fromLocationCode'){
-        row['fromLocationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['defaultLocationCode']
       }
     }else {
       const setV = {}
@@ -142,6 +142,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['itemCode'] = val[0]['itemCode']
       setV['projectCode'] = val[0]['projectCode']
       setV['uom'] = val[0]['uom']
+    }else  if(formField == 'fromLocationCode') {
+      setV['fromLocationCode'] = val[0]['defaultLocationCode']
     }else {
       setV[formField] = val[0][searchField]
     }
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index b61c881fe..fbf89bcc2 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -9,6 +9,9 @@ import { SaleDetailAndMain } from '@/views/wms/deliversettlementManage/deliverpl
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
+import * as CustomerdockApi from '@/api/wms/customerdock'
+import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data'
+
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -359,12 +362,18 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchListPlaceholder: '请选择客户库位代码',
       searchField: 'code',
       searchTitle: '库位基础信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.selectConfigToLocation,
+      searchAllSchemas: Customerdock.allSchemas,
+      searchPage: CustomerdockApi.getCustomerdockPage,
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+      },
+      {
+        key: 'customerCode',
+        value: 'customerCode',
+        message: '请填写客户代码！',
+        isMainValue: true
       }]
     },
     form: {
@@ -379,6 +388,12 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'customerCode',
+          value: 'customerCode',
+          message: '请填写客户代码！',
+          isMainValue: true
         }]
       }
     },