使用药品，日期展示修改

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>