From b7f396f0024cfafd903eb3f88a9452fc2b2eb1a4 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 27 Feb 2025 18:32:12 +0800 Subject: [PATCH 1/3] SBBJ-856 --- .../moldInspection/moldInspection.data.ts | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/views/eam/basic/moldInspection/moldInspection.data.ts b/src/views/eam/basic/moldInspection/moldInspection.data.ts index 32f4c66..95d5451 100644 --- a/src/views/eam/basic/moldInspection/moldInspection.data.ts +++ b/src/views/eam/basic/moldInspection/moldInspection.data.ts @@ -72,41 +72,41 @@ export const DeviceMoldItems = useCrudSchemas(reactive([ } } }, - { - label: '模具编号', - field: 'deviceNumber', - sort: 'custom', - isSearch: true, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择单号', // 输入框占位文本 - searchField: 'number', // 查询弹窗赋值字段 - searchTitle: '单号信息', // 查询弹窗标题 - searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 - searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: "TRUE", - isMainValue: false - }, { - key: 'type', - value: 'type', - isMainValue: true - } - ] - } - } - }, - { - label: '模具名称', - field: 'deviceName', - sort: 'custom', - isSearch: false, - isForm: false, - }, + // { + // label: '模具编号', + // field: 'deviceNumber', + // sort: 'custom', + // isSearch: true, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择单号', // 输入框占位文本 + // searchField: 'number', // 查询弹窗赋值字段 + // searchTitle: '单号信息', // 查询弹窗标题 + // searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 + // searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'available', + // value: "TRUE", + // isMainValue: false + // }, { + // key: 'type', + // value: 'type', + // isMainValue: true + // } + // ] + // } + // } + // }, + // { + // label: '模具名称', + // field: 'deviceName', + // sort: 'custom', + // isSearch: false, + // isForm: false, + // }, { label: '项类型', field: 'status', From 2e62e43288db8135dec5a3c45cb6a02994a33bed Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 27 Feb 2025 19:42:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?SBBJ-862=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80=E9=A1=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=98=8E=E7=BB=86=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deviceInspectionConfig.data.ts | 22 ++++++++++++++++++- .../moldInspectionConfig.data.ts | 21 ++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts b/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts index 15be0f3..8134f13 100644 --- a/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts +++ b/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts @@ -181,6 +181,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ componentProps: { disabled: true, } + }, + tableForm: { + type:'Select', + disabled:true, } }, { @@ -197,6 +201,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ disabled: true } }, + tableForm: { + type:'Select', + disabled:true, + } }, { @@ -204,8 +212,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ field: 'equipmentParts', sort: 'custom', isSearch: true, + tableForm: { + disabled:true, + } }, - { label: '记录是否必填', field: 'numberNeedSwitch', @@ -217,6 +227,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ form: { component: 'Switch', value: false, + }, + tableForm: { + disabled:true, } }, @@ -231,6 +244,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ form: { component: 'Switch', value: false, + }, + tableForm: { + disabled:true, } }, { @@ -242,11 +258,15 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ table: { width: 170 }, + tableForm: { + disabled:true, + }, }, { label: '操作', field: 'action', isForm: false, + isTableForm: false, table: { width: 150, fixed: 'right' diff --git a/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts b/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts index 6660da3..cee88b7 100644 --- a/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts +++ b/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts @@ -181,6 +181,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ componentProps: { disabled: true, } + }, + tableForm: { + type:'Select', + disabled:true, } }, { @@ -197,6 +201,10 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ disabled: true } }, + tableForm: { + type:'Select', + disabled:true, + } }, { @@ -204,6 +212,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ field: 'equipmentParts', sort: 'custom', isSearch: true, + tableForm: { + disabled:true, + } }, { @@ -217,6 +228,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ form: { component: 'Switch', value: false, + }, + tableForm: { + disabled:true, } }, @@ -231,6 +245,9 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ form: { component: 'Switch', value: false, + }, + tableForm: { + disabled:true, } }, { @@ -242,11 +259,15 @@ export const DeviceInspectionTwo = useCrudSchemas(reactive([ table: { width: 170 }, + tableForm: { + disabled:true, + } }, { label: '操作', field: 'action', isForm: false, + isTableForm: false, table: { width: 150, fixed: 'right' From 4968ab9067910e3074576f1c4762d4dcf375384d Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 27 Feb 2025 19:53:01 +0800 Subject: [PATCH 3/3] SBBJ-866 --- .../basic/deviceInspectionConfig/deviceInspectionConfig.data.ts | 1 + .../eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts b/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts index 8134f13..70013c3 100644 --- a/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts +++ b/src/views/eam/basic/deviceInspectionConfig/deviceInspectionConfig.data.ts @@ -107,6 +107,7 @@ export const DeviceInspection = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isDetail: false, table: { width: 150, fixed: 'right' diff --git a/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts b/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts index cee88b7..98a759e 100644 --- a/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts +++ b/src/views/eam/basic/moldInspectionConfig/moldInspectionConfig.data.ts @@ -107,6 +107,7 @@ export const DeviceInspection = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isDetail: false, table: { width: 150, fixed: 'right'