diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 2cc34ba9d..47e324345 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainJob.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainJob.allSchemas.searchSchema,...StockupDetailJob.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainJob.allSchemas"
+      :detailAllSchemas="StockupDetailJob.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainJob.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainJob.allSchemas.tableColumns,...StockupDetailJob.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -179,7 +180,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
@@ -193,11 +198,11 @@ const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
     handleHandle
   } else if (val == 'mainJobAba') { // 放弃
-    StockupJobMainApi.abandonStockupMainJob(row.id)
+    StockupJobMainApi.abandonStockupMainJob(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    StockupJobMainApi.closeStockupMainJob(row.id)
+    StockupJobMainApi.closeStockupMainJob(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    StockupJobMainApi.acceptStockupMainJob(row.id)
+    StockupJobMainApi.acceptStockupMainJob(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
index 55f3d28ac..db0df9c55 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainRecord.allSchemas.searchSchema,...StockupDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainRecord.allSchemas"
+      :detailAllSchemas="StockupDetailRecord.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainRecord.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainRecord.allSchemas.tableColumns,...StockupDetailRecord.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -126,7 +127,11 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return []
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index db525c575..bd38437ea 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainRequest.allSchemas.searchSchema,...StockupDetailRequest.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainRequest.allSchemas"
+      :detailAllSchemas="StockupDetailRequest.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,8 +34,8 @@
         </el-button>
         
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -100,7 +101,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainRequest.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainRequest.allSchemas.tableColumns,...StockupDetailRequest.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)
 
@@ -228,7 +229,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
     return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:stockup-main-request:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), //重新添加
@@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    StockupMainRequestApi.close(row.id).then(() => {
+    StockupMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    StockupMainRequestApi.reAdd(row.id).then(() => {
+    StockupMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    StockupMainRequestApi.submit(row.id).then(() => {
+    StockupMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    StockupMainRequestApi.refused(row.id).then(() => {
+    StockupMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    StockupMainRequestApi.agree(row.id).then(() => {
+    StockupMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    StockupMainRequestApi.handle(row.id).then(() => {
+    StockupMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -314,7 +319,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }