diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index c3e5592b5..5963f219d 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -127,6 +127,38 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '到仓库',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: true,
+    isTableForm:false,
+    isDetail:false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '到库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: true,
+    isTableForm:false,
+    isDetail:false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    }
+  },
   {
     label: '发货类型',
     field: 'deliverType',
@@ -800,61 +832,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '到仓库',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库位',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位基础信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'areaType',
-        value: "deliverType",
-        message:"请选择发货类型",
-        isMainValue: true
-    }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位基础信息',
-        searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'areaType',
-          value: "deliverType",
-          message:"请选择发货类型",
-          isMainValue: false
-      }]
-      }
-    },
-  },
   {
     label: '库存状态',
     field: 'inventoryStatus',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index fb6bd2c07..bb5838ae1 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -168,6 +168,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           console.log( val[0]);
           row['uom'] = val[0]['customerUom']
         }
+      } else if(formField == 'customerDockCode') {
+        //客户月台
+        setV['toWarehouseCode'] = val[0]['warehouseCode']//到仓库
+        setV['toLocationCode'] = val[0]['defaultLocationCode']//到库位
       } else {
         setV[formField] = val[0][searchField]
       }
@@ -494,7 +498,12 @@ const flag = ref(false)
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  flag.value = false
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(item=>{
+    item.toWarehouseCode = data.toWarehouseCode
+    item.toLocationCode = data.toLocationCode
+  })
   let isExist = false
   tableData.value.forEach(item => {
    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))