From 67326cb6455a09488317a278190aff3b861ab1d8 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 25 Apr 2024 10:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue  | 19 +++++----
 .../countManage/count/countPlanMain/index.vue | 34 +++++++++-------
 .../count/countRecordMain/index.vue           | 17 +++++---
 .../count/countRequestMain/index.vue          | 39 +++++++++++--------
 .../countadjustRecordMain/index.vue           | 17 +++++---
 .../countadjustRequestMain/index.vue          | 31 ++++++++-------
 .../packageoverJobMain/index.vue              | 13 ++++---
 .../packageoverRecordMain/index.vue           | 17 +++++---
 .../packageoverRequestMain/index.vue          | 31 ++++++++-------
 .../sparepartsrequisitionJobMain/index.vue    | 17 +++++---
 .../sparepartsrequisitionRecordMain/index.vue | 17 +++++---
 .../index.vue                                 | 31 ++++++++-------
 .../inventorychangeRecordMain/index.vue       | 17 +++++---
 .../inventorychangeRequestMain/index.vue      | 31 ++++++++-------
 14 files changed, 198 insertions(+), 133 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 603326969..8cf17ac71 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CountJobMain.allSchemas.searchSchema,...CountJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountJobMain.allSchemas"
+      :detailAllSchemas="CountJobDetail.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>
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CountJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...CountJobMain.allSchemas.tableColumns,...CountJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -128,7 +129,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
+  getListApi: CountJobDetailApi.getCountJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -178,7 +179,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']),hasPermi:'wms:count-job-main:close'}), // 关闭
@@ -194,7 +199,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
   }
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 4bf79c453..32e624137 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -2,7 +2,7 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="CountPlanMain.allSchemas.searchSchema"
+      :schema="[...CountPlanMain.allSchemas.searchSchema,...CountPlanDetail.allSchemas.searchSchema]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,6 +16,7 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="CountPlanMain.allSchemas"
+    :detailAllSchemas="CountPlanDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -36,10 +37,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row,$index }">
         <ButtonBase
-          :Butttondata="butttondata(row)"
-          @button-base-click="buttonTableClick($event, row)"
+        :Butttondata="butttondata(row,$index)"   @button-base-click="buttonTableClick($event, row)"
         />
       </template>
     </Table>
@@ -132,7 +132,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CountPlanMain.allSchemas.tableColumns)
+const tableColumns = ref([...CountPlanMain.allSchemas.tableColumns,...CountPlanDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -178,7 +178,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 const Echo = []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountPlanMainApi.getCountPlanMainPage // 分页接口
+  getListApi: CountPlanDetailApi.getCountPlanDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -240,7 +240,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.mainListPlanOpeBtn({
       hide: isShowMainButton(row, ['5']),
@@ -281,7 +285,7 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    CountPlanMainApi.open(row.id).then(() => {
+    CountPlanMainApi.open(row.masterId).then(() => {
       message.success(t('打开成功'))
       tableObject.loading = false
       getList()
@@ -292,7 +296,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CountPlanMainApi.close(row.id).then(() => {
+    CountPlanMainApi.close(row.masterId).then(() => {
       message.success(t('关闭成功'))
       tableObject.loading = false
       getList()
@@ -303,14 +307,14 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanSub') { // 提交审批
     await message.confirm(t('common.confirmSubmit'))
     tableObject.loading = true
-    await CountPlanMainApi.submit(row.id)
+    await CountPlanMainApi.submit(row.masterId)
     message.success(t('提交审批成功'))
     tableObject.loading = false
     await getList()
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CountPlanMainApi.reject(row.id).then(() => {
+    CountPlanMainApi.reject(row.masterId).then(() => {
       message.success(t('驳回成功'))
       tableObject.loading = false
       getList()
@@ -321,7 +325,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanApp') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CountPlanMainApi.agree(row.id).then(() => {
+    CountPlanMainApi.agree(row.masterId).then(() => {
       message.success(t('审批已通过'))
       tableObject.loading = false
       getList()
@@ -332,7 +336,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanPub') { // 发布
     await message.confirm('确认要发布吗？')
     tableObject.loading = true
-    CountPlanMainApi.publish(row.id).then(() => {
+    CountPlanMainApi.publish(row.masterId).then(() => {
       message.success(t('发布成功'))
       tableObject.loading = false
       getList()
@@ -343,7 +347,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    CountPlanMainApi.resetting(row.id).then(() => {
+    CountPlanMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -354,7 +358,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 /** 添加/修改操作 */
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index e1b68a455..a33275922 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CountRecordMain.allSchemas.searchSchema,...CountRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountRecordMain.allSchemas"
+      :detailAllSchemas="CountRecordDetail.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>
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CountRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...CountRecordMain.allSchemas.tableColumns,...CountRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -84,7 +85,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountRecordMainApi.getCountRecordMainPage // 分页接口
+  getListApi: CountRecordDetailApi.getCountRecordDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -125,7 +126,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 [
     defaultButtons.mainCountAdjustRequesttBtn({
       hasPermi: 'wms:count-record-main:generate'
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index 298c8a6cf..4daa1e5ff 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -2,7 +2,7 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="CountRequestMain.allSchemas.searchSchema"
+      :schema="[...CountRequestMain.allSchemas.searchSchema,...CountRequestDetail.allSchemas.searchSchema]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,6 +16,7 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="CountRequestMain.allSchemas"
+    :detailAllSchemas="CountRequestDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -36,9 +37,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row,$index }">
         <ButtonBase
-          :Butttondata="butttondata(row)"
+        :Butttondata="butttondata(row,$index)"
           @button-base-click="buttonTableClick($event, row)"
         />
       </template>
@@ -122,7 +123,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CountRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...CountRequestMain.allSchemas.tableColumns,...CountRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -197,7 +198,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) =>
 const Echo = []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountRequestMainApi.getCountRequestMainPage // 分页接口
+  getListApi: CountRequestDetailApi.getCountRequestDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -281,7 +282,11 @@ const isShowGenerateMainButton = (row, val) => {
 
 const searchTableRef = ref()
 // 列表-操作按钮
-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:count-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide: isShowMainButton(row, ['5']),hasPermi: 'wms:count-request-main:reAdd'}), //重新添加
@@ -304,7 +309,7 @@ const buttonTableClick = async (val, row) => {
     // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CountRequestMainApi.close(row.id)
+    CountRequestMainApi.close(row.masterId)
       .then(() => {
         message.success(t('关闭成功'))
         tableObject.loading = false
@@ -318,7 +323,7 @@ const buttonTableClick = async (val, row) => {
     // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CountRequestMainApi.reAdd(row.id)
+    CountRequestMainApi.reAdd(row.masterId)
       .then(() => {
         message.success(t('添加成功'))
         tableObject.loading = false
@@ -332,7 +337,7 @@ const buttonTableClick = async (val, row) => {
     // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CountRequestMainApi.submit(row.id)
+    CountRequestMainApi.submit(row.masterId)
       .then(() => {
         message.success(t('提交审批成功'))
         tableObject.loading = false
@@ -346,7 +351,7 @@ const buttonTableClick = async (val, row) => {
     // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CountRequestMainApi.refused(row.id)
+    CountRequestMainApi.refused(row.masterId)
       .then(() => {
         message.success(t('驳回成功'))
         tableObject.loading = false
@@ -360,7 +365,7 @@ const buttonTableClick = async (val, row) => {
     // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CountRequestMainApi.agree(row.id)
+    CountRequestMainApi.agree(row.masterId)
       .then(() => {
         message.success(t('审批已通过'))
         tableObject.loading = false
@@ -374,7 +379,7 @@ const buttonTableClick = async (val, row) => {
     // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    CountRequestMainApi.handle(row.id)
+    CountRequestMainApi.handle(row.masterId)
       .then(() => {
         message.success(t('处理成功'))
         tableObject.loading = false
@@ -396,7 +401,7 @@ const buttonTableClick = async (val, row) => {
       label:3,
       title:'选择'
     }])
-    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.id},'',radioList.value)
+    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.masterId},'',radioList.value)
   } else if (val == 'mainSuperviseCount') {
     // 监盘
     const radioList = ref([{
@@ -406,11 +411,11 @@ const buttonTableClick = async (val, row) => {
       label:2,
       title:'选择'
     }])
-    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.id},'',radioList.value)
+    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.masterId},'',radioList.value)
   } else if (val == 'countAdjustRequest') {
     // 生成盘点调整申请
     await message.confirm('确认要生成盘点调整申请吗？')
-    CountRequestMainApi.generateCountadjustRequest(row.id)
+    CountRequestMainApi.generateCountadjustRequest(row.masterId)
       .then(() => {
         message.success(t('已生成盘点调整申请'))
         getList()
@@ -422,7 +427,7 @@ const buttonTableClick = async (val, row) => {
     // 解冻
     await message.confirm('确认要解冻吗？')
     tableObject.loading = true
-    CountRequestMainApi.thaw(row.id)
+    CountRequestMainApi.thaw(row.masterId)
       .then(() => {
         message.success(t('解冻成功'))
         tableObject.loading = false
@@ -437,7 +442,7 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') {
     // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
index a790e8909..0e667c036 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountadjustRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CountadjustRecordMain.allSchemas.searchSchema,...CountadjustRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountadjustRecordMain.allSchemas"
+      :detailAllSchemas="CountadjustRecordDetail.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>
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CountadjustRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...CountadjustRecordMain.allSchemas.tableColumns,...CountadjustRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -84,7 +85,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountadjustRecordMainApi.getCountadjustRecordMainPage // 分页接口
+  getListApi: CountadjustRecordDetailApi.getCountadjustRecordDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -125,7 +126,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/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 1b2ae3525..3fbc7808b 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountadjustRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CountadjustRequestMain.allSchemas.searchSchema,...CountadjustRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountadjustRequestMain.allSchemas"
+      :detailAllSchemas="CountadjustRequestDetail.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>
@@ -94,7 +95,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CountadjustRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...CountadjustRequestMain.allSchemas.tableColumns,...CountadjustRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -128,7 +129,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountadjustRequestMainApi.getCountadjustRequestMainPage // 分页接口
+  getListApi: CountadjustRequestDetailApi.getCountadjustRequestDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -184,7 +185,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:countadjust-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
@@ -199,7 +204,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.close(row.id).then(() => {
+    CountadjustRequestMainApi.close(row.masterId).then(() => {
       message.success(t('关闭成功'))
       tableObject.loading = false
       getList()
@@ -210,7 +215,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.reAdd(row.id).then(() => {
+    CountadjustRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('添加成功'))
       tableObject.loading = false
       getList()
@@ -221,7 +226,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.submit(row.id).then(() => {
+    CountadjustRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('提交审批成功'))
       tableObject.loading = false
       getList()
@@ -232,7 +237,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.refused(row.id).then(() => {
+    CountadjustRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('驳回成功'))
       tableObject.loading = false
       getList()
@@ -243,7 +248,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.agree(row.id).then(() => {
+    CountadjustRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('审批已通过'))
       tableObject.loading = false
       getList()
@@ -254,7 +259,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.handle(row.id).then(() => {
+    CountadjustRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('处理成功'))
       tableObject.loading = false
       getList()
@@ -265,7 +270,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
index 52b6a41cd..9f4aade48 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PackageoverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PackageoverJobMain.allSchemas.searchSchema,...PackageoverJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="PackageoverJobMain.allSchemas"
+      :detailAllSchemas="PackageoverJobDetail.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>
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PackageoverJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...PackageoverJobMain.allSchemas.tableColumns,...PackageoverJobDetail.allSchemas.tableMainColumns])
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -98,7 +99,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PackageoverJobMainApi.getPackageoverJobMainPage // 分页接口
+  getListApi: PackageoverJobDetailApi.getPackageoverJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -149,7 +150,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
index 47ee5d818..99d17526a 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PackageoverMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PackageoverMain.allSchemas.searchSchema,...PackageoverDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="PackageoverMain.allSchemas"
+      :detailAllSchemas="PackageoverDetail.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>
@@ -78,7 +79,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PackageoverMain.allSchemas.tableColumns)
+const tableColumns = ref([...PackageoverMain.allSchemas.tableColumns,...PackageoverDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -86,7 +87,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PackageoverRecordMainApi.getPackageoverMainPage // 分页接口
+  getListApi: PackageoverRecordDetailApi.getPackageoverDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -119,7 +120,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 [defaultButtons.mainListPointBtn(null)] // 标签打印
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index a2ebe0cbc..95af0ae92 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PackageoverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PackageoverRequestMain.allSchemas.searchSchema,...PackageoverRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="PackageoverRequestMain.allSchemas"
+      :detailAllSchemas="PackageoverRequestDetail.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>
@@ -91,7 +92,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PackageoverRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...PackageoverRequestMain.allSchemas.tableColumns,...PackageoverRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -163,7 +164,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PackageoverRequestMainApi.getPackageoverRequestMainPage // 分页接口
+  getListApi: PackageoverRequestDetailApi.getPackageoverRequestDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -219,7 +220,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']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加
@@ -239,7 +244,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    PackageoverRequestMainApi.close(row.id).then(() => {
+    PackageoverRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -250,7 +255,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    PackageoverRequestMainApi.reAdd(row.id).then(() => {
+    PackageoverRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -261,7 +266,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    PackageoverRequestMainApi.submit(row.id).then(() => {
+    PackageoverRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -272,7 +277,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    PackageoverRequestMainApi.refused(row.id).then(() => {
+    PackageoverRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -283,7 +288,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    PackageoverRequestMainApi.agree(row.id).then(() => {
+    PackageoverRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -294,7 +299,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    PackageoverRequestMainApi.handle(row.id).then(() => {
+    PackageoverRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -305,7 +310,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index e9294d135..670a9ed80 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedissueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedissueJobMain.allSchemas.searchSchema,...UnplannedissueJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedissueJobMain.allSchemas"
+      :detailAllSchemas="UnplannedissueJobDetail.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>
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(UnplannedissueJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedissueJobMain.allSchemas.tableColumns,...UnplannedissueJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -128,7 +129,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnplannedissueJobMainApi.getUnplannedissueJobMainPage // 分页接口
+  getListApi: UnplannedissueJobDetailApi.getUnplannedissueJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -178,7 +179,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'])}), // 关闭
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index 0447c743f..ecd7970e8 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedissueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedissueRecordMain.allSchemas.searchSchema,...UnplannedissueRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedissueRecordMain.allSchemas"
+      :detailAllSchemas="UnplannedissueRecordDetail.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>
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(UnplannedissueRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedissueRecordMain.allSchemas.tableColumns,...UnplannedissueRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -84,7 +85,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPageSpare // 备件领用分页接口
+  getListApi: UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage // 备件领用分页接口
 })
 
 // 获得表格的各种操作
@@ -125,7 +126,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/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 356d03b93..49e076f5d 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedissueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedissueRequestMain.allSchemas.searchSchema,...UnplannedissueRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedissueRequestMain.allSchemas"
+      :detailAllSchemas="UnplannedissueRequestDetail.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>
@@ -96,7 +97,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(UnplannedissueRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedissueRequestMain.allSchemas.tableColumns,...UnplannedissueRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -142,7 +143,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnplannedissueRequestMainApi.getUnplannedissueRequestMainPageSpare // 分页接口
+  getListApi: UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -198,7 +199,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']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加
@@ -217,25 +222,25 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
index 4019d65ec..503614031 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventorychangeRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventorychangeRecordMain.allSchemas.searchSchema,...InventorychangeRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventorychangeRecordMain.allSchemas"
+      :detailAllSchemas="InventorychangeRecordDetail.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>
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(InventorychangeRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventorychangeRecordMain.allSchemas.tableColumns,...InventorychangeRecordDetail.allSchemas.tableMainColumns])
 
 console.log(99 ,  routeName.value)
 const fromInventoryStatus = ref()
@@ -88,7 +89,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: InventorychangeRecordMainApi.getInventorychangeRecordMainPage // 分页接口
+  getListApi: InventorychangeRecordDetailApi.getInventorychangeRecordDetailPage // 分页接口
 })
 
 
@@ -171,7 +172,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/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 7a8778320..4c62eb50d 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventorychangeRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventorychangeRequestMain.allSchemas.searchSchema,...InventorychangeRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventorychangeRequestMain.allSchemas"
+      :detailAllSchemas="InventorychangeRequestDetail.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>
@@ -90,10 +91,10 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(InventorychangeRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns])
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口
+  getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage // 分页接口
 })
 
 
@@ -235,7 +236,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']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加
@@ -255,7 +260,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    InventorychangeRequestMainApi.close(row.id).then(() => {
+    InventorychangeRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -266,7 +271,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    InventorychangeRequestMainApi.reAdd(row.id).then(() => {
+    InventorychangeRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -277,7 +282,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    InventorychangeRequestMainApi.submit(row.id).then(() => {
+    InventorychangeRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -288,7 +293,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    InventorychangeRequestMainApi.refused(row.id).then(() => {
+    InventorychangeRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -299,7 +304,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    InventorychangeRequestMainApi.agree(row.id).then(() => {
+    InventorychangeRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -310,7 +315,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    InventorychangeRequestMainApi.handle(row.id).then(() => {
+    InventorychangeRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -321,7 +326,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }