diff --git a/src/api/eam/device/deviceMaintainOrderMain/index.ts b/src/api/eam/device/deviceMaintainOrderMain/index.ts index a79189c..a0baa46 100644 --- a/src/api/eam/device/deviceMaintainOrderMain/index.ts +++ b/src/api/eam/device/deviceMaintainOrderMain/index.ts @@ -52,7 +52,13 @@ export const deleteDeviceMaintainOrderMain = async (id: number) => { // 导出保养工单主 Excel export const exportDeviceMaintainOrderMain = async (params) => { - return await request.download({ url: `/eam/device-maintain-job-main/export-excel`, params }) + params.type = 'DEVICE' + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/device-maintain-job-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/device-maintain-job-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/device/deviceMaintainPlan/index.ts b/src/api/eam/device/deviceMaintainPlan/index.ts index 016d33f..4bb2355 100644 --- a/src/api/eam/device/deviceMaintainPlan/index.ts +++ b/src/api/eam/device/deviceMaintainPlan/index.ts @@ -46,7 +46,13 @@ export const deleteDeviceMaintainPlan = async (id: number) => { // 导出保养计划 Excel export const exportDeviceMaintainPlan = async (params) => { - return await request.download({ url: `/eam/device-maintain-plan/export-excel`, params }) + params.type = 'DEVICE' + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/device-maintain-plan/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/device-maintain-plan/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/device/deviceMaintainPlan/index.vue b/src/views/eam/device/deviceMaintainPlan/index.vue index a1bb45e..d29a769 100644 --- a/src/views/eam/device/deviceMaintainPlan/index.vue +++ b/src/views/eam/device/deviceMaintainPlan/index.vue @@ -101,7 +101,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:'eam:device-Maintain-Plan:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'eam:device-Maintain-Plan:import'}), // 导入 - // defaultButtons.defaultExportBtn({hasPermi:'eam:device-Maintain-Plan:export'}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -228,6 +228,11 @@ const importSuccess = () => { // 筛选提交 const searchFormClick = (searchData) => { + searchData.filters.push({ + action: '==', + column: 'type', + value: 'DEVICE' + }) tableObject.params = { isSearch: true, filters: searchData.filters diff --git a/src/views/eam/device/devicemaintainjob/index.vue b/src/views/eam/device/devicemaintainjob/index.vue index c0516c3..8760fee 100644 --- a/src/views/eam/device/devicemaintainjob/index.vue +++ b/src/views/eam/device/devicemaintainjob/index.vue @@ -260,7 +260,7 @@ const HeadButttondata = [ // defaultButtons.defaultAddBtn({ // }), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintain-job-main:import'}), - // defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintain-job-main:export'}), + defaultButtons.defaultExportBtn(null), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -405,7 +405,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DeviceMaintainOrderMainApi.exportDeviceMaintainOrderMain(tableObject.params) - download.excel(data, '维修工单主.xlsx') + download.excel(data, '保养工单.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts index 1801b9e..5a2db3f 100644 --- a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts +++ b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts @@ -34,6 +34,11 @@ export const ItemMaintenance = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, + { + label: '库位编号', + field: 'locationNumber', + sort: 'custom', + }, { label: '批次', field: 'batch',