From ee7ddd01a9951ce06d199272c63f5e3641d6258c Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Mon, 30 Dec 2024 17:21:41 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/basic/inspection/inspection.data.ts | 2 +- .../eam/basic/moldInspection/moldInspection.data.ts | 2 +- src/views/eam/device/deviceinspectionjob/index.vue | 4 ++-- .../mold/moldinspectionjob/moldInspectionMain.data.ts | 9 +++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/eam/basic/inspection/inspection.data.ts b/src/views/eam/basic/inspection/inspection.data.ts index ebf6ecb..c813365 100644 --- a/src/views/eam/basic/inspection/inspection.data.ts +++ b/src/views/eam/basic/inspection/inspection.data.ts @@ -146,7 +146,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive([ { label: '是否点检', - field: 'isNeedInspection', + field: 'needInspection', sort: 'custom', isSearch: false, formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => { diff --git a/src/views/eam/basic/moldInspection/moldInspection.data.ts b/src/views/eam/basic/moldInspection/moldInspection.data.ts index e565d4a..32f4c66 100644 --- a/src/views/eam/basic/moldInspection/moldInspection.data.ts +++ b/src/views/eam/basic/moldInspection/moldInspection.data.ts @@ -145,7 +145,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive([ }, { label: '是否点检', - field: 'isNeedInspection', + field: 'needInspection', sort: 'custom', isSearch: false, formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => { diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue index 4af61c6..defc811 100644 --- a/src/views/eam/device/deviceinspectionjob/index.vue +++ b/src/views/eam/device/deviceinspectionjob/index.vue @@ -536,9 +536,9 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { const detailOpenForm = (type, row) => { console.log("type", type); console.log("row", row); - DeviceInspectionDetail.allSchemas.tableFormColumns.map((item) => { + // DeviceInspectionDetail.allSchemas.tableFormColumns.map((item) => { - }) + // }) } // 子表新增/编辑校验 diff --git a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts index c7a07f0..de663c0 100644 --- a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts @@ -478,8 +478,13 @@ export const MoldInspectionDetail = useCrudSchemas(reactive([ }, filterable: true, }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - const cellValueList = cellValue ? cellValue.split(',') : []; + formatter: (_: Recordable, __: TableColumn, cellValue) => { + let cellValueList = [] + if (cellValue.includes(',')) { + cellValueList = cellValue?.split(','); + } else { + cellValueList = [cellValue] + } return userListAll .filter(item => cellValueList.includes(item.id.toString())) .map(item => item.nickname)