From e2c0fd072b2c07c52eb4faf68376b767bbe8699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 6 Mar 2024 17:30:16 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/basic/deviceMaintenance/index.vue | 4 +++- src/views/eam/basic/inspection/index.vue | 2 ++ src/views/eam/basic/locationArea/index.vue | 2 +- src/views/eam/basic/locationArea/locationArea.data.ts | 6 +++--- src/views/eam/basic/moldMaintenance/index.vue | 2 ++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/eam/basic/deviceMaintenance/index.vue b/src/views/eam/basic/deviceMaintenance/index.vue index f4d5926..008e83a 100644 --- a/src/views/eam/basic/deviceMaintenance/index.vue +++ b/src/views/eam/basic/deviceMaintenance/index.vue @@ -196,8 +196,10 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + tableObject.params.type="DEVICE" + tableObject.params.status="MAINTAIN" const data = await DeviceMaintenanceApi.exportDeviceMoldItems(tableObject.params) - download.excel(data, '项记录表(设备 模具 保养 维修 巡检点检).xlsx') + download.excel(data, '设备保养项配置.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/eam/basic/inspection/index.vue b/src/views/eam/basic/inspection/index.vue index 0aa208a..d6fc1b2 100644 --- a/src/views/eam/basic/inspection/index.vue +++ b/src/views/eam/basic/inspection/index.vue @@ -197,6 +197,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + tableObject.params.type="DEVICE" + tableObject.params.status="INSPECTION" const data = await DeviceMoldItemsApi.exportDeviceMoldItems(tableObject.params) download.excel(data, '项记录表(设备 模具 保养 维修 巡检点检).xlsx') } catch { diff --git a/src/views/eam/basic/locationArea/index.vue b/src/views/eam/basic/locationArea/index.vue index 109dddd..45cf784 100644 --- a/src/views/eam/basic/locationArea/index.vue +++ b/src/views/eam/basic/locationArea/index.vue @@ -190,7 +190,7 @@ await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await LocationAreaApi.exportLocationArea(setSearchParams) + const data = await LocationAreaApi.exportLocationArea(tableObject.params) download.excel(data, '库区.xls') } catch { } finally { diff --git a/src/views/eam/basic/locationArea/locationArea.data.ts b/src/views/eam/basic/locationArea/locationArea.data.ts index 06d5688..fcd7ed6 100644 --- a/src/views/eam/basic/locationArea/locationArea.data.ts +++ b/src/views/eam/basic/locationArea/locationArea.data.ts @@ -34,17 +34,17 @@ export const LocationArea = useCrudSchemas(reactive([ dictType: DICT_TYPE.LOCATION_AREA_TYPE, dictClass: 'string', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'Select' }, }, { - label: '状态', + label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, sort: 'custom', table: { diff --git a/src/views/eam/basic/moldMaintenance/index.vue b/src/views/eam/basic/moldMaintenance/index.vue index 8a7f6c6..6419c24 100644 --- a/src/views/eam/basic/moldMaintenance/index.vue +++ b/src/views/eam/basic/moldMaintenance/index.vue @@ -196,6 +196,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + tableObject.params.type="MOLD" + tableObject.params.status="MAINTAIN" const data = await MoldMaintenanceApi.exportDeviceMoldItems(tableObject.params) download.excel(data, '项记录表(设备 模具 保养 维修 巡检点检).xlsx') } catch {