From 66f73b3b609c6256216d4e931eb96a7f691c41ce Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 22 Apr 2024 15:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3---?=
 =?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

---
 .../productdismantleJobMain/index.vue         | 15 ++++++---
 .../productdismantleRecordMain/index.vue      | 19 +++++++----
 .../productdismantleRequestMain/index.vue     | 33 +++++++++++--------
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
index 31e5dce4c..8add1f184 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductdismantleJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductdismantleJobMain.allSchemas.searchSchema,...ProductdismantleJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductdismantleJobMain.allSchemas"
+      :detailAllSchemas="ProductdismantleJobDetail.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(ProductdismantleJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductdismantleJobMain.allSchemas.tableColumns,...ProductdismantleJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -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/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
index ca2a50c51..76f6f8f39 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductdismantleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductdismantleRecordMain.allSchemas.searchSchema,...ProductdismantleRecordDetaila.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductdismantleRecordMain.allSchemas"
+      :detailAllSchemas="ProductdismantleRecordDetaila.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>
@@ -101,7 +102,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductdismantleRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductdismantleRecordMain.allSchemas.tableColumns,...ProductdismantleRecordDetaila.allSchemas.tableMainColumns])
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
@@ -140,9 +141,9 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-       masterId: row.id
+       masterId: row.masterId
     }
-    rowId.value =  row.id
+    rowId.value =  row.masterId
     await getDetailListBom()
   }
 }
@@ -195,7 +196,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/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index ec086efb2..3ffde4601 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductdismantleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductdismantleRequestMain.allSchemas.searchSchema,...ProductdismantleRequestDetaila.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductdismantleRequestMain.allSchemas"
+      :detailAllSchemas="ProductdismantleRequestDetaila.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>
@@ -117,7 +118,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductdismantleRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductdismantleRequestMain.allSchemas.tableColumns,...ProductdismantleRequestDetaila.allSchemas.tableMainColumns])
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
@@ -234,9 +235,9 @@ const tableFormButton = async (val , row) => {
     detatableDataBom.params = {
        itemCode: row.itemCode,
        bomVersion: row.bomVersion,
-       masterId: row.id
+       masterId: row.masterId
     }
-    rowId.value =  row.id
+    rowId.value =  row.masterId
     detailQty.value = row.qty
     await getDetailListBom()
   }
@@ -346,7 +347,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:productdismantle-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productdismantle-request-main:reAdd'}), // 重新添加
@@ -364,7 +369,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.close(row.id).then(() => {
+    ProductdismantleRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -375,7 +380,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.reAdd(row.id).then(() => {
+    ProductdismantleRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -386,7 +391,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.submit(row.id).then(() => {
+    ProductdismantleRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -397,7 +402,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.refused(row.id).then(() => {
+    ProductdismantleRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -408,7 +413,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.agree(row.id).then(() => {
+    ProductdismantleRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -419,7 +424,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.handle(row.id).then(() => {
+    ProductdismantleRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -430,7 +435,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }