修改2.0

2025-08-24 18:23:38 +08:00
parent adb8da9df6
commit 7b4518b9ee
4 changed files with 96 additions and 84 deletions
--- a/src/views/biosafety/treatment/add.vue
+++ b/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%" />
@@ -175,6 +185,13 @@
                    <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>

              <el-form-item label="备注">
@@ -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
    }))
--- a/src/views/biosafety/treatment/index.vue
+++ b/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
    })