From d3957c519795439f511664d7d0c4128f7e3dcad1 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 20 Dec 2024 15:37:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/health/marRecord/index.vue          |  1 +
 src/views/health/medicineStockIn/index.vue    | 27 +++++++++++++++----
 .../health/temperatureStatistic/index.vue     |  2 +-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/views/health/marRecord/index.vue b/src/views/health/marRecord/index.vue
index 96b2abf..710e940 100644
--- a/src/views/health/marRecord/index.vue
+++ b/src/views/health/marRecord/index.vue
@@ -225,6 +225,7 @@ const data = reactive({
     dosage: [{ required: true, message: '用药剂量不能为空', trigger: 'blur' }],
     resource: [{ required: true, message: '药品来源不能为空', trigger: 'blur' }],
     place: [{ required: true, message: '用药地点不能为空', trigger: 'blur' }],
+    unit: [{ required: true, message: '用药单位不能为空', trigger: 'blur' }],
     personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }]
   }
 })
diff --git a/src/views/health/medicineStockIn/index.vue b/src/views/health/medicineStockIn/index.vue
index 0f6e5df..136c292 100644
--- a/src/views/health/medicineStockIn/index.vue
+++ b/src/views/health/medicineStockIn/index.vue
@@ -84,7 +84,13 @@
     <!-- 添加或修改药品入库清单对话框 -->
     <el-dialog :title="title" v-model="open" width="880px" append-to-body>
       <el-form ref="medicineStockInRef" :inline="true" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="药品名称" style="width: 792px" prop="medicineId">
+        <el-form-item label="治疗类型" prop="marType">
+          <el-select v-model="form.marType" placeholder="请选择治疗类型" @change="handleMarTypeChange" clearable>
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="药品名称" prop="medicineId">
           <el-select v-model="form.medicineId" placeholder="请选择药品名称" @change="handleMedicineChange" clearable>
             <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
           </el-select>
@@ -116,7 +122,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="规格总数" prop="totalCount">
-          <el-input v-model="form.totalCount" type="number" placeholder="请输入规格总数"> </el-input>
+          <el-input v-model="form.totalCount" type="number" readonly placeholder="请输入规格总数"> </el-input>
         </el-form-item>
         <el-form-item label="规格单位" prop="unit">
           <el-select v-model="form.unit" placeholder="请选择规格单位">
@@ -168,7 +174,7 @@ import { listMedicineStockIn, getMedicineStockIn, delMedicineStockIn, addMedicin
 import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
-const { used_state, package_unit, medical_unit } = proxy.useDict('used_state', 'package_unit', 'medical_unit')
+const { used_state, package_unit, medical_unit, mar_type } = proxy.useDict('used_state', 'package_unit', 'medical_unit', 'mar_type')
 
 const medicineStockInList = ref([])
 const open = ref(false)
@@ -236,8 +242,19 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules, queryMedicineParams } = toRefs(data)
 
 const handleQuantityChange = (val) => {
-  getMedicineBasic(form.value.medicineId).then((response) => {
-    form.value.totalCount = response.data.specifications * val
+  if (form.value.medicineId != null) {
+    getMedicineBasic(form.value.medicineId).then((response) => {
+      form.value.totalCount = response.data.specifications * val
+    })
+  }
+}
+const handleMarTypeChange = (val) => {
+  queryMedicineParams.value.treatmentType = val
+  form.value.medicineName = ''
+  form.value.name = ''
+  form.value.medicineId = null
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
   })
 }
 
diff --git a/src/views/health/temperatureStatistic/index.vue b/src/views/health/temperatureStatistic/index.vue
index fcb5861..95860b2 100644
--- a/src/views/health/temperatureStatistic/index.vue
+++ b/src/views/health/temperatureStatistic/index.vue
@@ -185,7 +185,7 @@
           <el-table-column label="测量次数" align="center" prop="count" />
           <el-table-column label="最高体温（℃）" align="center" prop="max" />
           <el-table-column label="最低体温（℃）" align="center" prop="min" />
-          <el-table-column label="平均体温（℃" align="center" prop="average" />
+          <el-table-column label="平均体温（℃）" align="center" prop="average" />
           <el-table-column prop="detail" label="测量明细" v-if="queryParams.type === 1">
             <template #default="scope">
               <span v-html="formatMultiLineData(scope.row.detail)"></span>