diff --git a/src/utils/dict.ts b/src/utils/dict.ts index e878cec..b2b2127 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -189,7 +189,8 @@ export enum DICT_TYPE { ABC_CLASS = 'abc_class', // ABC类 TRUE_FALSE = 'true_false', // 是否 ITEM_GROUP = 'item_group', // 物品分组 - ITEM_CATEGORY = 'Item_category', // 物品种类 + ITEM_CATEGORY = 'item_category', // 物品种类 + ITEM_REGION = 'item_region', // 物品区域 ITEM_COLOR = 'item_color', // 物品颜色 ITEM_CONFIGURATION = 'item_configuration', // 物品配置 EQ_LEVEL = 'eq_level', // 质量等级 @@ -299,5 +300,5 @@ export enum DICT_TYPE { ADJUST_STATUS = 'adjust_status', //盘点调整状态 APP_DEVICE_MOLD_TYPE = 'app_device_mold_type', //设备/模具/工艺:类型 ITEM_SUBJECT = 'item_subject', //备件的科目 - ITEM_CATEGOR = 'item_categor', //备件的类别 + } diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts index 502b09a..d248ef8 100644 --- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts +++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts @@ -21,6 +21,7 @@ export const DeviceMOLD = useCrudSchemas(reactive([ width: 180, fixed: 'left' }, + }, { label: '名称', @@ -41,6 +42,11 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ field: 'name', sort: 'custom', isSearch: true, + form: { + componentProps: { + type: 'textarea', + } + } }, { label: '类型', @@ -84,6 +90,13 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ } } }, + { + label: '设备名称', + field: 'deviceName', + sort: 'custom', + isSearch: false, + isForm: false, + }, { label: '项类型', field: 'status', @@ -110,7 +123,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ component: 'Select' }, }, - + { label: '人数', field: 'peoples', @@ -135,7 +148,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ component: 'InputNumber', } }, - + { label: '是否可用', field: 'available', diff --git a/src/views/eam/basic/deviceMaintenance/index.vue b/src/views/eam/basic/deviceMaintenance/index.vue index 008e83a..ca0574d 100644 --- a/src/views/eam/basic/deviceMaintenance/index.vue +++ b/src/views/eam/basic/deviceMaintenance/index.vue @@ -42,6 +42,7 @@ ([ export const DeviceMoldItems = useCrudSchemas(reactive([ { - label: '保养内容', + label: '巡检点检项', field: 'name', sort: 'custom', isSearch: true, + form: { + componentProps: { + type: 'textarea', + } + } }, { label: '类型', @@ -84,6 +89,13 @@ export const DeviceMoldItems = useCrudSchemas(reactive([ } } }, + { + label: '设备名称', + field: 'deviceName', + sort: 'custom', + isSearch: false, + isForm: false, + }, { label: '项类型', field: 'status', diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts index 926da84..ef3723c 100644 --- a/src/views/eam/basic/item/item.data.ts +++ b/src/views/eam/basic/item/item.data.ts @@ -86,7 +86,7 @@ export const Item = useCrudSchemas(reactive([ label: '类别', field: 'category', sort: 'custom', - dictType: DICT_TYPE.ITEM_CATEGOR, + dictType: DICT_TYPE.ITEM_CATEGORY, dictClass: 'string', isSearch: false, isTable: true, @@ -106,6 +106,18 @@ export const Item = useCrudSchemas(reactive([ type: 'Select' } }, + { + label: '区域', + field: 'region', + sort: 'custom', + dictType: DICT_TYPE.ITEM_REGION, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } + }, { label: '单价', field: 'singlePrice', diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts index 1578537..007d025 100644 --- a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts +++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts @@ -41,21 +41,26 @@ export const MoldMaintenance = useCrudSchemas(reactive([ field: 'name', sort: 'custom', isSearch: true, + form: { + componentProps: { + type: 'textarea', + } + } + }, + { + label: '类型', + field: 'type', + dictType: DICT_TYPE.DEVICE_MOLD_TYPE, + dictClass: 'string', + sort: 'custom', + isSearch: false, + form: { + value: 'MOLD', + componentProps: { + disabled: true, + } + } }, - { - label: '类型', - field: 'type', - dictType: DICT_TYPE.DEVICE_MOLD_TYPE, - dictClass: 'string', - sort: 'custom', - isSearch: false, - form: { - value: 'MOLD', - componentProps: { - disabled: true, - } - } - }, { label: '模具编号', field: 'deviceNumber', @@ -84,6 +89,13 @@ export const MoldMaintenance = useCrudSchemas(reactive([ } } }, + { + label: '模具名称', + field: 'deviceName', + sort: 'custom', + isSearch: false, + isForm: false, + }, { label: '项类型', field: 'status', @@ -106,9 +118,9 @@ export const MoldMaintenance = useCrudSchemas(reactive([ dictClass: 'string', sort: 'custom', isSearch: false, - form: { - component: 'Select' - }, + form: { + component: 'Select' + }, }, { label: '是否可用',