diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index cff1dd556..b22dae6b4 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -75,10 +75,35 @@ export const deleteProductreceiptJobMain = async (id: number) => {
 
 // 导出制品收货任务主 Excel
 export const exportProductreceiptJobMain = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productreceipt-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeProductreceiptMain = async (data) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/execute`, data})
 }
\ No newline at end of file
diff --git a/src/api/wms/scrapRequestMain/index.ts b/src/api/wms/scrapRequestMain/index.ts
index 0f4ddf2d9..6a6ef1f40 100644
--- a/src/api/wms/scrapRequestMain/index.ts
+++ b/src/api/wms/scrapRequestMain/index.ts
@@ -65,4 +65,34 @@ export const exportScrapRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/scrap-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-报废出库申请
+export const closeScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/close?id=` + id })
+}
+
+// 重新添加-报废出库申请
+export const reAddScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-报废出库申请
+export const submitScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/submit?id=` + id })
+}
+
+// 审批驳回-报废出库申请
+export const refusedScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/refused?id=` + id })
+}
+
+// 审批通过-报废出库申请
+export const agreeScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/agree?id=` + id })
+}
+
+// 处理-报废出库申请
+export const handleScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/handle?id=` + id })
+}
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 2006758a8..8c6be92e4 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <supplierIndex/>
-    <warehouseKeeper v-hasRole="['role2']"/>
-    <productWarehouseKeeper v-hasRole="['role3']"/>
-    <productionManager v-hasRole="['role4']"/>
+    <supplierIndex v-hasRole="['super_admin','supplier']"/>
+    <warehouseKeeper v-hasRole="['super_admin']"/>
+    <productWarehouseKeeper v-hasRole="['super_admin']"/>
+    <productionManager v-hasRole="['super_admin']"/>
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 4444c0470..fe956356e 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -227,8 +227,8 @@ const handleExport = async () => {
   }
 }
 
-const BASE_URL = 'http://dev.ccwin-in.com:25110'
-const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+const BASE_URL = import.meta.env.VITE_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/894718245021065216?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {
   window.open(src.value+'&id='+id)
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index 61a2347fe..b21412d67 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -227,8 +227,8 @@ const handleExport = async () => {
   }
 }
 
-const BASE_URL = 'http://dev.ccwin-in.com:25110'
-const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+const BASE_URL = import.meta.env.VITE_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {
   window.open(src.value+'&id='+id)
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
index 1e63ae62f..c393ddab1 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 7905f7b7b..50d4fb319 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -186,30 +186,36 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:scrap-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:scrap-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:scrap-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:scrap-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-request-main:delete'}), // 删除
     ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  }  else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -217,6 +223,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await ScrapRequestMainApi.closeScrapRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await ScrapRequestMainApi.reAddScrapRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await ScrapRequestMainApi.submitScrapRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await ScrapRequestMainApi.refusedScrapRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await ScrapRequestMainApi.agreeScrapRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await ScrapRequestMainApi.handleScrapRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 2f4d3e21f..ae33afd0f 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -18,6 +18,8 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -105,7 +107,35 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    isForm: false,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '从库位类型范围',
@@ -377,6 +407,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品名称',
@@ -387,6 +420,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品描述1',
@@ -415,6 +451,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '包装号',
@@ -429,7 +468,16 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        isMainValue: true
+      },{
+        key: 'inventoryStatus',
+        value: 'SCRAP',
+        isMainValue: false
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -439,7 +487,16 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true
+        },{
+          key: 'inventoryStatus',
+          value: 'SCRAP',
+          isMainValue: false
+        }]
       }
     }
   },
@@ -450,6 +507,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '数量',
@@ -492,6 +552,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '库存状态',
@@ -647,4 +710,4 @@ export const ScrapRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 97ccbb965..cdc3167ab 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -90,12 +90,6 @@ const updataTableColumns = (val) => {
 
 // 查询列表页面参数设置
 const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
 ])
 
 // 查询页面返回
@@ -103,29 +97,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
-      //row['batch'] = val[0]['toBatch']
-      //row['altBatch'] = val[0]['altBatch']
-      //row['itemCode'] = val[0]['itemCode']
-      //row['itemName'] = val[0]['itemName']
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
+      row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
   getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainPage // 分页接口
@@ -177,20 +156,101 @@ const butttondata = (row) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
-    console.log('列表-操作按钮事件-执行')
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromLocationTypes": "WIP",
+    "toLocationTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "stdPackQty": 8,
+    "stdPackUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物品01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    console.log('列表-操作按钮事件-放弃')
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
   } else if (val == 'mainJobClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
   } else if (val == 'mainJobAcc') { // 承接
-    console.log('列表-操作按钮事件-承接')
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
   }
 }
 
@@ -208,8 +268,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(setSearchParams)
-    download.excel(data, '制品收货任务主.xlsx')
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
+    download.excel(data, '制品收货任务.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 147ded08f..099526119 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -522,16 +522,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
-    },
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 75b52130c..1ba1b1db3 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -57,15 +57,39 @@
     :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductreceiptRecordDetailRules"
     :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules } from './productreceiptRecordMain.data'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptRecordMain.data'
 import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 
 // 制品收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
@@ -77,6 +101,25 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -158,6 +201,18 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index ab1cdc077..df5a44962 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -336,7 +336,7 @@ export const ProductreceiptRecordMainRules = reactive({
 export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产线代码',
-    field: 'productionLineCode',
+    field: 'productionlineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -636,6 +636,17 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 570fa03a8..339680630 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -67,7 +67,6 @@
     :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
     :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
     :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
-    :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
@@ -193,10 +192,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainPage // 分页接口
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
index 8b07bf673..b83e5688f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
@@ -227,8 +227,8 @@ const handleExport = async () => {
   }
 }
 
-const BASE_URL = 'http://dev.ccwin-in.com:25110'
-const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+const BASE_URL = import.meta.env.VITE_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {
   window.open(src.value+'&id='+id)