diff --git a/src/views/mes/zjTask/index.vue b/src/views/mes/zjTask/index.vue index aee320e1..967fc209 100644 --- a/src/views/mes/zjTask/index.vue +++ b/src/views/mes/zjTask/index.vue @@ -61,7 +61,15 @@ type="success" plain @click="handleExport" :loading="exportLoading" - + + @@ -168,6 +176,8 @@ const exportLoading = ref(false) const orgTypeOptions = getStrDictOptions(DICT_TYPE.MES_ORG_TYPE) +const selectedIds = ref([]) + const getList = async () => { loading.value = true try { @@ -210,11 +220,19 @@ const handleDelete = async (id: number) => { } catch { } } +const handleSelectionChange = (rows: ZjTaskVO[]) => { + selectedIds.value = (rows.map((row) => row.id).filter((id) => id !== undefined && id !== null) as number[]) +} + const handleExport = async () => { try { await message.exportConfirm() exportLoading.value = true - const data = await ZjTaskApi.exportZjTask(queryParams) + const params = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined, + } + const data = await ZjTaskApi.exportZjTask(params) download.excel(data, '检验任务.xls') } catch { } finally { diff --git a/src/views/mes/zjitem/index.vue b/src/views/mes/zjitem/index.vue index 8da9e339..9e1a238e 100644 --- a/src/views/mes/zjitem/index.vue +++ b/src/views/mes/zjitem/index.vue @@ -44,7 +44,15 @@ type="success" plain @click="handleExport" :loading="exportLoading" - + + @@ -113,6 +121,7 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 +const selectedIds = ref([]) /** 查询列表 */ const getList = async () => { @@ -157,6 +166,10 @@ const handleDelete = async (id: number) => { } catch { } } +const handleSelectionChange = (rows: any[]) => { + selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? [] +} + /** 导出按钮操作 */ const handleExport = async () => { try { @@ -164,7 +177,11 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ZjItemApi.exportZjItem(queryParams) + const params = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined, + } + const data = await ZjItemApi.exportZjItem(params) download.excel(data, '质量管理-检验项目.xls') } catch { } finally { diff --git a/src/views/mes/zjschema/index.vue b/src/views/mes/zjschema/index.vue index be4c06dd..f8aa7a5a 100644 --- a/src/views/mes/zjschema/index.vue +++ b/src/views/mes/zjschema/index.vue @@ -61,7 +61,15 @@ type="success" plain @click="handleExport" :loading="exportLoading" - + +