diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 203f159ba..b42c76c43 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -42,6 +42,8 @@
   <BasicForm
     ref="formRef"
     @success="getList"
+    :isOpenSearchTable="true"
+    :indexTableColumn="1"
     :rules="PurchasereceiptRequestMainRules"
     :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
     :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
@@ -56,7 +58,6 @@
     @submitForm="submitForm"
     @formFormDateChange="formFormDateChange"
   />
-
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -124,14 +125,18 @@ import {
   PurchasereceiptRequestDetail,
   PurchasereceiptRequestDetailRules,
   PurchasereceiptRequestDetailLabel,
-  PurchasereceiptRequestDetailPackingNumber
+  PurchasereceiptRequestDetailPackingNumber,
+  
  } from './purchasereceiptRequestMain.data'
+ import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
 import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { getAccessToken } from '@/utils/auth'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
@@ -166,17 +171,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       } else if(formField == 'poNumber') {
         row['poNumber'] = val[0]['number']
       } else if(formField == 'poLine'){
-        row['poLine'] = val[0]['lineNumber']
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        let supplierCode = formRef.formModel.supplierCode;
-        let itemCode = val[0]['itemCode']
-        let queryData = {
-          supplierCode:supplierCode,
-          itemCode:itemCode
-        } 
-        SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
-          row['defaultToLocationCode'] = res
+        //添加费用明细--点击确定
+        val.forEach(item=>{
+          if(tableData.value.find(item1=>item1['id'] == item['id'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+          newRow['poLine'] = item['lineNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['poNumber'] = item['number']
+          let supplierCode = formRef.formModel.supplierCode;
+          let queryData = {
+            supplierCode:supplierCode,
+            itemCode: item['itemCode']
+          } 
+          SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+            newRow['defaultToLocationCode'] = res
+            tableData.value.push(newRow)
+          })
         })
       }else if (formField == 'packQty'){
         row['packQty'] = val[0]['packQty']
@@ -186,6 +197,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       const setV = {}
       if(formField == 'supplierCode'){
         setV['supplierCode'] = val[0]['code']
+      }else if(formField == 'ppNumber') {
+        //新增--采购订单--
+        setV['supplierCode'] = val[0]['supplierCode']
+        setV['poNumber'] = val[0]['number']
+        const newRow = val[0]
+        newRow['poNumber'] = val[0]['number']
+        // 请求明细数据
+        getSearchTableData(val[0]['number'],val[0]['supplierCode'])
+        // tableData.value = [newRow]
+        // formRef.handleAddTable()
       }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
@@ -351,6 +372,35 @@ const labelPrint = async (row) => {
 }
 
 
+const getSearchTableData = async (number,supplierCode)=>{
+  const {tableObject ,tableMethods} = useTable({
+    defaultParams:{number},
+    getListApi: PurchaseDetailApi.getPurchaseDetailPage // 分页接口
+  })
+  // 获得表格的各种操作
+  const { getList:getList1 } = tableMethods
+  await getList1()
+  const tableColumns = PurchaseDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  
+  tableObject.tableList.forEach(row=>{
+    const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+    newRow['poLine'] = row['lineNumber']
+    newRow['itemCode'] = row['itemCode']
+    newRow['uom'] = row['uom']
+    newRow['poNumber'] =row['number']
+    let queryData = {
+      supplierCode,
+      itemCode:row['itemCode']
+    } 
+    SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+      newRow['defaultToLocationCode'] = res
+      tableData.value.push(newRow)
+    })
+  })
+}
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index e913161c7..acca1c4bd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -50,24 +50,24 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '采购订单',
+    field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择采购订单', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '采购订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseMainApi.getPurchaseMainPage, // 查询弹窗所需分页方法
       }
-    }
+    },
+    isForm: true,
   },
   {
     label: '发货单号',
@@ -79,42 +79,63 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: true,
   },
   {
-    label: '要货计划单号',
-    field: 'ppNumber',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'supplierCode',
-            value: 'supplierCode',
-            message: '请填写供应商代码！',
-            isMainValue: true
-          },
-          {
-            key: 'status',
-            value: 4,
-            isMainValue: false
-          },
-          {
-            key: 'available',
-            value: "TRUE",
-            isMainValue: false
-          }]
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
       }
-    },
-    isForm: true,
+    }
   },
+  // {
+  //   label: '要货计划单号',
+  //   field: 'ppNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+  //       searchField: 'number', // 查询弹窗赋值字段
+  //       searchTitle: '要货计划信息', // 查询弹窗标题
+  //       searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+  //       searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+  //       searchCondition: [
+  //         {
+  //           key: 'supplierCode',
+  //           value: 'supplierCode',
+  //           message: '请填写供应商代码！',
+  //           isMainValue: true
+  //         },
+  //         {
+  //           key: 'status',
+  //           value: 4,
+  //           isMainValue: false
+  //         },
+  //         {
+  //           key: 'available',
+  //           value: "TRUE",
+  //           isMainValue: false
+  //         }]
+  //     }
+  //   },
+  //   isForm: true,
+  // },
   {
     label: '承运商',
     field: 'carrierCode',
@@ -141,22 +162,22 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
+  // {
+  //   label: '数据来源',
+  //   field: 'sourceType',
+  //   dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     value: 'ASN_ExternalReceipt',
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   },
+  //   isSearch: false,
+  // },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -303,50 +324,50 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false,
   },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
-        }
-      }
-    }
-  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+  //     return userDeptArray.find((account) => account.id == cellValue)?.name
+  //   },
+  //   form: {
+  //     value: userDept.id,
+  //     component: 'Select',
+  //     api: () => userDeptArray,
+  //     componentProps: {
+  //       disabled: true,
+  //       optionsAlias: {
+  //         labelField: 'name',
+  //         valueField: 'id'
+  //       }
+  //     }
+  //   }
+  // },
   {
     label: '状态',
     field: 'status',
@@ -476,6 +497,9 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
 
 //表单校验
 export const PurchasereceiptRequestMainRules = reactive({
+  ppNumber: [
+    { required: true, message: '请输入采购订单', trigger: 'blur' }
+  ],
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
@@ -583,6 +607,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择订单行', // 输入框占位文本
       searchField: 'lineNumber', // 查询弹窗赋值字段
@@ -653,9 +678,49 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     },
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
   {
-    label: '数量',
-    field: 'qty',
+    label: '收货数量',
+    field: 'receivedQty',
     sort: 'custom',
     table: {
       width: 150
@@ -689,14 +754,76 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
   },
   {
     label: '默认到库位代码',
@@ -774,16 +901,16 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
     label: '到货日期',
     field: 'arriveDate',
@@ -836,6 +963,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       valueFormat: 'x',
     },
   },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -852,78 +990,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packQty',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packQty',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-    isTableForm: true,
-    isForm: true
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled:true
-    },
-    isTableForm: true,
-    isForm: true
-  },
+  
+  
   {
     label: '供应商计量数量',
     field: 'supplierPackQty',