This commit is contained in:
zyh
2026-03-01 14:19:18 +08:00
8 changed files with 64 additions and 33 deletions

View File

@@ -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;
}
}
/* ------------------ 药品/处方/下拉 ------------------ */

View File

@@ -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;
}
}
/* ---------- 弹窗取消 / 重置 ---------- */

View File

@@ -18,14 +18,12 @@
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-form-item label="技术员">
<el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
<el-select v-model="queryParams.technician" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="消毒方式" prop="way">
<el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
@@ -108,15 +106,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-form-item label="技术员">
<el-select v-model="form.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
<el-select v-model="form.technician" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
@@ -212,16 +208,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="技术员">
<el-form-item label="技术员">
<el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
<el-select v-model="editForm.technician" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
@@ -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;
}
}
/* ---------- 下拉数据 ---------- */

View File

@@ -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;
}
}
/* ------------------ 药品/处方/下拉 ------------------ */

View File

@@ -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;
}
}
/* ------------------ 药品/处方/下拉 ------------------ */

View File

@@ -269,7 +269,7 @@
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="检疫结果" prop="result">
<el-select v-model="addForm.result" placeholder="检疫结果">
@@ -277,7 +277,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row :gutter="20">
<el-col :span="22">
@@ -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;
}
}
/* 跳转治疗 */

View File

@@ -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, {

View File

@@ -109,6 +109,7 @@
<!-- 数据表格 -->
<el-table v-loading="loading" :data="usageList" @selection-change="handleSelectionChange" max-height="650px">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="使用时间" align="center" prop="datetime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
@@ -210,6 +211,7 @@ import { searchEarNumbers } from '@/api/common/sheep'
const { proxy } = getCurrentInstance()
const { pres_type } = proxy.useDict('pres_type')
const ids = ref([]) // 选中项ID列表
const usageList = ref([])
const swMedicineUsageDetailsList = ref([])
const open = ref(false)
@@ -473,11 +475,13 @@ function rowSwMedicineUsageDetailsIndex({ rowIndex }) {
return `row-${rowIndex}`
}
function handleExport() {
proxy.download(
'biosafety/usageInfo/export',
{ ...queryParams.value },
`药品使用记录_${new Date().getTime()}.xlsx`
)
queryParams.value.ids = ids.value;
try {
proxy.download('biosafety/usageInfo/export',{ ...queryParams.value },`药品使用记录_${new Date().getTime()}.xlsx`)
} finally {
queryParams.ids = null;
}
}
/* 初始化 */