From 6172933d83c5aec5f2226fb9bd6aabe853b65d60 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 14 Jun 2024 11:59:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=A8=A1=E5=9D=97--=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6--=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  9 ++++-
 .../countManage/count/countJobMain/index.vue  | 18 ++++------
 .../countManage/count/countPlanMain/index.vue | 34 ++++++++-----------
 .../count/countRecordMain/index.vue           | 11 ++----
 .../count/countRequestMain/index.vue          | 34 ++++++++-----------
 .../countadjustRecordMain/index.vue           | 12 +++----
 .../countadjustRequestMain/index.vue          | 26 ++++++--------
 7 files changed, 63 insertions(+), 81 deletions(-)

diff --git a/README.md b/README.md
index 648fbf09c..7c997d5fa 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,14 @@ const { tableObject, tableMethods } = useTable({
   getListApi: “PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage”// 分页接口
 })
 
-5、ts文件配置：
+5、搜索工作栏
+<Search
+      :schema="[...CountPlanMain.allSchemas.searchSchema,...CountPlanDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+    
+6、ts文件配置：
 hiddenInMain:true, //子表中数据不展示在主表
 sortTableDefault:1000, // 主页面中Table表中展示的排序位置：默认值999 ，最小值1，值越大越靠后,值越小越靠前
 sortSearchDefault：1000,// 搜素框中展示的排序位置，用法同sortTableDefault
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index c695c1f77..1dc05b21e 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,...CountJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountJobMain.allSchemas"
-      :detailAllSchemas="CountJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -95,7 +94,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...CountJobMain.allSchemas.tableColumns,...CountJobDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CountJobMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -142,7 +141,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountJobDetailApi.getCountJobDetailPage // 分页接口
+  getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -193,10 +192,7 @@ const isShowMainButton = (row,val) => {
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
+
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // 关闭
@@ -230,13 +226,13 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
-    handleClose(row.masterId)
+    handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
   } else if (val == 'exportCountJob'){// 当前任务导出
-    handleExportCountJob(row.masterId,row.number)
+    handleExportCountJob(row.id,row.number)
   } else if( val == 'importCountJob'){ // 导入
-    handleImport(row.masterId)
+    handleImport(row.id)
   }
 }
 
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 75f779e81..68b146824 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,...CountPlanDetail.allSchemas.searchSchema]"
+      :schema="CountPlanMain.allSchemas.searchSchema"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,7 +16,6 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="CountPlanMain.allSchemas"
-    :detailAllSchemas="CountPlanDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -134,7 +133,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...CountPlanMain.allSchemas.tableColumns,...CountPlanDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CountPlanMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -180,7 +179,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 const Echo = []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountPlanDetailApi.getCountPlanDetailPage // 分页接口
+  getListApi: CountPlanMainApi.getCountPlanMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -243,10 +242,7 @@ const isShowMainButton = (row, val) => {
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
+  
   return [
     defaultButtons.mainListPlanOpeBtn({
       hide: isShowMainButton(row, ['5']),
@@ -287,7 +283,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    CountPlanMainApi.open(row.masterId).then(() => {
+    CountPlanMainApi.open(row.id).then(() => {
       message.success(t('打开成功'))
       tableObject.loading = false
       getList()
@@ -298,7 +294,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CountPlanMainApi.close(row.masterId).then(() => {
+    CountPlanMainApi.close(row.id).then(() => {
       message.success(t('关闭成功'))
       tableObject.loading = false
       getList()
@@ -309,14 +305,14 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanSub') { // 提交审批
     await message.confirm(t('common.confirmSubmit'))
     tableObject.loading = true
-    await CountPlanMainApi.submit(row.masterId)
+    await CountPlanMainApi.submit(row.id)
     message.success(t('提交审批成功'))
     tableObject.loading = false
     await getList()
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CountPlanMainApi.reject(row.masterId).then(() => {
+    CountPlanMainApi.reject(row.id).then(() => {
       message.success(t('驳回成功'))
       tableObject.loading = false
       getList()
@@ -327,7 +323,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanApp') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CountPlanMainApi.agree(row.masterId).then(() => {
+    CountPlanMainApi.agree(row.id).then(() => {
       message.success(t('审批已通过'))
       tableObject.loading = false
       getList()
@@ -338,7 +334,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanPub') { // 发布
     await message.confirm('确认要发布吗？')
     tableObject.loading = true
-    CountPlanMainApi.publish(row.masterId).then(() => {
+    CountPlanMainApi.publish(row.id).then(() => {
       message.success(t('发布成功'))
       tableObject.loading = false
       getList()
@@ -349,7 +345,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    CountPlanMainApi.resetting(row.masterId).then(() => {
+    CountPlanMainApi.resetting(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -360,7 +356,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.masterId)
+    handleDelete(row.id)
   }
 }
 /** 添加/修改操作 */
@@ -369,7 +365,7 @@ const openForm = async (type: string, row?: number) => {
   tableData.value = [
     {
       type: '',
-      value: ''
+      value: []
     }
   ] // 重置明细数据
   formRef.value.open(type, row)
@@ -497,7 +493,7 @@ CountPlanDetail.allSchemas.tableFormColumns.forEach((item) => {
 const tableData = ref([
   {
     type: '',
-    value: ''
+    value: []
   }
 ])
 
@@ -506,7 +502,7 @@ const handleAddTable = () => {
   // tableFormKeys.formType=''
   tableFormKeys = {
     type: '',
-    value: ''
+    value: []
   }
   tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
 }
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index d82f09fcd..f8603c0db 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,...CountRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CountRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountRecordMain.allSchemas"
-      :detailAllSchemas="CountRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -77,7 +76,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...CountRecordMain.allSchemas.tableColumns,...CountRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CountRecordMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -85,7 +84,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountRecordDetailApi.getCountRecordDetailPage // 分页接口
+  getListApi: CountRecordMainApi.getCountRecordMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -127,10 +126,6 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&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 3fbb79910..5ae51ee1e 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,...CountRequestDetail.allSchemas.searchSchema]"
+      :schema="CountRequestMain.allSchemas.searchSchema"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,7 +16,6 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="CountRequestMain.allSchemas"
-    :detailAllSchemas="CountRequestDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -125,7 +124,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...CountRequestMain.allSchemas.tableColumns,...CountRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CountRequestMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -200,7 +199,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) =>
 const Echo = []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountRequestDetailApi.getCountRequestDetailPage // 分页接口
+  getListApi: CountRequestMainApi.getCountRequestMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -285,10 +284,7 @@ const isShowGenerateMainButton = (row, val) => {
 const searchTableRef = ref()
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&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'}), //重新添加
@@ -311,7 +307,7 @@ const buttonTableClick = async (val, row) => {
     // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CountRequestMainApi.close(row.masterId)
+    CountRequestMainApi.close(row.id)
       .then(() => {
         message.success(t('关闭成功'))
         tableObject.loading = false
@@ -325,7 +321,7 @@ const buttonTableClick = async (val, row) => {
     // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CountRequestMainApi.reAdd(row.masterId)
+    CountRequestMainApi.reAdd(row.id)
       .then(() => {
         message.success(t('添加成功'))
         tableObject.loading = false
@@ -339,7 +335,7 @@ const buttonTableClick = async (val, row) => {
     // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CountRequestMainApi.submit(row.masterId)
+    CountRequestMainApi.submit(row.id)
       .then(() => {
         message.success(t('提交审批成功'))
         tableObject.loading = false
@@ -353,7 +349,7 @@ const buttonTableClick = async (val, row) => {
     // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CountRequestMainApi.refused(row.masterId)
+    CountRequestMainApi.refused(row.id)
       .then(() => {
         message.success(t('驳回成功'))
         tableObject.loading = false
@@ -367,7 +363,7 @@ const buttonTableClick = async (val, row) => {
     // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CountRequestMainApi.agree(row.masterId)
+    CountRequestMainApi.agree(row.id)
       .then(() => {
         message.success(t('审批已通过'))
         tableObject.loading = false
@@ -381,7 +377,7 @@ const buttonTableClick = async (val, row) => {
     // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    CountRequestMainApi.handle(row.masterId)
+    CountRequestMainApi.handle(row.id)
       .then(() => {
         message.success(t('处理成功'))
         tableObject.loading = false
@@ -403,7 +399,7 @@ const buttonTableClick = async (val, row) => {
       label:3,
       title:'选择'
     }])
-    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.masterId},'',radioList.value)
+    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.id},'',radioList.value)
   } else if (val == 'mainSuperviseCount') {
     // 监盘
     const radioList = ref([{
@@ -413,11 +409,11 @@ const buttonTableClick = async (val, row) => {
       label:2,
       title:'选择'
     }])
-    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.masterId},'',radioList.value)
+    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.id},'',radioList.value)
   } else if (val == 'countAdjustRequest') {
     // 生成盘点调整申请
     await message.confirm('确认要生成盘点调整申请吗？')
-    CountRequestMainApi.generateCountadjustRequest(row.masterId)
+    CountRequestMainApi.generateCountadjustRequest(row.id)
       .then(() => {
         message.success(t('已生成盘点调整申请'))
         getList()
@@ -429,7 +425,7 @@ const buttonTableClick = async (val, row) => {
     // 解冻
     await message.confirm('确认要解冻吗？')
     tableObject.loading = true
-    CountRequestMainApi.thaw(row.masterId)
+    CountRequestMainApi.thaw(row.id)
       .then(() => {
         message.success(t('解冻成功'))
         tableObject.loading = false
@@ -444,7 +440,7 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') {
     // 删除
-    handleDelete(row.masterId)
+    handleDelete(row.id)
   }
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
index dfb07c37a..0ea59d699 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,...CountadjustRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CountadjustRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountadjustRecordMain.allSchemas"
-      :detailAllSchemas="CountadjustRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -77,7 +76,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...CountadjustRecordMain.allSchemas.tableColumns,...CountadjustRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CountadjustRecordMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -85,7 +84,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountadjustRecordDetailApi.getCountadjustRecordDetailPage // 分页接口
+  getListApi: CountadjustRecordMainApi.getCountadjustRecordMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -127,10 +126,7 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&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 a20fce4bc..3d13f5f6b 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,...CountadjustRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CountadjustRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CountadjustRequestMain.allSchemas"
-      :detailAllSchemas="CountadjustRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -97,7 +96,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...CountadjustRequestMain.allSchemas.tableColumns,...CountadjustRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref(CountadjustRequestMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -131,7 +130,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: CountadjustRequestDetailApi.getCountadjustRequestDetailPage // 分页接口
+  getListApi: CountadjustRequestMainApi.getCountadjustRequestMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -188,10 +187,7 @@ const isShowMainButton = (row,val) => {
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&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'}), //重新添加
@@ -206,7 +202,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.close(row.masterId).then(() => {
+    CountadjustRequestMainApi.close(row.id).then(() => {
       message.success(t('关闭成功'))
       tableObject.loading = false
       getList()
@@ -217,7 +213,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.reAdd(row.masterId).then(() => {
+    CountadjustRequestMainApi.reAdd(row.id).then(() => {
       message.success(t('添加成功'))
       tableObject.loading = false
       getList()
@@ -228,7 +224,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.submit(row.masterId).then(() => {
+    CountadjustRequestMainApi.submit(row.id).then(() => {
       message.success(t('提交审批成功'))
       tableObject.loading = false
       getList()
@@ -239,7 +235,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.refused(row.masterId).then(() => {
+    CountadjustRequestMainApi.refused(row.id).then(() => {
       message.success(t('驳回成功'))
       tableObject.loading = false
       getList()
@@ -250,7 +246,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.agree(row.masterId).then(() => {
+    CountadjustRequestMainApi.agree(row.id).then(() => {
       message.success(t('审批已通过'))
       tableObject.loading = false
       getList()
@@ -261,7 +257,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    CountadjustRequestMainApi.handle(row.masterId).then(() => {
+    CountadjustRequestMainApi.handle(row.id).then(() => {
       message.success(t('处理成功'))
       tableObject.loading = false
       getList()
@@ -272,7 +268,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.masterId)
+    handleDelete(row.id)
   }
 }