使用药品,日期展示修改

This commit is contained in:
漂泊 2025-10-13 13:32:23 +08:00
parent 9c200ba2f5
commit fa3629fbe7
8 changed files with 247 additions and 178 deletions

View File

@ -30,9 +30,6 @@
<el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -45,6 +42,9 @@
<el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="技术员" align="center" prop="technical" />
<el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">
<template #default="scope">

View File

@ -64,7 +64,8 @@
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="耳号" align="center" prop="sheepNo" />
<el-table-column label="事件日期" align="center" prop="datetime" width="150">
@ -76,23 +77,23 @@
<el-table-column label="性别" align="center" prop="gender">
<template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
</el-table-column>
<el-table-column label="胎次" align="center" prop="parity" />
<el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
<el-table-column label="疾病类型" align="center" prop="diseasePName" />
<el-table-column label="子疾病" align="center" prop="diseaseName" />
<el-table-column label="诊疗结果" align="center" prop="result">
<template #default="scope"><dict-tag :options="diag_result" :value="scope.row.result" /></template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="begindate" width="150">
<el-table-column label="开始时间" align="center" prop="begindate" width="150" sortable="custom">
<template #default="scope">
<span>{{ parseTime(scope.row.begindate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="enddate" width="150">
<el-table-column label="结束时间" align="center" prop="enddate" width="150" sortable="custom">
<template #default="scope">
<span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="治疗天数" align="center" prop="treatDay" />
<el-table-column label="治疗天数" align="center" prop="treatDay" sortable="custom" />
<el-table-column label="羊舍" align="center" prop="sheepfold" width="150px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140px">
<template #default="scope">
@ -199,34 +200,131 @@
</template>
</el-dialog>
</div>
</template>
<script setup name="Diagnosis">
import { listDiagnosis, getDiagnosis, delDiagnosis, updateDiagnosis } from '@/api/biosafety/diagnosis'
import { listSheepfold_management } from "@/api/fileManagement/sheepfold_management"
import { getCurrentInstance, onMounted, reactive, ref, toRefs, watch } from 'vue'
</template><script setup name="Diagnosis">
import {
listDiagnosis,
getDiagnosis,
delDiagnosis,
updateDiagnosis,
} from '@/api/biosafety/diagnosis'
import { listSheepfold_management } from '@/api/fileManagement/sheepfold_management'
import { listDisease } from '@/api/biosafety/disease'
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
/* ---------- 基础依赖 ---------- */
const { proxy } = getCurrentInstance()
const { sheep_gender, diag_result } = proxy.useDict("sheep_gender", "diag_result")
const { sheep_gender, diag_result } = proxy.useDict('sheep_gender', 'diag_result')
/* 列表数据 */
/* ---------- 表格 & 分页 ---------- */
const diagnosisList = ref([])
const open = ref(false)
const loading = ref(true)
const total = ref(0)
const showSearch = ref(true)
const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref('')
const daterangeDatetime = ref([])
/* 下拉数据源 */
/* ---------- 查询参数 ---------- */
const daterangeDatetime = ref([]) //
const queryParams = ref({
pageNum: 1,
pageSize: 20,
sheepNo: null,
datetime: null,
diseasePid: null,
diseaseId: null,
result: null,
treatDay: null,
sheepfoldId: null,
orderByColumn: null,
isAsc: null,
})
/* ---------- 表单 & 校验 ---------- */
const open = ref(false)
const title = ref('')
const diagnosisRef = ref(null)
const form = ref({
id: undefined,
sheepNo: undefined,
datetime: undefined,
diseasePid: undefined,
diseaseId: undefined,
result: undefined,
begindate: undefined,
enddate: undefined,
treatDay: undefined,
sheepfoldId: undefined,
remark: undefined,
})
const rules = {
enddate: [
{
validator: (rule, value, callback) => {
if (!value) return callback(new Error('请选择结束时间'))
if (new Date(value) < new Date(form.value.begindate)) {
return callback(new Error('结束时间不能早于开始时间'))
}
callback()
},
trigger: 'change',
},
],
}
/* ---------- 下拉数据源 ---------- */
const pDiseaseOptions = ref([])
const cDiseaseOptions = ref([])
const sheepfoldOptions = ref([])
const data = reactive({
form: {},
queryParams: {
/* ---------- 疾病下拉 ---------- */
function getDiseases() {
listDisease().then((res) => {
const tree = proxy.handleTree(res.data, 'id', 'pid')
pDiseaseOptions.value = tree.filter((o) => o.pid === 0)
})
}
function handleDiseaseTypeChange(pid) {
if (!pid) {
cDiseaseOptions.value = []
queryParams.value.diseaseId = null
return
}
listDisease({ pid }).then((res) => {
cDiseaseOptions.value = res.data
})
}
/* ---------- 获取列表 ---------- */
function getList() {
loading.value = true
//
queryParams.value.params = {}
if (daterangeDatetime.value?.length === 2) {
queryParams.value.params.beginDatetime = daterangeDatetime.value[0]
queryParams.value.params.endDatetime = daterangeDatetime.value[1]
}
listDiagnosis(queryParams.value).then((res) => {
diagnosisList.value = res.rows
total.value = res.total
loading.value = false
})
}
/* ---------- 搜索 / 重置 ---------- */
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
function resetQuery() {
proxy.resetForm('queryRef')
daterangeDatetime.value = []
resetQueryParams()
handleQuery()
}
function resetQueryParams() {
queryParams.value = {
pageNum: 1,
pageSize: 20,
sheepNo: null,
@ -235,133 +333,55 @@ const data = reactive({
diseaseId: null,
result: null,
treatDay: null,
sheepfoldId: null
},
rules: {
enddate: [
{
validator: (rule, value, callback) => {
if (!value) {
callback(new Error('请选择结束时间'))
} else if (new Date(value) < new Date(form.value.begindate)) {
callback(new Error('结束时间不能早于开始时间'))
} else {
callback()
}
},
trigger: 'change'
}
]
sheepfoldId: null,
orderByColumn: null,
isAsc: null,
}
})
const { queryParams, form, rules } = toRefs(data)
const pDiseaseOptions = ref([])
const cDiseaseOptions = ref([])
/* 疾病下拉 */
function getDiseases() {
listDisease().then(response => {
const diseases = proxy.handleTree(response.data, "id", "pid")
pDiseaseOptions.value = diseases.filter(item => item.pid === 0)
})
}
function handleDiseaseTypeChange(parentId) {
if (!parentId) {
cDiseaseOptions.value = []
return
}
listDisease({ pid: parentId }).then(response => {
cDiseaseOptions.value = response.data
})
}
/* 查询列表 */
function getList() {
loading.value = true
queryParams.value.params = {}
if (daterangeDatetime.value && daterangeDatetime.value.length) {
queryParams.value.params.beginDatetime = daterangeDatetime.value[0]
queryParams.value.params.endDatetime = daterangeDatetime.value[1]
}
listDiagnosis(queryParams.value).then((response) => {
diagnosisList.value = response.rows
total.value = response.total
loading.value = false
})
}
/* 取消/重置 */
function cancel() {
open.value = false
reset()
}
function reset() {
form.value = {
id: null,
treatId: null,
sheepId: null,
sheepNo: null,
datetime: null,
sheepType: null,
gender: null,
parity: null,
diseasePid: null,
diseaseId: null,
result: '',
begindate: null,
enddate: null,
treatDay: null,
sheepfoldId: null
}
proxy.resetForm('diagnosisRef')
}
/* 搜索 / 重置 */
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
function resetQuery() {
daterangeDatetime.value = []
proxy.resetForm('queryRef')
handleQuery()
}
/* 多选 */
/* ---------- 多选 ---------- */
function handleSelectionChange(selection) {
ids.value = selection.map((item) => item.id)
ids.value = selection.map((i) => i.id)
single.value = selection.length !== 1
multiple.value = !selection.length
}
/* 修改 */
/* ---------- 排序 ---------- */
function handleSortChange({ prop, order }) {
if (!order) {
queryParams.value.orderByColumn = null
queryParams.value.isAsc = null
} else {
queryParams.value.orderByColumn = prop
queryParams.value.isAsc = order === 'ascending' ? 'asc' : 'desc'
}
getList()
}
/* ---------- 新增 / 修改 ---------- */
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getDiagnosis(_id).then((response) => {
form.value = response.data
const id = row.id || ids.value
getDiagnosis(id).then((res) => {
form.value = res.data
open.value = true
title.value = '修改诊疗结果'
})
}
/* 提交 */
/* ---------- 提交 ---------- */
function submitForm() {
proxy.$refs.diagnosisRef.validate((valid) => {
if (valid) {
updateDiagnosis(form.value).then(() => {
proxy.$modal.msgSuccess('修改成功')
open.value = false
getList()
})
}
if (!valid) return
updateDiagnosis(form.value).then(() => {
proxy.$modal.msgSuccess('修改成功')
open.value = false
getList()
})
})
}
/* 删除 */
/* ---------- 删除 ---------- */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy
@ -371,10 +391,9 @@ function handleDelete(row) {
getList()
proxy.$modal.msgSuccess('删除成功')
})
.catch(() => { })
}
/* 导出 */
/* ---------- 导出 ---------- */
function handleExport() {
proxy.download(
'diagnosis/diagnosis/export',
@ -383,35 +402,52 @@ function handleExport() {
)
}
/* 🔥 监听 enddate 变化,自动计算治疗天数 */
watch(() => form.value.enddate, (newVal) => {
if (newVal && form.value.begindate) {
const start = new Date(form.value.begindate)
const end = new Date(newVal)
const diffTime = Math.abs(end - start)
const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
form.value.treatDay = diffDays
} else {
/* ---------- 弹窗取消 / 重置 ---------- */
function cancel() {
open.value = false
reset()
}
function reset() {
form.value = {
id: undefined,
sheepNo: undefined,
datetime: undefined,
diseasePid: undefined,
diseaseId: undefined,
result: undefined,
begindate: undefined,
enddate: undefined,
treatDay: undefined,
sheepfoldId: undefined,
remark: undefined,
}
proxy.resetForm('diagnosisRef')
}
/* ---------- 自动计算治疗天数 ---------- */
const calcTreatDay = () => {
const { begindate, enddate } = form.value
if (!begindate || !enddate) {
form.value.treatDay = 0
return
}
})
/* 🔥 可选:监听 begindate 变化,重新计算天数 */
watch(() => form.value.begindate, () => {
if (form.value.enddate) {
const start = new Date(form.value.begindate)
const end = new Date(form.value.enddate)
const diffTime = Math.abs(end - start)
const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
form.value.treatDay = diffDays
}
})
const diff = Math.ceil(
(new Date(enddate) - new Date(begindate)) / (1000 * 60 * 60 * 24)
)
form.value.treatDay = diff >= 0 ? diff : 0
}
watch(() => form.value.begindate, calcTreatDay)
watch(() => form.value.enddate, calcTreatDay)
/* ---------- 初始化 ---------- */
onMounted(() => {
getList()
getDiseases()
listSheepfold_management().then(res => {
sheepfoldOptions.value = res.rows.map(item => ({ value: item.id, label: item.sheepfoldName }))
listSheepfold_management().then((res) => {
sheepfoldOptions.value = res.rows.map((i) => ({
value: i.id,
label: i.sheepfoldName,
}))
})
})
</script>

View File

@ -43,13 +43,13 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="disinfectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="消毒日期" align="center" prop="datetime" width="180">
<!-- 2 显示格式含时分 -->
<template #default="scope">
{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
</template>
</el-table-column>
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="消毒方式" align="center" prop="way">
<template #default="scope">

View File

@ -29,10 +29,7 @@
<!-- 3. 列表 -->
<el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="保健日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -47,6 +44,10 @@
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="技术员" align="center" prop="technical" />
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="保健日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">
<template #default="scope">

View File

@ -30,9 +30,7 @@
<el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="免疫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -43,7 +41,10 @@
</el-table-column>
<el-table-column label="月龄" align="center" prop="monthAge" sortable="custom" />
<el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="免疫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="技术员" align="center" prop="technical" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">

View File

@ -53,10 +53,10 @@
</el-row>
<!-- 表格 -->
<el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="检疫日期" align="center" prop="datetime" width="180"
:formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="羊只性别" align="center" prop="gender">
<template #default="scope">
@ -64,8 +64,10 @@
</template>
</el-table-column>
<el-table-column label="羊只类别" align="center" prop="sheepType" />
<el-table-column label="月龄" align="center" prop="monthAge" />
<el-table-column label="月龄" align="center" prop="monthAge" sortable="custom" />
<el-table-column label="繁育状态" align="center" prop="breed" />
<el-table-column label="检疫日期" align="center" prop="datetime" width="180"
:formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
<el-table-column label="检疫项目" align="center" prop="itemName" />
<el-table-column label="样品类型" align="center" prop="sample" />
<el-table-column label="采样员" align="center" prop="sampler" />
@ -314,7 +316,9 @@ const daterangeDatetime = ref([])
const queryParams = reactive({
pageNum: 1,
pageSize: 20,
sheepId: null
sheepId: null,
orderByColumn: null, //
isAsc: null //
})
/* 多选 */
@ -327,6 +331,19 @@ function handleSelectionChange(sel) {
multiple.value = !sel.length
}
function handleSortChange({ prop, order }) {
if (!order) { //
queryParams.orderByColumn = null
queryParams.isAsc = null
} else {
queryParams.orderByColumn = prop // monthAge parity
queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc'
}
getList()
}
/* 下拉数据 */
const quarantineItems = ref([])
const sampleTypes = ref([])

View File

@ -48,11 +48,7 @@
<el-table v-loading="loading" :data="treatmentList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange">
<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>
</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -62,13 +58,18 @@
</el-table-column>
<el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="泌乳天数" align="center" prop="lactDay" sortable="custom" width="120px"/>
<el-table-column label="怀孕天数" align="center" prop="gestDay" sortable="custom" width="120px"/>
<el-table-column label="泌乳天数" align="center" prop="lactDay" sortable="custom" width="120px" />
<el-table-column label="怀孕天数" align="center" prop="gestDay" sortable="custom" width="120px" />
<el-table-column label="疾病类型" align="center" prop="diseaseName" />
<el-table-column label="治疗状态" align="center" prop="treatmentPlan">
<template #default="scope"><dict-tag :options="treat_status" :value="scope.row.status" /></template>
</el-table-column>
<el-table-column label="兽医" align="center" prop="veterinary" />
<el-table-column label="治疗日期" align="center" prop="datetime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">

View File

@ -19,7 +19,10 @@
</el-form-item>
<el-form-item label="使用名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入使用名称" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.name" placeholder="请选择使用药品名称" clearable filterable style="width: 100%"
@keyup.enter="handleQuery">
<el-option v-for="item in medicines" :key="item.value" :label="item.label" :value="item.label" />
</el-select>
</el-form-item>
<el-form-item label="使用类型" prop="useType">
@ -78,7 +81,7 @@
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" />
<!-- 详情弹窗保持不变 -->
<el-dialog :title="title" v-model="open" width="680px" top="8vh" append-to-body :close-on-click-modal="false"
class="usage-detail-dialog">
@ -137,6 +140,7 @@
</template>
<script setup name="Usage">
import { listMedicine} from "@/api/biosafety/medicine"
import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
import { listUnit } from '@/api/biosafety/unit'
import { listUsage } from '@/api/biosafety/usage'
@ -170,6 +174,7 @@ const { queryParams, form, rules } = toRefs(data)
const units = ref([])
const usages = ref([])
const medicines = ref([])
/* 获取单位 */
function getUnit() {
@ -177,6 +182,13 @@ function getUnit() {
units.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
}
/* 获取药品信息 */
function getMedicineOptions() {
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
}
/* 获取使用方法 */
function getUsageOptions() {
listUsage().then(res => {
@ -266,6 +278,7 @@ function handleExport() {
/* 初始化 */
getList()
getUnit()
getMedicineOptions()
getUsageOptions()
</script>