Merge branch 'main' of http://e19510c831.iok.la/admin/zhyc-sheep-ui

src/views/biosafety/deworm/index.vue

@@ -30,9 +30,6 @@
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange"
       @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -45,6 +42,9 @@
       <el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
       <el-table-column label="技术员" align="center" prop="technical" />
+      <el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
         <template #default="scope">

src/views/biosafety/diagnosis/index.vue

@@ -64,7 +64,8 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange"
+      @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="耳号" align="center" prop="sheepNo" />
       <el-table-column label="事件日期" align="center" prop="datetime" width="150">
@@ -76,23 +77,23 @@
       <el-table-column label="性别" align="center" prop="gender">
         <template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
       </el-table-column>
-      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
       <el-table-column label="疾病类型" align="center" prop="diseasePName" />
       <el-table-column label="子疾病" align="center" prop="diseaseName" />
       <el-table-column label="诊疗结果" align="center" prop="result">
         <template #default="scope"><dict-tag :options="diag_result" :value="scope.row.result" /></template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="begindate" width="150">
+      <el-table-column label="开始时间" align="center" prop="begindate" width="150" sortable="custom">
         <template #default="scope">
           <span>{{ parseTime(scope.row.begindate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="enddate" width="150">
+      <el-table-column label="结束时间" align="center" prop="enddate" width="150" sortable="custom">
         <template #default="scope">
           <span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="治疗天数" align="center" prop="treatDay" />
+      <el-table-column label="治疗天数" align="center" prop="treatDay" sortable="custom" />
       <el-table-column label="羊舍" align="center" prop="sheepfold" width="150px" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140px">
         <template #default="scope">
@@ -199,34 +200,131 @@
       </template>
     </el-dialog>
   </div>
-</template>
-<script setup name="Diagnosis">
-import { listDiagnosis, getDiagnosis, delDiagnosis, updateDiagnosis } from '@/api/biosafety/diagnosis'
-import { listSheepfold_management } from "@/api/fileManagement/sheepfold_management"
-import { getCurrentInstance, onMounted, reactive, ref, toRefs, watch } from 'vue'
+</template><script setup name="Diagnosis">
+import {
+  listDiagnosis,
+  getDiagnosis,
+  delDiagnosis,
+  updateDiagnosis,
+} from '@/api/biosafety/diagnosis'
+import { listSheepfold_management } from '@/api/fileManagement/sheepfold_management'
 import { listDisease } from '@/api/biosafety/disease'
+import { getCurrentInstance, onMounted, ref, watch } from 'vue'
 
+/* ---------- 基础依赖 ---------- */
 const { proxy } = getCurrentInstance()
-const { sheep_gender, diag_result } = proxy.useDict("sheep_gender", "diag_result")
+const { sheep_gender, diag_result } = proxy.useDict('sheep_gender', 'diag_result')
 
-/* 列表数据 */
+/* ---------- 表格 & 分页 ---------- */
 const diagnosisList = ref([])
-const open = ref(false)
 const loading = ref(true)
+const total = ref(0)
 const showSearch = ref(true)
 const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
-const total = ref(0)
-const title = ref('')
-const daterangeDatetime = ref([])
 
-/* 下拉数据源 */
+/* ---------- 查询参数 ---------- */
+const daterangeDatetime = ref([])        // 日期区间
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 20,
+  sheepNo: null,
+  datetime: null,
+  diseasePid: null,
+  diseaseId: null,
+  result: null,
+  treatDay: null,
+  sheepfoldId: null,
+  orderByColumn: null,
+  isAsc: null,
+})
+
+/* ---------- 表单 & 校验 ---------- */
+const open = ref(false)
+const title = ref('')
+const diagnosisRef = ref(null)
+const form = ref({
+  id: undefined,
+  sheepNo: undefined,
+  datetime: undefined,
+  diseasePid: undefined,
+  diseaseId: undefined,
+  result: undefined,
+  begindate: undefined,
+  enddate: undefined,
+  treatDay: undefined,
+  sheepfoldId: undefined,
+  remark: undefined,
+})
+
+const rules = {
+  enddate: [
+    {
+      validator: (rule, value, callback) => {
+        if (!value) return callback(new Error('请选择结束时间'))
+        if (new Date(value) < new Date(form.value.begindate)) {
+          return callback(new Error('结束时间不能早于开始时间'))
+        }
+        callback()
+      },
+      trigger: 'change',
+    },
+  ],
+}
+
+/* ---------- 下拉数据源 ---------- */
+const pDiseaseOptions = ref([])
+const cDiseaseOptions = ref([])
 const sheepfoldOptions = ref([])
 
-const data = reactive({
-  form: {},
-  queryParams: {
+/* ---------- 疾病下拉 ---------- */
+function getDiseases() {
+  listDisease().then((res) => {
+    const tree = proxy.handleTree(res.data, 'id', 'pid')
+    pDiseaseOptions.value = tree.filter((o) => o.pid === 0)
+  })
+}
+function handleDiseaseTypeChange(pid) {
+  if (!pid) {
+    cDiseaseOptions.value = []
+    queryParams.value.diseaseId = null
+    return
+  }
+  listDisease({ pid }).then((res) => {
+    cDiseaseOptions.value = res.data
+  })
+}
+
+/* ---------- 获取列表 ---------- */
+function getList() {
+  loading.value = true
+  // 组装日期区间
+  queryParams.value.params = {}
+  if (daterangeDatetime.value?.length === 2) {
+    queryParams.value.params.beginDatetime = daterangeDatetime.value[0]
+    queryParams.value.params.endDatetime = daterangeDatetime.value[1]
+  }
+  listDiagnosis(queryParams.value).then((res) => {
+    diagnosisList.value = res.rows
+    total.value = res.total
+    loading.value = false
+  })
+}
+
+/* ---------- 搜索 / 重置 ---------- */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  daterangeDatetime.value = []
+  resetQueryParams()
+  handleQuery()
+}
+function resetQueryParams() {
+  queryParams.value = {
     pageNum: 1,
     pageSize: 20,
     sheepNo: null,
@@ -235,133 +333,55 @@ const data = reactive({
     diseaseId: null,
     result: null,
     treatDay: null,
-    sheepfoldId: null
-  },
-  rules: {
-    enddate: [
-      {
-        validator: (rule, value, callback) => {
-          if (!value) {
-            callback(new Error('请选择结束时间'))
-          } else if (new Date(value) < new Date(form.value.begindate)) {
-            callback(new Error('结束时间不能早于开始时间'))
-          } else {
-            callback()
-          }
-        },
-        trigger: 'change'
-      }
-    ]
+    sheepfoldId: null,
+    orderByColumn: null,
+    isAsc: null,
   }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-const pDiseaseOptions = ref([])
-const cDiseaseOptions = ref([])
-
-/* 疾病下拉 */
-function getDiseases() {
-  listDisease().then(response => {
-    const diseases = proxy.handleTree(response.data, "id", "pid")
-    pDiseaseOptions.value = diseases.filter(item => item.pid === 0)
-  })
 }
 
-function handleDiseaseTypeChange(parentId) {
-  if (!parentId) {
-    cDiseaseOptions.value = []
-    return
-  }
-  listDisease({ pid: parentId }).then(response => {
-    cDiseaseOptions.value = response.data
-  })
-}
-
-/* 查询列表 */
-function getList() {
-  loading.value = true
-  queryParams.value.params = {}
-  if (daterangeDatetime.value && daterangeDatetime.value.length) {
-    queryParams.value.params.beginDatetime = daterangeDatetime.value[0]
-    queryParams.value.params.endDatetime = daterangeDatetime.value[1]
-  }
-  listDiagnosis(queryParams.value).then((response) => {
-    diagnosisList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
-}
-
-/* 取消/重置 */
-function cancel() {
-  open.value = false
-  reset()
-}
-function reset() {
-  form.value = {
-    id: null,
-    treatId: null,
-    sheepId: null,
-    sheepNo: null,
-    datetime: null,
-    sheepType: null,
-    gender: null,
-    parity: null,
-    diseasePid: null,
-    diseaseId: null,
-    result: '',
-    begindate: null,
-    enddate: null,
-    treatDay: null,
-    sheepfoldId: null
-  }
-  proxy.resetForm('diagnosisRef')
-}
-
-/* 搜索 / 重置 */
-function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
-}
-function resetQuery() {
-  daterangeDatetime.value = []
-  proxy.resetForm('queryRef')
-  handleQuery()
-}
-
-/* 多选 */
+/* ---------- 多选 ---------- */
 function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.id)
+  ids.value = selection.map((i) => i.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/* 修改 */
+/* ---------- 排序 ---------- */
+function handleSortChange({ prop, order }) {
+  if (!order) {
+    queryParams.value.orderByColumn = null
+    queryParams.value.isAsc = null
+  } else {
+    queryParams.value.orderByColumn = prop
+    queryParams.value.isAsc = order === 'ascending' ? 'asc' : 'desc'
+  }
+  getList()
+}
+
+/* ---------- 新增 / 修改 ---------- */
 function handleUpdate(row) {
   reset()
-  const _id = row.id || ids.value
-  getDiagnosis(_id).then((response) => {
-    form.value = response.data
+  const id = row.id || ids.value
+  getDiagnosis(id).then((res) => {
+    form.value = res.data
     open.value = true
     title.value = '修改诊疗结果'
   })
 }
 
-/* 提交 */
+/* ---------- 提交 ---------- */
 function submitForm() {
   proxy.$refs.diagnosisRef.validate((valid) => {
-    if (valid) {
-      updateDiagnosis(form.value).then(() => {
-        proxy.$modal.msgSuccess('修改成功')
-        open.value = false
-        getList()
-      })
-    }
+    if (!valid) return
+    updateDiagnosis(form.value).then(() => {
+      proxy.$modal.msgSuccess('修改成功')
+      open.value = false
+      getList()
+    })
   })
 }
 
-/* 删除 */
+/* ---------- 删除 ---------- */
 function handleDelete(row) {
   const _ids = row.id || ids.value
   proxy
@@ -371,10 +391,9 @@ function handleDelete(row) {
       getList()
       proxy.$modal.msgSuccess('删除成功')
     })
-    .catch(() => { })
 }
 
-/* 导出 */
+/* ---------- 导出 ---------- */
 function handleExport() {
   proxy.download(
     'diagnosis/diagnosis/export',
@@ -383,35 +402,52 @@ function handleExport() {
   )
 }
 
-/* 🔥 监听 enddate 变化，自动计算治疗天数 */
-watch(() => form.value.enddate, (newVal) => {
-  if (newVal && form.value.begindate) {
-    const start = new Date(form.value.begindate)
-    const end = new Date(newVal)
-    const diffTime = Math.abs(end - start)
-    const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
-    form.value.treatDay = diffDays
-  } else {
+/* ---------- 弹窗取消 / 重置 ---------- */
+function cancel() {
+  open.value = false
+  reset()
+}
+function reset() {
+  form.value = {
+    id: undefined,
+    sheepNo: undefined,
+    datetime: undefined,
+    diseasePid: undefined,
+    diseaseId: undefined,
+    result: undefined,
+    begindate: undefined,
+    enddate: undefined,
+    treatDay: undefined,
+    sheepfoldId: undefined,
+    remark: undefined,
+  }
+  proxy.resetForm('diagnosisRef')
+}
+
+/* ---------- 自动计算治疗天数 ---------- */
+const calcTreatDay = () => {
+  const { begindate, enddate } = form.value
+  if (!begindate || !enddate) {
     form.value.treatDay = 0
+    return
   }
-})
-
-/* 🔥 可选：监听 begindate 变化，重新计算天数 */
-watch(() => form.value.begindate, () => {
-  if (form.value.enddate) {
-    const start = new Date(form.value.begindate)
-    const end = new Date(form.value.enddate)
-    const diffTime = Math.abs(end - start)
-    const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
-    form.value.treatDay = diffDays
-  }
-})
+  const diff = Math.ceil(
+    (new Date(enddate) - new Date(begindate)) / (1000 * 60 * 60 * 24)
+  )
+  form.value.treatDay = diff >= 0 ? diff : 0
+}
+watch(() => form.value.begindate, calcTreatDay)
+watch(() => form.value.enddate, calcTreatDay)
 
+/* ---------- 初始化 ---------- */
 onMounted(() => {
   getList()
   getDiseases()
-  listSheepfold_management().then(res => {
-    sheepfoldOptions.value = res.rows.map(item => ({ value: item.id, label: item.sheepfoldName }))
+  listSheepfold_management().then((res) => {
+    sheepfoldOptions.value = res.rows.map((i) => ({
+      value: i.id,
+      label: i.sheepfoldName,
+    }))
   })
 })
 </script>

src/views/biosafety/disinfect/index.vue

@@ -43,13 +43,13 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="disinfectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="消毒日期" align="center" prop="datetime" width="180">
         <!-- 2️⃣ 显示格式含时分 -->
         <template #default="scope">
           {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
         </template>
       </el-table-column>
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="消毒方式" align="center" prop="way">
         <template #default="scope">

src/views/biosafety/health/index.vue

@@ -29,10 +29,7 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange"
       @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保健日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
+
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -47,6 +44,10 @@
       <el-table-column label="繁殖状态" align="center" prop="breed" />
 
       <el-table-column label="技术员" align="center" prop="technical" />
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="保健日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
         <template #default="scope">

src/views/biosafety/immunity/index.vue

@@ -30,9 +30,7 @@
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange"
       @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="免疫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
+
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -43,7 +41,10 @@
       </el-table-column>
       <el-table-column label="月龄" align="center" prop="monthAge" sortable="custom" />
       <el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
-      <el-table-column label="繁殖状态" align="center" prop="breed" />
+      <el-table-column label="繁殖状态" align="center" prop="breed" />、
+      <el-table-column label="免疫日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">

src/views/biosafety/quarantine/index.vue

@@ -53,10 +53,10 @@
     </el-row>
 
     <!-- 表格 -->
-    <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange"
+      @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
-        :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
+
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="羊只性别" align="center" prop="gender">
         <template #default="scope">
@@ -64,8 +64,10 @@
         </template>
       </el-table-column>
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
-      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="月龄" align="center" prop="monthAge" sortable="custom" />
       <el-table-column label="繁育状态" align="center" prop="breed" />
+      <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
+        :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
       <el-table-column label="检疫项目" align="center" prop="itemName" />
       <el-table-column label="样品类型" align="center" prop="sample" />
       <el-table-column label="采样员" align="center" prop="sampler" />
@@ -314,7 +316,9 @@ const daterangeDatetime = ref([])
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 20,
-  sheepId: null
+  sheepId: null,
+  orderByColumn: null,   // 新增
+  isAsc: null            // 新增
 })
 
 /* 多选 */
@@ -327,6 +331,19 @@ function handleSelectionChange(sel) {
   multiple.value = !sel.length
 }
 
+
+function handleSortChange({ prop, order }) {
+  if (!order) {   // 取消排序
+    queryParams.orderByColumn = null
+    queryParams.isAsc = null
+  } else {
+    queryParams.orderByColumn = prop   // monthAge 或 parity
+    queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc'
+  }
+  getList()
+}
+
+
 /* 下拉数据 */
 const quarantineItems = ref([])
 const sampleTypes = ref([])

src/views/biosafety/treatment/index.vue

@@ -48,11 +48,7 @@
     <el-table v-loading="loading" :data="treatmentList" @selection-change="handleSelectionChange"
       @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="治疗日期" align="center" prop="datetime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -62,13 +58,18 @@
       </el-table-column>
       <el-table-column label="胎次" align="center" prop="parity" sortable="custom" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="泌乳天数" align="center" prop="lactDay" sortable="custom" width="120px"/>
-      <el-table-column label="怀孕天数" align="center" prop="gestDay" sortable="custom" width="120px"/>
+      <el-table-column label="泌乳天数" align="center" prop="lactDay" sortable="custom" width="120px" />
+      <el-table-column label="怀孕天数" align="center" prop="gestDay" sortable="custom" width="120px" />
       <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="datetime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">

src/views/biosafety/usageInfo/index.vue

@@ -19,7 +19,10 @@
       </el-form-item>
 
       <el-form-item label="使用名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入使用名称" clearable @keyup.enter="handleQuery" />
+        <el-select v-model="queryParams.name" placeholder="请选择使用药品名称" clearable filterable style="width: 100%"
+          @keyup.enter="handleQuery">
+          <el-option v-for="item in medicines" :key="item.value" :label="item.label" :value="item.label" />
+        </el-select>
       </el-form-item>
 
       <el-form-item label="使用类型" prop="useType">
@@ -78,7 +81,7 @@
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" />
-      
+
     <!-- 详情弹窗（保持不变） -->
     <el-dialog :title="title" v-model="open" width="680px" top="8vh" append-to-body :close-on-click-modal="false"
       class="usage-detail-dialog">
@@ -137,6 +140,7 @@
 </template>
 
 <script setup name="Usage">
+import { listMedicine} from "@/api/biosafety/medicine"
 import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
 import { listUnit } from '@/api/biosafety/unit'
 import { listUsage } from '@/api/biosafety/usage'
@@ -170,6 +174,7 @@ const { queryParams, form, rules } = toRefs(data)
 
 const units = ref([])
 const usages = ref([])
+const medicines = ref([])
 
 /* 获取单位 */
 function getUnit() {
@@ -177,6 +182,13 @@ function getUnit() {
     units.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
 }
+/* 获取药品信息 */
+function getMedicineOptions() {
+  listMedicine().then(res => {
+    medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
+  })
+}
+
 /* 获取使用方法 */
 function getUsageOptions() {
   listUsage().then(res => {
@@ -266,6 +278,7 @@ function handleExport() {
 /* 初始化 */
 getList()
 getUnit()
+getMedicineOptions()
 getUsageOptions()
 </script>
 

src/views/feed/FeedPlan/index.vue

@@ -2,7 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="配方编码" prop="formulaId">
-        <el-input v-model="queryParams.formulaId" placeholder="请输入配方编码" clearable @keyup.enter="handleQuery" />
+        <!-- <el-input v-model="queryParams.formulaId" placeholder="请输入配方编码" clearable @keyup.enter="handleQuery" /> -->
+        <el-select v-model="queryParams.formulaId" filterable placeholder="请选择配方编码" style="width: 100%">
+          <el-option v-for="item in formulaIdDict" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="羊舍" prop="sheepHouseId">
         <el-input v-model="queryParams.sheepHouseId" placeholder="请输入羊舍" clearable @keyup.enter="handleQuery" />
@@ -36,7 +39,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="创建日期" align="center" prop="createDate" />
       <el-table-column label="配方编码" align="center" prop="formulaId" />
-      <el-table-column label="批号" align="center" prop="batchId" />
+      <!-- <el-table-column label="批号" align="center" prop="batchId" /> -->
       <el-table-column label="羊舍" align="center" prop="sheepHouseId">
         <template #default="scope">
           {{ getSheepHouseName(scope.row.sheepHouseId) }}
@@ -54,15 +57,15 @@
         <!-- <el-table-column label="计划总量" align="center" prop="planMorningTotal" /> -->
         <el-table-column label="实际量" align="center" prop="actualMorningSize" />
       </el-table-column>
-      <el-table-column label="中午" prop="materialId" align="center">
+      <!-- <el-table-column label="中午" prop="materialId" align="center">
         <el-table-column label="计划量" align="center" prop="planNoonSize">
           <template #default="{ row }">
             {{ row.planNoonSize ? row.planNoonSize.toFixed(2) : '0.00' }}
           </template>
         </el-table-column>
-        <!-- <el-table-column label="计划总量" align="center" prop="planNoonTotal" /> -->
+        <el-table-column label="计划总量" align="center" prop="planNoonTotal" />
         <el-table-column label="实际量" align="center" prop="actualNoonSize" />
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="下午" prop="materialId" align="center">
         <el-table-column label="计划量" align="center" prop="planAfternoonSize">
           <template #default="{ row }">
@@ -72,18 +75,18 @@
         <!-- <el-table-column label="计划总量" align="center" prop="planAfternoonTotal" /> -->
         <el-table-column label="实际量" align="center" prop="actualAfternoonSize" />
       </el-table-column>
-      <el-table-column label="饲喂比例(%)" align="center" prop="ratioTotal">
+      <!-- <el-table-column label="饲喂比例(%)" align="center" prop="ratioTotal">
         <el-table-column label="上午" align="center" prop="ratioMorning" />
         <el-table-column label="中午" align="center" prop="ratioNoon" />
         <el-table-column label="下午" align="center" prop="ratioAfternoon" />
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" />
       <el-table-column label="饲草班人员" align="center" prop="zookeeper" />
       <el-table-column label="饲喂计划日期" align="center" prop="planDate" width="180">
         <template #default="scope">
           <!-- <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span> -->
-            <span>{{ scope.row.planDate ? parseTime(scope.row.planDate, '{y}-{m}-{d}') : '' }}</span>
+          <span>{{ scope.row.planDate ? parseTime(scope.row.planDate, '{y}-{m}-{d}') : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -128,7 +131,7 @@
         <el-form-item label="比例 (%)">
           <div style="display: flex; gap: 10px;">
             <el-input v-model="form.ratioMorning" placeholder="早上比例" style="width: 100px;" />
-            <el-input v-model="form.ratioNoon" placeholder="中午比例" style="width: 100px;" />
+            <el-input v-model="form.ratioNoon" placeholder="中午比例" style="width: 100px;" disabled />
             <el-input v-model="form.ratioAfternoon" placeholder="下午比例" style="width: 100px;" />
           </div>
         </el-form-item>
@@ -210,7 +213,7 @@
   const formulaBatchDict = ref([]) // 配方批号字典(过滤后)
   const sheepFolderDict = ref([]) // 羊舍字典
   // 用于存储羊舍名称的字典
-  const sheepNameDict = ref({}) 
+  const sheepNameDict = ref({})
 
   // 获取配方编码 & 配方批号 字典
   function getFormulaDict() {
@@ -274,19 +277,19 @@
   }
 
   // 羊舍ID与名称转换函数：输入可以是 ID 或 羊舍名称
-function getSheepHouseId(inputValue, sheepNameDict) {
-  if (!inputValue) return '';
+  function getSheepHouseId(inputValue, sheepNameDict) {
+    if (!inputValue) return '';
 
-  // 输入是纯数字，直接返回
-  if (/^\d+$/.test(inputValue)) {
-    return inputValue;
+    // 输入是纯数字，直接返回
+    if (/^\d+$/.test(inputValue)) {
+      return inputValue;
+    }
+
+    // 输入是名称，返回对应的 id
+    const match = sheepNameDict.find(item => item.value === inputValue);
+    return match ? match.label : '';
   }
 
-  // 输入是名称，返回对应的 id
-  const match = sheepNameDict.find(item => item.value === inputValue);
-  return match ? match.label : '';
-}
-
 
   /** 查询饲喂计划列表 */
   function getList() {
@@ -375,6 +378,8 @@ function getSheepHouseId(inputValue, sheepNameDict) {
   /** 提交按钮 */
   function submitForm() {
     proxy.$refs["FeedPlanRef"].validate(valid => {
+      // 修改或添加时，中午比例字段置 0 (需求)
+      form.value.ratioNoon = 0
       if (valid) {
         if (form.value.createDate != null) {
           updateFeedPlan(form.value).then(response => {

src/views/feed/FeedStatistic/index.vue

@@ -42,6 +42,7 @@
       <!-- <el-table-column label="青贮损耗比例" align="center" prop="silageLossRate" /> -->
       <el-table-column label="总饲喂量" align="center" prop="feedTotalSize" />
       <el-table-column label="日均饲喂量" align="center" prop="feedDailySize" />
+      <el-table-column label="时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleMaterialView(scope.row)"