修改2.0

src/views/biosafety/diagnosis/add.vue

@@ -95,13 +95,13 @@
                                 <el-col :span="12">
                                     <el-form-item label="治疗结果" prop="result">
                                         <el-select v-model="form.result" placeholder="请选择治疗结果" style="width: 100%;">
-                                            <el-option v-for="item in diag_status" :key="item.value" :label="item.label"
+                                            <el-option v-for="item in diag_result" :key="item.value" :label="item.label"
                                                 :value="item.value" />
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="12">
-                                    <el-form-item label="转入羊舍" prop="sheepfoldId">
+                                    <el-form-item label="转入羊舍" >
                                         <el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍" filterable
                                             style="width: 100%;">
                                             <el-option v-for="item in sheepfolds" :key="item.id" :label="item.name"
@@ -139,7 +139,7 @@ import { listSheepfold_management } from "@/api/fileManagement/sheepfold_managem
 import {  addDiagnosis } from "@/api/biosafety/diagnosis"
 
 const { proxy } = getCurrentInstance()
-const { diag_status } = proxy.useDict( "diag_status")
+const { diag_result } = proxy.useDict( "diag_result")
 
 
 

src/views/biosafety/medicine/index.vue

@@ -12,7 +12,7 @@
           <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="使用方法" prop="medicType">
+      <el-form-item label="使用方法" prop="usageId">
         <el-select v-model="queryParams.usageId" placeholder="请选择药品使用方法" clearable style="width: 180px">
           <el-option v-for="item in usageOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
@@ -25,8 +25,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:medicine:add']">新增</el-button>
-          v-hasPermi="['system:medicine:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
@@ -36,15 +35,15 @@
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:medicine:remove']">删除</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
     <el-table v-loading="loading" :data="medicineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="药品编号" align="center" prop="medica" />
       <el-table-column label="药品名称" align="center" prop="name" />
-      <el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType"></el-table-column>
+      <el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType" />
-      <el-table-column label="使用方法" align="center" prop="usage" :formatter="formatUsage"></el-table-column>
+      <el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -73,13 +72,11 @@
             <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="使用方法" prop="medicType">
+        <el-form-item label="使用方法" prop="usageId">
           <el-select v-model="form.usageId" placeholder="请选择药品使用方法">
             <el-option v-for="item in usageOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-
-
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" :rows="3" type="textarea" />
         </el-form-item>
@@ -98,6 +95,7 @@
 import { listMedicine, getMedicine, delMedicine, addMedicine, updateMedicine } from "@/api/biosafety/medicine"
 import { listType } from "@/api/biosafety/type"
 import { listUsage } from "@/api/biosafety/usage"
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
 
 const { proxy } = getCurrentInstance()
 
@@ -121,59 +119,41 @@ const data = reactive({
     medicType: null,
     usageId: null,
   },
-  rules: {
+  rules: {}
-  }
 })
 
 const { queryParams, form, rules } = toRefs(data)
-// 定义药品类型
-const typeOptions = ref()
-// 定义药品使用方法
-const usageOptions = ref()
-
 
+// ✅ 默认为空数组，避免 undefined
+const typeOptions = ref([])
+const usageOptions = ref([])
 
 /* 查询药品类型 */
 function getTypeOptions() {
   listType().then(response => {
-    typeOptions.value = response.rows.map(item => ({
+    typeOptions.value = response.rows?.map(item => ({
       value: item.id,
       label: item.name
-    }))
+    })) || []
   })
 }
+
 /* 查询药品使用方法 */
 function getUsageOptions() {
   listUsage().then(response => {
-    usageOptions.value = response.rows.map(item => ({
+    usageOptions.value = response.rows?.map(item => ({
       value: item.id,
       label: item.name
-
+    })) || []
-    }))
   })
 }
-const formatType = (row) => {
-  let result = ''
-  for (const item of typeOptions.value) {
-    if (item.value === row.medicType) {
-      result = item.label
-      break
-    }
-  }
-  return result
-}
 
-const formatUsage = (row) => {
+/* ✅ 安全的 formatter */
-  let result = ''
+const formatType = (row) =>
-  for (const item of usageOptions.value) {
+  (typeOptions.value || []).find(item => item.value === row.medicType)?.label ?? row.medicType
-    if (item.value === row.usageId) {
-      result = item.label
-      break
-    }
-  }
-  return result
-}
 
+const formatUsage = (row) =>
+  (usageOptions.value || []).find(item => item.value === row.usageId)?.label ?? row.usageId
 
 /** 查询药品列表 */
 function getList() {
@@ -184,52 +164,39 @@ function getList() {
     loading.value = false
   })
 }
-// 取消按钮
+
 function cancel() {
   open.value = false
   reset()
 }
 
-// 表单重置
 function reset() {
-  form.value = {
+  form.value = { id: null, medica: null, name: null, medicType: null, usageId: null, comment: null }
-    id: null,
-    medica: null,
-    name: null,
-    medicType: null,
-    usage: null,
-    comment: null
-  }
   proxy.resetForm("medicineRef")
 }
 
-/** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef")
   handleQuery()
 }
 
-// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
 function handleAdd() {
   reset()
   open.value = true
   title.value = "添加药品"
 }
 
-/** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
@@ -240,18 +207,17 @@ function handleUpdate(row) {
   })
 }
 
-/** 提交按钮 */
 function submitForm() {
   proxy.$refs["medicineRef"].validate(valid => {
     if (valid) {
       if (form.value.id != null) {
-        updateMedicine(form.value).then(response => {
+        updateMedicine(form.value).then(() => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addMedicine(form.value).then(response => {
+        addMedicine(form.value).then(() => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -261,22 +227,18 @@ function submitForm() {
   })
 }
 
-/** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除药品编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除药品编号为"' + _ids + '"的数据项？')
-    return delMedicine(_ids)
+    .then(() => delMedicine(_ids))
-  }).then(() => {
+    .then(() => {
       getList()
       proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => { })
+    })
 }
 
-/** 导出按钮操作 */
 function handleExport() {
-  proxy.download('system/medicine/export', {
+  proxy.download('system/medicine/export', { ...queryParams.value }, `medicine_${new Date().getTime()}.xlsx`)
-    ...queryParams.value
-  }, `medicine_${new Date().getTime()}.xlsx`)
 }
 
 getList()

src/views/biosafety/treatment/add.vue

@@ -147,7 +147,17 @@
                       </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%;"/>
+            </template>
+          </el-table-column>
                   <el-table-column label="生产厂家" prop="manufacturer">
                     <template #default="scope">
                       <el-input v-model="scope.row.manufacturer" placeholder="请输入生产厂家" style="width:100%" />
@@ -174,6 +184,13 @@
                   <el-form-item label="兽医">
                     <el-input v-model="form.veterinarian" placeholder="请输入兽医姓名" />
                   </el-form-item>
+                </el-col>
+                 <el-col :span="12">
+            <el-form-item label="治疗状态">
+                <el-select v-model="form.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>
               </el-row>
 
@@ -209,6 +226,7 @@ import { ElMessage } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 
 const { proxy } = getCurrentInstance()
+const { treat_status } = proxy.useDict("treat_status")
 
 const route = useRoute()
 const router = useRouter()
@@ -346,11 +364,11 @@ const rules = {
 }
 
 const swPresDetailList = ref([
-  { mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' }
+  { mediId: null, dosage: 0, unitId: null, usageId: null, usetime: new Date(),manufacturer: '', batchNumber: '' }
 ])
 
 const handleAddSwPresDetail = () => {
-  swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' })
+  swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null,usetime: new Date(), manufacturer: '', batchNumber: '' })
 }
 
 const deletePresDetail = (row) => {
@@ -380,6 +398,8 @@ function submitForm() {
       dosage: item.dosage,
       unit: item.unitId,
       usageId: item.usageId,
+      usetime: item.usetime ? new Date(item.usetime).getTime() : null,
+    
       manufacturer: item.manufacturer,
       batchNumber: item.batchNumber
     }))

src/views/biosafety/treatment/index.vue

@@ -9,6 +9,11 @@
       <el-form-item label="羊只耳号" prop="sheepNo">
         <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-form-item>
       <el-form-item label="兽医" prop="veterinary">
         <el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
       </el-form-item>
@@ -59,12 +64,15 @@
       <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" >
+        <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="comment" />
       <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)">诊断</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>
@@ -197,6 +205,13 @@
               <el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="治疗状态">
+                <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>
+          </el-col>
         </el-row>
 
         <el-form-item label="备注">
@@ -339,7 +354,7 @@
               </el-select>
             </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"
@@ -374,6 +389,13 @@
               <el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
             </el-form-item>
           </el-col>
+            <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>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-form-item label="备注">
@@ -395,6 +417,9 @@
       <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" />
@@ -433,7 +458,7 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 
 const { proxy } = getCurrentInstance()
-const { sheep_gender,diag_result } = proxy.useDict("sheep_gender","diag_result")
+const { sheep_gender,diag_result,treat_status } = proxy.useDict("sheep_gender","diag_result","treat_status")
 
 
 /* ---------- 列表区域 ---------- */
@@ -477,6 +502,7 @@ const addForm = reactive({
   diseasePid: null,
   diseaseId: null,
   veterinarian: '',
+  stats:'',
   comment: ''
 })
 
@@ -494,6 +520,7 @@ const editForm = reactive({
   sheepType: '',
   monthAge: '',
   gender: '',
+  status: '',
   parity: '',
   breed: '',
   lactDay: '',
@@ -516,6 +543,7 @@ const selectedSheepNos = ref([])
 const addDia = reactive({
   sheepfoldId: null,
   result:null,
+  datetime:new Date().toISOString().slice(0, 10)
 })
 
 
@@ -534,6 +562,7 @@ function submitDiagnosis() {
   const data = {
     treatIds: ids.value,
     result:addDia.result,
+    datetime:addDia.datetime,
     sheepfoldId:addDia.sheepfoldId
   }
   request.post('/diagnosis/diagnosis/adds', data).then(() => {
@@ -669,6 +698,7 @@ function handleUpdate(row) {
       gender: res.data.gender,
       parity: res.data.parity,
       breed: res.data.breed,
+      status: res.data.status,
       lactDay: res.data.lactDay,
       gestDay: res.data.gestDay
     })