From 16d7c745e642351a105f3cca61e915974409c155 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 22 Apr 2024 15:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE---?=
=?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
---
.../productrepairRecordMain/index.vue | 17 ++++++----
.../productrepairRequestMain/index.vue | 33 +++++++++++--------
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index 6514425af..d190b28ad 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductrepairRecordMain.allSchemas"
+ :detailAllSchemas="ProductrepairRecordDetail.allSchemas"
/>
@@ -32,8 +33,8 @@
{{ row.number }}
-
-
+
+
@@ -104,7 +105,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
-const tableColumns = ref(ProductrepairRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductrepairRecordMain.allSchemas.tableColumns,...ProductrepairRecordDetail.allSchemas.tableMainColumns])
// 详情 table 操作扩展 按钮
const buttondataTable = ref([{
@@ -181,7 +182,7 @@ const tableFormButton = async (val , row) => {
bomModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
detatableDataBom.params = {
- masterId: row.id
+ masterId: row.masterId
}
await getDetailListBom()
}
@@ -234,7 +235,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/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index fa4e53783..ba707176f 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductrepairRequestMain.allSchemas"
+ :detailAllSchemas="ProductrepairRequestDetaila.allSchemas"
/>
@@ -32,8 +33,8 @@
{{ row.number }}
-
-
+
+
@@ -122,7 +123,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
-const tableColumns = ref(ProductrepairRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductrepairRequestMain.allSchemas.tableColumns,...ProductrepairRequestDetaila.allSchemas.tableMainColumns])
// 详情 table 操作扩展 按钮
const buttondataTable = ref([{
@@ -347,7 +348,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:productrepair-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productrepair-request-main:reAdd'}), // 重新添加
@@ -364,26 +369,26 @@ 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') { // 处理
console.log('列表-操作按钮事件-处理')
- handleHandle(row.id)
+ handleHandle(row.masterId)
} else if (val == 'edit') { // 编辑
openForm('update', row)
} else if (val == 'delete') { // 删除
- handleDelete(row.id)
+ handleDelete(row.masterId)
}
}
@@ -669,10 +674,10 @@ const tableFormButton = async (val , row) => {
detatableDataBom.params = {
itemCode: row.itemCode,
bomVersion: row.bomVersion,
- masterId: row.id
+ masterId: row.masterId
}
detailQty.value = row.qty
- rowId.value = row.id
+ rowId.value = row.masterId
await getDetailListBom()
}
}