From 56cd1726304d6df46d3a9aca3acb176f3ac0e798 Mon Sep 17 00:00:00 2001
From: piaobo <1913856125@qq.com>
Date: Mon, 25 Aug 2025 14:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biosafety/treatment/index.vue | 139 +++++++++++-------------
 src/views/biosafety/usageInfo/index.vue |   5 +
 2 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/src/views/biosafety/treatment/index.vue b/src/views/biosafety/treatment/index.vue
index 4e5e374..a795b81 100644
--- a/src/views/biosafety/treatment/index.vue
+++ b/src/views/biosafety/treatment/index.vue
@@ -10,9 +10,9 @@
         <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
       </el-form-item>
       <el-form-item label="治疗状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择治疗状态" style="width: 120px;">
-                <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
-              </el-select>
+        <el-select v-model="queryParams.status" placeholder="请选择治疗状态" style="width: 120px;">
+          <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="兽医" prop="veterinary">
         <el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
@@ -64,7 +64,7 @@
       <el-table-column label="泌乳天数" align="center" prop="lactDay" />
       <el-table-column label="怀孕天数" align="center" prop="gestDay" />
       <el-table-column label="疾病类型" align="center" prop="diseaseName" />
-      <el-table-column label="治疗状态" align="center" prop="treatmentPlan" >
+      <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" />
@@ -72,7 +72,8 @@
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button link type="primary" @click="gotDiag(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 1">诊断</el-button>
+          <el-button link type="primary" @click="gotDiag(scope.row)"
+            v-if="scope.row.status == 0 || scope.row.status == 1">诊断</el-button>
           <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -82,8 +83,8 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 新增弹窗 -->
-    <el-dialog title="添加治疗记录" v-model="addDialog" width="65%" top="5vh" append-to-body destroy-on-close>
-      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="140px" size="large">
+    <el-dialog title="添加治疗记录" v-model="addDialog" width="70%" top="5vh" append-to-body destroy-on-close>
+      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="80px" size="large">
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="羊只耳号" required>
@@ -145,16 +146,16 @@
           <el-table-column label="序号" width="60">
             <template #default="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="药品">
+          <el-table-column label="药品" width="160px">
             <template #default="scope">
               <el-select v-model="scope.row.mediId" filterable placeholder="请选择药品">
                 <el-option v-for="m in medicines" :key="m.value" :label="m.label" :value="m.value" />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="用量">
+          <el-table-column label="用量" width="160px">
             <template #default="scope">
-              <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
+              <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;"/>
             </template>
           </el-table-column>
           <el-table-column label="单位">
@@ -171,23 +172,18 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="使用时间" >
-           <template #default="scope">
-               <el-date-picker
-                v-model="scope.row.usetime"
-                type="date"
-                placeholder="选择日期"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                style="width: 100%;"/>
+          <el-table-column label="使用时间" width="160px">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.usetime" type="date" placeholder="选择日期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" style="width:100%;" />
             </template>
           </el-table-column>
-          <el-table-column label="生产厂家">
+          <el-table-column label="生产厂家" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
             </template>
           </el-table-column>
-          <el-table-column label="生产批号">
+          <el-table-column label="生产批号" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.batchNumber" placeholder="批号" />
             </template>
@@ -207,7 +203,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="治疗状态">
-                <el-select v-model="addForm.status" placeholder="请选择治疗状态">
+              <el-select v-model="addForm.status" placeholder="请选择治疗状态">
                 <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
               </el-select>
             </el-form-item>
@@ -229,7 +225,7 @@
 
     <!-- 修改弹窗 -->
     <el-dialog title="修改治疗记录" v-model="editDialog" width="70%" top="5vh" append-to-body destroy-on-close>
-      <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="140px" size="large">
+      <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="80px" size="large">
         <!-- 羊只基本信息展示（只读） -->
         <el-row :gutter="20">
           <el-col :span="6">
@@ -343,35 +339,29 @@
           <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>
- <el-table-column label="使用时间" width="160px">
-          <template #default="scope">
-            <el-date-picker
-              v-model="scope.row.usetime"
-              type="date"
-              placeholder="选择日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              style="width: 100%;"
-            />
-          </template>
-        </el-table-column>
-          <el-table-column label="生产厂家">
+          <el-table-column label="使用时间" width="160px">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.usetime" type="date" placeholder="选择日期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" style="width: 100%;" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
             </template>
           </el-table-column>
-          <el-table-column label="生产批号">
+          <el-table-column label="生产批号" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.batchNumber" placeholder="批号" />
             </template>
@@ -389,10 +379,10 @@
               <el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
             </el-form-item>
           </el-col>
-            <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="治疗状态">
-                <el-select v-model="editForm.status" placeholder="请选择治疗状态">
-                <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value+''" />
+              <el-select v-model="editForm.status" placeholder="请选择治疗状态">
+                <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value + ''" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -402,7 +392,7 @@
           <el-input type="textarea" :rows="3" v-model="editForm.comment" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
-    
+
 
       <template #footer>
         <div class="dialog-footer">
@@ -412,33 +402,31 @@
       </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="datetime">
-              <el-date-picker v-model="addDia.datetime" type="date" style="width: 100%" />
-            </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-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="sheepfoldId">
-          <el-select v-model="addDia.sheepfoldId" filterable 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 label="治疗日期" prop="datetime">
+          <el-date-picker v-model="addDia.datetime" type="date" style="width: 100%" />
+        </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" filterable 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>
+      <template #footer>
+        <el-button @click="diagnosisDialog = false">取消</el-button>
+        <el-button type="primary" @click="submitDiagnosis">确认</el-button>
+      </template>
+    </el-dialog>
 
   </div>
 </template>
@@ -458,7 +446,7 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 
 const { proxy } = getCurrentInstance()
-const { sheep_gender,diag_result,treat_status } = proxy.useDict("sheep_gender","diag_result","treat_status")
+const { sheep_gender, diag_result, treat_status } = proxy.useDict("sheep_gender", "diag_result", "treat_status")
 
 
 /* ---------- 列表区域 ---------- */
@@ -502,7 +490,7 @@ const addForm = reactive({
   diseasePid: null,
   diseaseId: null,
   veterinarian: '',
-  stats:'',
+  stats: '',
   comment: ''
 })
 
@@ -534,7 +522,7 @@ const rules = {
 }
 
 const swPresDetailList = ref([
-  { mediId: null, dosage: 0, unit: null, usageId: null, usetime: new Date().toISOString().slice(0, 10),manufacturer: '', batchNumber: '' }
+  { mediId: null, dosage: 0, unit: null, usageId: null, usetime: new Date().toISOString().slice(0, 10), manufacturer: '', batchNumber: '' }
 ])
 
 /* ---------- 新增诊疗 ---------- */
@@ -542,8 +530,8 @@ const diagnosisDialog = ref(false)
 const selectedSheepNos = ref([])
 const addDia = reactive({
   sheepfoldId: null,
-  result:null,
-  datetime:new Date().toISOString().slice(0, 10)
+  result: null,
+  datetime: new Date().toISOString().slice(0, 10)
 })
 
 
@@ -561,9 +549,9 @@ function handleAddDiagnosis() {
 function submitDiagnosis() {
   const data = {
     treatIds: ids.value,
-    result:addDia.result,
-    datetime:addDia.datetime,
-    sheepfoldId:addDia.sheepfoldId
+    result: addDia.result,
+    datetime: addDia.datetime,
+    sheepfoldId: addDia.sheepfoldId
   }
   request.post('/diagnosis/diagnosis/adds', data).then(() => {
     proxy.$modal.msgSuccess('诊疗成功')
@@ -621,7 +609,7 @@ function handleAddSwPresDetail() {
     dosage: 0,
     unit: null,
     usageId: null,
-    usetime:new Date().toISOString().slice(0, 10),
+    usetime: new Date().toISOString().slice(0, 10),
     manufacturer: '',
     batchNumber: ''
   })
@@ -800,4 +788,3 @@ onMounted(() => {
   })
 })
 </script>
-
diff --git a/src/views/biosafety/usageInfo/index.vue b/src/views/biosafety/usageInfo/index.vue
index f82c41e..d5167d6 100644
--- a/src/views/biosafety/usageInfo/index.vue
+++ b/src/views/biosafety/usageInfo/index.vue
@@ -202,6 +202,11 @@
           <el-table-column label="用量" prop="dosage" width="80" />
           <el-table-column label="单位" prop="unit" align="center" :formatter="formatUnit" />
           <el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
+          <el-table-column v-if="form.useType==4" label="使用时间" align="center" prop="useTime" width="120">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.usetime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="生产厂家" prop="manufacturer" show-overflow-tooltip />
           <el-table-column label="生产批号" prop="batchNumber" width="120" />
         </el-table>