diff --git a/src/api/wms/qadproductionplan/index.ts b/src/api/wms/qadproductionplan/index.ts
index c25893833..5eda9dfeb 100644
--- a/src/api/wms/qadproductionplan/index.ts
+++ b/src/api/wms/qadproductionplan/index.ts
@@ -26,6 +26,17 @@ export const getQadProductionPlanMainPage = async (params) => {
     return await request.get({ url: `/wms/qad-production-plan-main/page`, params })
   }
 }
+export const getQadProductionPlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/qad-production-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/qad-production-plan-detail/page`, params })
+  }
+}
+
+
 
 // 查询QAD生产计划主详情
 export const getQadProductionPlanMain = async (id: number) => {
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
index 1b0427298..333e11c55 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: QadProductionPlanMainApi.getQadProductionPlanMainPage // 分页接口
+  getListApi: QadProductionPlanMainApi.getQadProductionPlanDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
index 01a9d1b4a..93884b7a8 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const QadProductionPlanMainRules = reactive({
@@ -9,35 +9,31 @@ export const QadProductionPlanMainRules = reactive({
 })
 
 export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '顺序',
-    field: 'displayOrder',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    table: {
+      width: 350,
+    }
   },
   {
-    label: '车间',
-    field: 'workshop',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150,
+    }
   },
   {
-    label: '生产线',
-    field: 'productionLine',
+    label: '计划数量',
+    field: 'planQty',
     sort: 'custom',
-    isSearch: true,
   },
   {
-    label: '班次',
-    field: 'shift',
+    label: '生产线',
+    field: 'productionLine',
     sort: 'custom',
     isSearch: true,
   },
@@ -50,7 +46,7 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划日期',
     field: 'planDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -59,11 +55,6 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '明细列表',
-    field: 'details',
-    sort: 'custom',
-  },
   {
     label: '计划类型',
     field: 'planType',
@@ -80,33 +71,33 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'SelectV2'
     },
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '订单号',
-    field: 'woNumber',
-    sort: 'custom',
-  },
-  {
-    label: '订单行',
-    field: 'woLine',
-    sort: 'custom',
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  // },
   // {
   //   label: '操作',
   //   field: 'action',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 33c1ce108..3533aaab0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -15,15 +15,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    isSearch: true
-  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -31,6 +22,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -40,8 +32,38 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    sortTableDefault:2,
     isForm: false
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sortTableDefault:10,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isSearch: true
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -541,6 +563,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '订单行',
@@ -550,6 +573,22 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '物流收货单号',
+    field: 'recvBillNum',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '单据号',
     field: 'number',
@@ -566,6 +605,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    sortTableDefault:8,
   },
   {
     label: '供应商代码',
@@ -579,10 +619,48 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    sortTableDefault:3,
     table: {
       width: 150
     },
   },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
   {
     label: '物料名称',
     field: 'itemName',