diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index b17908398..76405880a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -182,7 +182,8 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.id
+      masterId: row.masterId,
+      itemCode: row.itemCodeThird
     }
     await getDetailListBom()
   }
@@ -204,7 +205,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  //defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index a92256862..9274b2073 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -384,7 +384,7 @@ export const ProductscrapRecordMain = useCrudSchemas(
       field: 'available',
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
-      isSearch: true,
+      isSearch: false,
       isTable: false,
       sort: 'custom',
       table: {
@@ -482,29 +482,30 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '制品物料代码',
     field: 'itemCode',
+    isSearch:true,
     sort: 'custom',
     table: {
       width: 150
     }
   },
   {
-    label: '物料名称',
+    label: '制品物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  {
-    label: 'Bom版本',
-    field: 'bomVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: 'Bom版本',
+  //   field: 'bomVersion',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '批次',
     field: 'batch',
@@ -515,7 +516,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '报废数量',
+    label: '制品报废数量',
     field: 'qty',
     sort: 'custom',
     table: {
@@ -526,7 +527,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '计量单位',
+    label: '制品计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
@@ -537,9 +538,52 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单价',
-    field: 'singlePrice',
+    label: '原料物料代码',
+    field: 'itemCodeThird',
+    sort: 'custom',
+    isSearch:true,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '原料物料名称',
+    field: 'itemNameThird',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料报废数量',
+    field: 'qtyThird',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '原料计量单位',
+    field: 'uomThird',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '原料单价',
+    field: 'singlePriceThird',
     sort: 'custom',
+    isTable: true,
     table: {
       width: 150
     },
@@ -548,9 +592,10 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '金额',
-    field: 'amount',
+    label: '原料金额',
+    field: 'amountThird',
     sort: 'custom',
+    isTable: true,
     table: {
       width: 150
     },