diff --git a/src/views/biosafety/deworm/index.vue b/src/views/biosafety/deworm/index.vue index bd5948a..675ded0 100644 --- a/src/views/biosafety/deworm/index.vue +++ b/src/views/biosafety/deworm/index.vue @@ -769,7 +769,13 @@ } function handleExport() { - proxy.download('biosafety/deworm/export', { ...queryParams }, `驱虫_${Date.now()}.xlsx`) + queryParams.ids = ids.value; + try { + proxy.download('biosafety/deworm/export', { ...queryParams }, `驱虫_${Date.now()}.xlsx`) + } finally { + queryParams.ids = null; + } + } /* ------------------ 药品/处方/下拉 ------------------ */ diff --git a/src/views/biosafety/diagnosis/index.vue b/src/views/biosafety/diagnosis/index.vue index 6ddb506..32e6105 100644 --- a/src/views/biosafety/diagnosis/index.vue +++ b/src/views/biosafety/diagnosis/index.vue @@ -325,6 +325,7 @@ const daterangeDatetime = ref([]) // 日期区间 const queryParams = ref({ pageNum: 1, pageSize: 20, + ids: null, sheepNo: null, allEarNumbers: null, datetime: null, @@ -632,11 +633,13 @@ function handleDelete(row) { /* ---------- 导出 ---------- */ function handleExport() { - proxy.download( - 'diagnosis/diagnosis/export', - { ...queryParams.value }, - `diagnosis_${new Date().getTime()}.xlsx` - ) + queryParams.value.ids = ids.value;; + try { + proxy.download('diagnosis/diagnosis/export',{ ...queryParams.value },`诊疗_${new Date().getTime()}.xlsx`) + } finally { + queryParams.ids = null; + } + } /* ---------- 弹窗取消 / 重置 ---------- */ diff --git a/src/views/biosafety/disinfect/index.vue b/src/views/biosafety/disinfect/index.vue index 389c520..a60aab8 100644 --- a/src/views/biosafety/disinfect/index.vue +++ b/src/views/biosafety/disinfect/index.vue @@ -18,14 +18,12 @@ - - {{ item.label }} - @@ -108,15 +106,13 @@ - - {{ item.label }} - @@ -212,16 +208,14 @@ - - {{ item.label }} - @@ -517,7 +511,13 @@ function handleDelete(row) { } function handleExport() { - proxy.download('biosafety/disinfect/export', { ...queryParams }, `消毒_${Date.now()}.xlsx`) + queryParams.ids = ids.value; + try { + proxy.download('biosafety/disinfect/export', { ...queryParams }, `消毒_${Date.now()}.xlsx`) + } finally { + queryParams.ids = null; + } + } /* ---------- 下拉数据 ---------- */ diff --git a/src/views/biosafety/health/index.vue b/src/views/biosafety/health/index.vue index 0b8b271..8464ab3 100644 --- a/src/views/biosafety/health/index.vue +++ b/src/views/biosafety/health/index.vue @@ -801,7 +801,12 @@ function handleDelete(row) { } function handleExport() { - proxy.download('biosafety/health/export', { ...queryParams }, `保健_${Date.now()}.xlsx`) + queryParams.ids = ids.value; + try { + proxy.download('biosafety/health/export', { ...queryParams }, `保健_${Date.now()}.xlsx`) + } finally { + queryParams.ids = null; + } } /* ------------------ 药品/处方/下拉 ------------------ */ diff --git a/src/views/biosafety/immunity/index.vue b/src/views/biosafety/immunity/index.vue index 7c7023a..ed52c74 100644 --- a/src/views/biosafety/immunity/index.vue +++ b/src/views/biosafety/immunity/index.vue @@ -420,7 +420,8 @@ const queryParams = reactive({ pageSize: 20, sheepNo: null, allEarNumbers: [], // 修改:改为数组,支持多耳号 - technical: null, + technician: null, + ids: null, orderByColumn: null, // 新增 isAsc: null // 新增 }) @@ -797,7 +798,12 @@ function handleDelete(row) { } function handleExport() { - proxy.download('biosafety/immunity/export', { ...queryParams }, `免疫_${Date.now()}.xlsx`) + queryParams.ids = ids.value; + try { + proxy.download('biosafety/immunity/export', { ...queryParams }, `免疫_${Date.now()}.xlsx`); + } finally { + queryParams.ids = null; + } } /* ------------------ 药品/处方/下拉 ------------------ */ diff --git a/src/views/biosafety/quarantine/index.vue b/src/views/biosafety/quarantine/index.vue index d00996e..f4de600 100644 --- a/src/views/biosafety/quarantine/index.vue +++ b/src/views/biosafety/quarantine/index.vue @@ -269,7 +269,7 @@ - + @@ -428,7 +428,7 @@ const technicalOptions = ref([]) //自定义技术员数组变量 // 获取技术员列表 const fetchTechnicalList = () => { - getUserByPost({ postCode: "" }) + getUserByPost({ postCode: '' }) .then(res => { if (res.code === 200 && Array.isArray(res.data)) { technicalOptions.value = res.data.map(item => ({ @@ -867,11 +867,12 @@ function handleDelete(row) { /* 导出 */ function handleExport() { - proxy.download( - '/biosafety/quarantine/export', - queryParams, - `检疫_${Date.now()}.xlsx` - ) + queryParams.ids = ids.value; + try { + proxy.download('/biosafety/quarantine/export', queryParams, `检疫_${Date.now()}.xlsx`) + } finally { + queryParams.ids = null; + } } /* 跳转治疗 */ diff --git a/src/views/biosafety/treatment/index.vue b/src/views/biosafety/treatment/index.vue index aaef377..c606236 100644 --- a/src/views/biosafety/treatment/index.vue +++ b/src/views/biosafety/treatment/index.vue @@ -1028,7 +1028,13 @@ function handleDelete(row) { .then(() => { getList(); proxy.$modal.msgSuccess('删除成功') }) } function handleExport() { - proxy.download('treatment/treatment/export', { ...queryParams }, `治疗记录_${Date.now()}.xlsx`) + queryParams.ids = ids.value; + try { + proxy.download('treatment/treatment/export', { ...queryParams }, `治疗记录_${Date.now()}.xlsx`) + } finally { + queryParams.ids = null; + } + } function resetForm(formObj) { Object.assign(formObj, { diff --git a/src/views/biosafety/usageInfo/index.vue b/src/views/biosafety/usageInfo/index.vue index 3c9ba0a..643cfbe 100644 --- a/src/views/biosafety/usageInfo/index.vue +++ b/src/views/biosafety/usageInfo/index.vue @@ -109,6 +109,7 @@ +