diff --git a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts index 3f2d6fb..da4e5dd 100644 --- a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts +++ b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts @@ -261,12 +261,15 @@ export const DeviceMaintainOrderDetail = useCrudSchemas(reactive([ }, }, { - label: '人数', + label: '预估人数', field: 'peoples', sort: 'custom', isSearch: false, form: { component: 'InputNumber', + componentProps:{ + disabled:true + } }, isTable: true, tableForm: { @@ -284,6 +287,9 @@ export const DeviceMaintainOrderDetail = useCrudSchemas(reactive([ isTable: true, form: { component: 'Input', + componentProps:{ + disabled:true + } }, }, { diff --git a/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts b/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts index a7dd310..b029347 100644 --- a/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts +++ b/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts @@ -158,6 +158,19 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ }, placeholder: "请先选择设备" }, + }, + isSearch:true, + search:{ + component: 'Select', + api: () => userListAll, + componentProps: { + collapseTags:true, + collapseTagsTooltip:true, + optionsAlias: { + labelField: 'nickname', + valueField: 'id' + } + } } }, { @@ -227,7 +240,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ table: { width: '150', }, - isSearch: true, + isSearch: false, dictType: DICT_TYPE.FAULT_TYPE, dictClass: 'string', form: { diff --git a/src/views/eam/mold/moldRepair/moldRepair.data.ts b/src/views/eam/mold/moldRepair/moldRepair.data.ts index 8380ff6..8e516cc 100644 --- a/src/views/eam/mold/moldRepair/moldRepair.data.ts +++ b/src/views/eam/mold/moldRepair/moldRepair.data.ts @@ -142,7 +142,7 @@ export const MoldRepair = useCrudSchemas(reactive([ }, { label: '描述', - field: 'describe', + field: 'describes', sort: 'custom', table: { width: '150', diff --git a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts index 329adb4..91134fb 100644 --- a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts +++ b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts @@ -318,12 +318,15 @@ export const MoldMaintainOrderDetail = useCrudSchemas(reactive([ }, }, { - label: '人数', + label: '预估人数', field: 'peoples', sort: 'custom', isSearch: false, form: { component: 'InputNumber', + componentProps:{ + disabled:true + } }, isTable: true, tableForm: { @@ -341,6 +344,9 @@ export const MoldMaintainOrderDetail = useCrudSchemas(reactive([ isTable: true, form: { component: 'Input', + componentProps:{ + disabled:true + } }, }, { diff --git a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts index 4a0a5a0..99cb637 100644 --- a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts +++ b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts @@ -8,6 +8,7 @@ import * as ItemApi from '@/api/eam/basic/item' import * as UserApi from '@/api/system/user' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' const userListAll = await UserApi.getSimpleUserList() +console.log(userListAll) const userStore = useUserStore() const factoryList = await selectAllFactoryArea() const moldList = await MoldAccountsApi.getMoldAccountsNoPage({}) @@ -173,7 +174,6 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ table: { width: '150', }, - isSearch: false, api: () => userListAll, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userListAll.find((account) => account.id == cellValue)?.nickname @@ -184,11 +184,24 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ componentProps: { disabled: true, optionsAlias: { - labelField: 'name', + labelField: 'nickname', valueField: 'id' }, placeholder: "请先选择模具" }, + }, + isSearch:true, + search:{ + component: 'Select', + api: () => userListAll, + componentProps: { + collapseTags:true, + collapseTagsTooltip:true, + optionsAlias: { + labelField: 'nickname', + valueField: 'id' + } + } } },