From 5867cec461a3a42a9cbe48d310e04c534605265d Mon Sep 17 00:00:00 2001 From: zyh <2066096076@qq.com> Date: Fri, 22 Aug 2025 19:34:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8C=89=E7=85=A7=E6=97=A5=E6=9C=9F=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/produce/bodyManage/body_measure/index.vue | 2 +- src/views/produce/bodyManage/body_score/index.vue | 2 +- src/views/produce/bodyManage/breast_rating/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/produce/bodyManage/body_measure/index.vue b/src/views/produce/bodyManage/body_measure/index.vue index 70e7936..9f7b827 100644 --- a/src/views/produce/bodyManage/body_measure/index.vue +++ b/src/views/produce/bodyManage/body_measure/index.vue @@ -61,7 +61,7 @@ diff --git a/src/views/produce/bodyManage/body_score/index.vue b/src/views/produce/bodyManage/body_score/index.vue index 28a2cd5..837c8e4 100644 --- a/src/views/produce/bodyManage/body_score/index.vue +++ b/src/views/produce/bodyManage/body_score/index.vue @@ -62,7 +62,7 @@ diff --git a/src/views/produce/bodyManage/breast_rating/index.vue b/src/views/produce/bodyManage/breast_rating/index.vue index af6d6f0..8571353 100644 --- a/src/views/produce/bodyManage/breast_rating/index.vue +++ b/src/views/produce/bodyManage/breast_rating/index.vue @@ -55,7 +55,7 @@ From 761086df2817aa947959364fb02b7a3025b2962d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com> Date: Sun, 24 Aug 2025 00:06:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B91.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/biosafety/diagnosis/add.vue | 2 +- src/views/biosafety/disinfect/index.vue | 18 +- src/views/biosafety/treatment/index.vue | 75 +++++- src/views/biosafety/usageInfo/index.vue | 288 +++++++++++++++--------- 4 files changed, 253 insertions(+), 130 deletions(-) diff --git a/src/views/biosafety/diagnosis/add.vue b/src/views/biosafety/diagnosis/add.vue index c5c3997..3ee73c0 100644 --- a/src/views/biosafety/diagnosis/add.vue +++ b/src/views/biosafety/diagnosis/add.vue @@ -3,7 +3,7 @@
-

添加治疗记录

+

羊只诊疗

diff --git a/src/views/biosafety/disinfect/index.vue b/src/views/biosafety/disinfect/index.vue index 6064be9..166f965 100644 --- a/src/views/biosafety/disinfect/index.vue +++ b/src/views/biosafety/disinfect/index.vue @@ -85,7 +85,7 @@ - @@ -190,7 +190,7 @@ - + @@ -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: '', diff --git a/src/views/biosafety/treatment/index.vue b/src/views/biosafety/treatment/index.vue index 01d46f9..def5f4d 100644 --- a/src/views/biosafety/treatment/index.vue +++ b/src/views/biosafety/treatment/index.vue @@ -26,6 +26,10 @@ 修改 + + + 诊疗 + 删除 @@ -313,14 +317,14 @@ @@ -353,6 +357,7 @@ + + + + + + {{ no }} + + + + + + + + + + + + + + +
@@ -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 })) + }) }) diff --git a/src/views/biosafety/usageInfo/index.vue b/src/views/biosafety/usageInfo/index.vue index 1382e6c..f82c41e 100644 --- a/src/views/biosafety/usageInfo/index.vue +++ b/src/views/biosafety/usageInfo/index.vue @@ -1,90 +1,183 @@