Compare commits

..

2 Commits

Author SHA1 Message Date
34c2873a4b Merge branch 'main' of http://e19510c831.iok.la/admin/zhyc-sheep-ui 2025-08-24 00:06:58 +08:00
761086df28 修改1.0 2025-08-24 00:06:56 +08:00
4 changed files with 253 additions and 130 deletions

View File

@ -3,7 +3,7 @@
<el-container style="height: 100vh; display: flex; flex-direction: column;">
<el-main style="padding: 0; flex: 1; display: flex; flex-direction: column;">
<div class="content-wrapper">
<h2 class="page-title">添加治疗记录</h2>
<h2 class="page-title">羊只诊疗</h2>
<div class="treatment-container">
<!-- 羊只信息只读展示 -->

View File

@ -85,7 +85,7 @@
<el-col :span="12">
<!-- 3 type=datetime -->
<el-form-item label="消毒日期" prop="datetime">
<el-date-picker v-model="form.date" type="datetime" value-format="YYYY-MM-DD"
<el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD"
style="width: 100%" />
</el-form-item>
</el-col>
@ -190,7 +190,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 4 同样 type=datetime -->
<el-form-item label="消毒日期" prop="datetime">
<el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD"
style="width: 100%" />
@ -348,16 +348,6 @@ function resetQuery() {
const openAdd = ref(false)
const titleAdd = ref('新增消毒记录')
// 5
const nowMinute = () => {
const d = new Date()
const Y = d.getFullYear()
const M = String(d.getMonth() + 1).padStart(2, '0')
const D = String(d.getDate()).padStart(2, '0')
const h = String(d.getHours()).padStart(2, '0')
const m = String(d.getMinutes()).padStart(2, '0')
return `${Y}-${M}-${D} ${h}:${m}`
}
const form = reactive({
id: null,
@ -416,7 +406,7 @@ const titleEdit = ref('修改消毒记录')
const editForm = reactive({
id: null,
technician: '',
datetime: nowMinute(),
datetime: new Date().toISOString().slice(0, 10),
way: '',
ratio: '',
comment: '',
@ -429,7 +419,7 @@ function resetEdit() {
Object.assign(editForm, {
id: null,
technician: '',
datetime: nowMinute(),
datetime: new Date().toISOString().slice(0, 10),
way: '',
ratio: '',
comment: '',

View File

@ -26,6 +26,10 @@
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
</el-col>
<!-- 按钮区域新增诊疗 -->
<el-col :span="1.5">
<el-button type="info" plain icon="DocumentAdd" @click="handleAddDiagnosis" :disabled="multiple">诊疗</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
</el-col>
@ -313,14 +317,14 @@
<el-table-column label="单位">
<template #default="scope">
<el-select v-model="scope.row.unit" placeholder="单位">
<el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
<el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value+''" />
</el-select>
</template>
</el-table-column>
<el-table-column label="使用方法">
<template #default="scope">
<el-select v-model="scope.row.usageId" placeholder="用法">
<el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
<el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value+''" />
</el-select>
</template>
</el-table-column>
@ -354,6 +358,7 @@
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="editDialog = false"> </el-button>
@ -361,6 +366,31 @@
</div>
</template>
</el-dialog>
<!-- 新增诊疗弹窗 -->
<el-dialog title="新增诊疗记录" v-model="diagnosisDialog" width="50%" append-to-body destroy-on-close>
<el-form label-width="120px">
<el-form-item label="选中羊只">
<el-tag v-for="no in selectedSheepNos" :key="no" style="margin-right: 5px">{{ no }}</el-tag>
</el-form-item>
<el-form-item label="诊疗结果" prop="result">
<el-select v-model="addDia.result" placeholder="请选择治疗结果" style="width: 100%;">
<el-option v-for="item in diag_result" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="转入羊舍" prop="sheepfoldId">
<el-select v-model="addDia.sheepfoldId" placeholder="请选择转入羊舍"
style="width: 100%;">
<el-option v-for="item in sheepfolds" :key="item.id" :label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="diagnosisDialog = false">取消</el-button>
<el-button type="primary" @click="submitDiagnosis">确认</el-button>
</template>
</el-dialog>
</div>
</template>
@ -369,6 +399,7 @@
import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from '@/api/biosafety/treatment'
import { listDisease } from '@/api/biosafety/disease'
import { listSheepfold_management } from "@/api/fileManagement/sheepfold_management"
import { listPrescription, getPrescription } from '@/api/biosafety/prescription'
import { listUnit } from '@/api/biosafety/unit'
import { listUsage } from '@/api/biosafety/usage'
@ -379,7 +410,8 @@ import { useRouter } from 'vue-router'
const router = useRouter()
const { proxy } = getCurrentInstance()
const { sheep_gender } = proxy.useDict("sheep_gender")
const { sheep_gender,diag_result } = proxy.useDict("sheep_gender","diag_result")
/* ---------- 列表区域 ---------- */
const treatmentList = ref([])
@ -390,6 +422,7 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const daterangeDatetime = ref([])
const sheepfolds = ref([])
const queryParams = reactive({
pageNum: 1,
@ -454,6 +487,39 @@ const swPresDetailList = ref([
{ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' }
])
/* ---------- 新增诊疗 ---------- */
const diagnosisDialog = ref(false)
const selectedSheepNos = ref([])
const addDia = reactive({
sheepfoldId: null,
result:null,
})
function handleAddDiagnosis() {
if (!ids.value.length) {
proxy.$modal.msgWarning('请至少选择一条治疗记录')
return
}
selectedSheepNos.value = treatmentList.value
.filter(item => ids.value.includes(item.id))
.map(item => item.sheepNo)
diagnosisDialog.value = true
}
function submitDiagnosis() {
const data = {
treatIds: ids.value,
result:addDia.result,
sheepfoldId:addDia.sheepfoldId
}
request.post('/diagnosis/diagnosis/adds', data).then(() => {
proxy.$modal.msgSuccess('诊疗成功')
diagnosisDialog.value = false
getList()
})
}
/* ---------- 列表查询 ---------- */
function getList() {
loading.value = true
@ -668,6 +734,9 @@ onMounted(() => {
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
listSheepfold_management().then(res => {
sheepfolds.value = res.rows.map(item => ({ id: item.id, name: item.sheepfoldName }))
})
})
</script>

View File

@ -1,90 +1,183 @@
<template>
<div class="app-container">
<!-- 搜索表单 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form
ref="queryRef"
:model="queryParams"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- 使用日期新增 -->
<el-form-item label="使用日期" style="width: 308px">
<el-date-picker
v-model="daterangeUseTime"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<!-- 创建日期原有 -->
<el-form-item label="创建时间" style="width: 308px">
<el-date-picker
v-model="daterangeCreateTime"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input
v-model="queryParams.sheepNo"
placeholder="羊只耳号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="使用名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入使用名称" clearable @keyup.enter="handleQuery" />
<el-input
v-model="queryParams.name"
placeholder="请输入使用名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="使用类型" prop="useType">
<el-select v-model="queryParams.useType" placeholder="请选择使用类型" clearable style="width: 180px">
<el-option v-for="dict in pres_type" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-select
v-model="queryParams.useType"
placeholder="请选择使用类型"
clearable
style="width: 180px"
>
<el-option
v-for="dict in pres_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="使用时间" style="width: 308px">
<el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="datetimerange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['biosafety:usage:export']">导出</el-button>
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['biosafety:usage:export']"
>
导出
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
</el-row>
<!-- 数据表格 -->
<el-table v-loading="loading" :data="usageList" @selection-change="handleSelectionChange">
<el-table-column label="使用时间" align="center" prop="createTime" width="180">
<el-table
v-loading="loading"
:data="usageList"
@selection-change="handleSelectionChange"
>
<el-table-column
label="使用时间"
align="center"
prop="datetime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}') }}</span>
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="使用名称" align="center" prop="name" />
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="使用类型" align="center" prop="useType">
<template #default="scope">
<dict-tag :options="pres_type" :value="scope.row.useType" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
v-hasPermi="['biosafety:usage:query']">详情</el-button>
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['biosafety:usage:remove']">删除</el-button> -->
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}') }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template #default="scope">
<el-button
link
type="primary"
icon="View"
@click="handleDetail(scope.row)"
v-hasPermi="['biosafety:usage:query']"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@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">
<!-- 详情弹窗保持不变 -->
<el-dialog
:title="title"
v-model="open"
width="680px"
top="8vh"
append-to-body
:close-on-click-modal="false"
class="usage-detail-dialog"
>
<!-- 基础信息 -->
<el-card shadow="never" class="detail-card">
<template #header>
<div class="card-header">
<el-icon>
<Document />
</el-icon> 基本信息
<el-icon><Document /></el-icon> 基本信息
</div>
</template>
<el-descriptions :column="2" border>
<el-descriptions-item label="使用名称">
{{ form.name }}
</el-descriptions-item>
<el-descriptions-item label="使用名称">{{ form.name }}</el-descriptions-item>
<el-descriptions-item label="使用类型">
<el-tag size="small" :type="form.useType === 1 ? 'primary' : 'success'">
<el-tag
size="small"
:type="form.useType === 1 ? 'primary' : 'success'"
>
{{ pres_type.find(it => it.value === form.useType)?.label || '' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="使用时间" :span="2">
{{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}') }}
</el-descriptions-item>
@ -92,17 +185,19 @@
</el-card>
<!-- 药品明细 -->
<el-card shadow="never" class="detail-card" style="margin-top: 16px;">
<el-card shadow="never" class="detail-card" style="margin-top: 16px">
<template #header>
<div class="card-header">
<el-icon>
<List />
</el-icon> 药品使用明细
<el-icon><List /></el-icon> 药品使用明细
</div>
</template>
<el-table :data="swMedicineUsageDetailsList" stripe size="small"
:row-class-name="rowSwMedicineUsageDetailsIndex" style="width: 100%">
<el-table
:data="swMedicineUsageDetailsList"
stripe
size="small"
:row-class-name="rowSwMedicineUsageDetailsIndex"
style="width: 100%"
>
<el-table-column label="药品" prop="mediName" show-overflow-tooltip />
<el-table-column label="用量" prop="dosage" width="80" />
<el-table-column label="单位" prop="unit" align="center" :formatter="formatUnit" />
@ -112,7 +207,6 @@
</el-table>
</el-card>
<!-- 底部按钮 -->
<template #footer>
<el-button @click="cancel"> </el-button>
</template>
@ -121,10 +215,10 @@
</template>
<script setup name="Usage">
import { listUsageInfo, getUsageInfo, delUsageInfo } from '@/api/biosafety/usageInfo'
import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
import { listUnit } from '@/api/biosafety/unit'
import { listUsage } from '@/api/biosafety/usage'
import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
import { listUnit } from "@/api/biosafety/unit"
import { listUsage } from "@/api/biosafety/usage"
const { proxy } = getCurrentInstance()
const { pres_type } = proxy.useDict('pres_type')
@ -134,10 +228,10 @@ const swMedicineUsageDetailsList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const total = ref(0)
const title = ref('')
const daterangeCreateTime = ref([])
const daterangeUseTime = ref([]) //
const data = reactive({
form: {},
@ -152,63 +246,46 @@ const data = reactive({
})
const { queryParams, form, rules } = toRefs(data)
const units = ref([])
const usages = ref([])
const units = ref([]) //
const usages = ref([]) // 使
/**
* 获取单位下拉数据源单位字典
* 将返回数据转换成 { value, label } 结构 el-option 使用
*/
/* 获取单位 */
function getUnit() {
listUnit().then(response => {
units.value = response.rows.map(item => ({
value: item.id,
label: item.name
}))
listUnit().then(res => {
units.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
}
/**
* 获取处方使用方法下拉数据源
* 将返回数据转换成 { value, label } 结构 el-option 使用
*/
/* 获取使用方法 */
function getUsageOptions() {
listUsage().then(response => {
usages.value = response.rows.map(item => ({
value: item.id,
label: item.name
}))
listUsage().then(res => {
usages.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
}
/**
* 格式化使用方法
* 根据 usageId 查找对应的使用方法名称
*/
/* 格式化单位 */
function formatUnit(row) {
const unit = units.value.find(u => String(u.value) === String(row.unit))
return unit?.label ?? ''
}
/* 格式化使用方法 */
function formatUsage(row) {
const usage = usages.value.find(item => String(item.value) === String(row.usageId))
const usage = usages.value.find(u => String(u.value) === String(row.usageId))
return usage?.label ?? ''
}
/**
* 格式化单位
* 根据 unit 查找对应的单位名称
*/
function formatUnit(row) {
const unit = units.value.find(item => String(item.value) === String(row.unit))
return unit?.label ?? ''
}
/* 查询列表 */
function getList() {
loading.value = true
queryParams.value.params = {}
if (daterangeCreateTime.value && daterangeCreateTime.value.length === 2) {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
}
if (daterangeUseTime.value && daterangeUseTime.value.length === 2) {
queryParams.value.params.beginUseTime = daterangeUseTime.value[0]
queryParams.value.params.endUseTime = daterangeUseTime.value[1]
}
listUsageInfo(queryParams.value).then(res => {
usageList.value = res.rows
total.value = res.total
@ -226,19 +303,17 @@ function reset() {
}
swMedicineUsageDetailsList.value = []
}
function cancel() {
open.value = false
reset()
}
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
function resetQuery() {
daterangeCreateTime.value = []
daterangeUseTime.value = [] //
proxy.resetForm('queryRef')
handleQuery()
}
@ -252,33 +327,24 @@ function handleDetail(row) {
title.value = '药品使用记录详情'
})
}
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除药品使用记录编号为"${_ids}"的数据项?`).then(() => {
return delUsageInfo(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
})
}
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
}
function rowSwMedicineUsageDetailsIndex({ row, rowIndex }) {
row.index = rowIndex + 1
function rowSwMedicineUsageDetailsIndex({ rowIndex }) {
return `row-${rowIndex}`
}
function handleExport() {
proxy.download('biosafety/usageInfo/export', { ...queryParams.value }, `usage_${new Date().getTime()}.xlsx`)
proxy.download(
'biosafety/usageInfo/export',
{ ...queryParams.value },
`usage_${new Date().getTime()}.xlsx`
)
}
/* 初始化 */
getList()
getUnit() //
getUsageOptions() // 使
getUnit()
getUsageOptions()
</script>
<style scoped>
@ -286,14 +352,12 @@ getUsageOptions() // 获取使用方法下拉数据源
border-radius: 6px;
margin: 0;
}
.usage-detail-dialog .card-header {
display: flex;
align-items: center;
font-weight: 600;
color: #303133;
}
.usage-detail-dialog .card-header .el-icon {
margin-right: 6px;
}