diff --git a/src/views/eam/basic/assetsAccount/assetsAccount.data.ts b/src/views/eam/basic/assetsAccount/assetsAccount.data.ts index c8a3df6..171b4cb 100644 --- a/src/views/eam/basic/assetsAccount/assetsAccount.data.ts +++ b/src/views/eam/basic/assetsAccount/assetsAccount.data.ts @@ -288,6 +288,50 @@ export const AssetsAccount = useCrudSchemas(reactive([ } } }, + { + label: '创建者', + field: 'creator', + hiddenSearchHigh: true, + sort: 'custom', + isSearch: false, + table: { + width: '150', + }, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + hiddenSearchHigh: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: '150', + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts b/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts index ef341b9..b4df989 100644 --- a/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts +++ b/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts @@ -171,6 +171,50 @@ export const AssetsAccountControlsHistory = useCrudSchemas(reactive([ sort: 'custom', form: { componentProps:{ - disabled:true + } } }, diff --git a/src/views/eam/basic/basciYearEquipment/index.vue b/src/views/eam/basic/basciYearEquipment/index.vue index b854895..6b91f27 100644 --- a/src/views/eam/basic/basciYearEquipment/index.vue +++ b/src/views/eam/basic/basciYearEquipment/index.vue @@ -113,7 +113,7 @@ const HeadButttondata = [ defaultButtons.defaultImportBtn(null), // 导入 //defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 - //defaultButtons.defaultFilterBtn(null), // 筛选 + defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 // { // label: '自定义扩展按钮', diff --git a/src/views/eam/basic/basicMonthEquipment/index.vue b/src/views/eam/basic/basicMonthEquipment/index.vue index 76b74fe..9b6785f 100644 --- a/src/views/eam/basic/basicMonthEquipment/index.vue +++ b/src/views/eam/basic/basicMonthEquipment/index.vue @@ -101,7 +101,7 @@ const HeadButttondata = [ defaultButtons.defaultImportBtn(null), // 导入 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 - // defaultButtons.defaultFilterBtn(null), // 筛选 + defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 // { // label: '自定义扩展按钮', diff --git a/src/views/eam/basic/classType/classType.data.ts b/src/views/eam/basic/classType/classType.data.ts index ddf5c0e..a5fd35b 100644 --- a/src/views/eam/basic/classType/classType.data.ts +++ b/src/views/eam/basic/classType/classType.data.ts @@ -64,6 +64,7 @@ export const ClassType = useCrudSchemas(reactive([ { label: '维修工角色', field: 'workerRoleId', + hiddenSearchHigh: true, sort: 'custom', isForm: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { @@ -73,6 +74,7 @@ export const ClassType = useCrudSchemas(reactive([ { label: '维修工角色', field: 'workerRoleName', + hiddenSearchHigh: true, sort: 'custom', form: { // labelMessage: '信息提示说明!!!', @@ -99,6 +101,7 @@ export const ClassType = useCrudSchemas(reactive([ { label: '工程师角色', field: 'engineerRoleId', + hiddenSearchHigh: true, sort: 'custom', isForm: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { @@ -108,6 +111,7 @@ export const ClassType = useCrudSchemas(reactive([ { label: '工程师角色', field: 'engineerRoleName', + hiddenSearchHigh: true, sort: 'custom', form: { // labelMessage: '信息提示说明!!!', @@ -150,6 +154,7 @@ export const ClassType = useCrudSchemas(reactive([ { label: '所属厂区', field: 'factoryAreaNumber', + hiddenSearchHigh: true, isSearch: true, sort: 'custom', isForm: false, @@ -173,6 +178,7 @@ export const ClassType = useCrudSchemas(reactive([ { label: '所属厂区', field: 'factoryAreaName', + hiddenSearchHigh: true, isSearch: false, sort: 'custom', form: { diff --git a/src/views/eam/basic/classType/index.vue b/src/views/eam/basic/classType/index.vue index f5ac01d..8d6868f 100644 --- a/src/views/eam/basic/classType/index.vue +++ b/src/views/eam/basic/classType/index.vue @@ -114,7 +114,7 @@ const HeadButttondata = [ // defaultButtons.defaultImportBtn({hasPermi:'eam:classType:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'eam:classType:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 - // defaultButtons.defaultFilterBtn(null), // 筛选 + defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 // { // label: '自定义扩展按钮', diff --git a/src/views/eam/basic/fixedAssets/fixedAssets.data.ts b/src/views/eam/basic/fixedAssets/fixedAssets.data.ts index 4785137..b70b6dc 100644 --- a/src/views/eam/basic/fixedAssets/fixedAssets.data.ts +++ b/src/views/eam/basic/fixedAssets/fixedAssets.data.ts @@ -313,6 +313,50 @@ export const FixedAssets = useCrudSchemas(reactive([ } } }, + { + label: '创建者', + field: 'creator', + hiddenSearchHigh: true, + sort: 'custom', + isSearch: false, + table: { + width: '150', + }, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + hiddenSearchHigh: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: '150', + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts b/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts index 0319207..caad0fd 100644 --- a/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts +++ b/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts @@ -181,6 +181,50 @@ export const FixedAssetsControlsHistory = useCrudSchemas(reactive( } } }, + { + label: '创建者', + field: 'creator', + hiddenSearchHigh: true, + sort: 'custom', + isSearch: false, + table: { + width: '150', + }, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + hiddenSearchHigh: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: '150', + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts b/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts index 0905638..7654e41 100644 --- a/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts +++ b/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts @@ -5,95 +5,97 @@ import { dateFormatter } from '@/utils/formatTime' export const ItemOutLocationRules = reactive({ number: [required], itemNumber: [required], - locationNumber: [required], + locationNumber: [required] }) -export const ItemOutLocation = useCrudSchemas(reactive([ - { - label: '出库编号', - field: 'number', - sort: 'custom', - isSearch: true, - }, - { - label: '备件名称', - field: 'name', - sort: 'custom', - isSearch: true, - }, - { - label: '库位编号', - field: 'locationNumber', - sort: 'custom', - isSearch: true, - }, - { - label: '批次', - field: 'batch', - sort: 'custom', - isSearch: false, - }, - { - label: '类型', - field: 'type', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.ITEM_OUT_IN_TYPE, - dictClass: 'string', - form: { - component: 'Select' +export const ItemOutLocation = useCrudSchemas( + reactive([ + { + label: '出库编号', + field: 'number', + sort: 'custom', + isSearch: true }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - isSearch: false, - }, -{ - label: '创建者', - field: 'creator', - hiddenSearchHigh: true, - sort: 'custom', - isSearch: false, - isForm: false, + { + label: '备件名称', + field: 'name', + sort: 'custom', + isSearch: true + }, + { + label: '库位编号', + field: 'locationNumber', + sort: 'custom', + isSearch: true + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: false + }, + { + label: '类型', + field: 'type', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.ITEM_OUT_IN_TYPE, + dictClass: 'string', + form: { + component: 'Select' + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + isSearch: false + }, + { + label: '创建者', + field: 'creator', + hiddenSearchHigh: true, + sort: 'custom', + isSearch: false, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + hiddenSearchHigh: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - { - label: '创建时间', - field: 'createTime', - hiddenSearchHigh: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - isTable: true, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - }, - isForm: false, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + sort: 'custom', + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' } }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - fixed: 'right' + isForm: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + } + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + fixed: 'right' + } } - } -])) + ]) +)