63955

src/views/medical-record-management/medical-edit.vue

@@ -52,19 +52,19 @@ color: #333333;"
           <!--      宠物基本信息-->
           <el-row>
             <el-col :span="8">
-              <el-form-item label="宠物昵称">
+              <el-form-item label="宠物昵称" prop="petNickname">
                 <el-input v-model="detailInfo.petNickname" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <!--宠物ID-->
-              <el-form-item label="宠物ID">
+              <el-form-item label="宠物ID" prop="petsId">
                 <el-input v-model="detailInfo.petsId" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <!--宠物品种-->
-              <el-form-item label="宠物品种">
+              <el-form-item label="宠物品种" prop="petBreed">
                 <el-select
                   v-model="detailInfo.petBreed"
                   :disabled="!isEdit"
@@ -85,7 +85,7 @@ color: #333333;"
           <el-row>
             <el-col :span="8">
               <!--宠物性别-->
-              <el-form-item label="宠物性别">
+              <el-form-item label="宠物性别" prop="petSex">
                 <el-select
                   v-model="detailInfo.petSex"
                   :disabled="!isEdit"
@@ -107,7 +107,7 @@ color: #333333;"
             </el-col>
             <el-col :span="8">
               <!--宠物年龄-->
-              <el-form-item v-if="!isEdit" label="宠物年龄">
+              <el-form-item v-if="!isEdit" label="宠物年龄" prop="petAge">
                 <el-input v-model="detailInfo.petAge" disabled />
                 岁
               </el-form-item>
@@ -125,7 +125,7 @@ color: #333333;"
             </el-col>
             <el-col :span="8">
               <!--宠物体重-->
-              <el-form-item label="宠物体重">
+              <el-form-item label="宠物体重" prop="petWeight">
                 <el-input v-model="detailInfo.petWeight" :disabled="!isEdit" />
                 kg
               </el-form-item>
@@ -134,13 +134,13 @@ color: #333333;"
           <el-row>
             <el-col :span="8">
               <!--宠物毛色-->
-              <el-form-item label="宠物毛色">
+              <el-form-item label="宠物毛色" prop="petColor">
                 <el-input v-model="detailInfo.petColor" :disabled="!isEdit" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <!--绝育情况-->
-              <el-form-item label="绝育情况">
+              <el-form-item label="绝育情况" prop="sterilizationStatus">
                 <el-select
                   v-model="detailInfo.sterilizationStatus"
                   :disabled="!isEdit"
@@ -159,7 +159,7 @@ color: #333333;"
             </el-col>
             <el-col :span="8">
               <!--疫苗情况-->
-              <el-form-item label="疫苗情况">
+              <el-form-item label="疫苗情况" prop="vaccineSituation">
                 <el-select
                   v-model="detailInfo.vaccineSituation"
                   :disabled="!isEdit"
@@ -180,7 +180,7 @@ color: #333333;"
           <el-row>
             <el-col :span="8">
               <!--保险情况-->
-              <el-form-item label="宠物保险">
+              <el-form-item label="宠物保险" prop="insure">
                 <el-select
                   v-model="detailInfo.insure"
                   :disabled="!isEdit"
@@ -361,7 +361,7 @@ color: #333333;"
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="主诉">
+              <el-form-item label="主诉" prop="mainSuit">
                 <el-input
                   v-model="detailInfo.mainSuit"
                   :disabled="!isEdit"
@@ -372,7 +372,7 @@ color: #333333;"
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="医嘱">
+              <el-form-item label="医嘱" prop="doctorAdvice">
                 <el-input
                   v-model="detailInfo.doctorAdvice"
                   :disabled="!isEdit"
@@ -383,7 +383,7 @@ color: #333333;"
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="诊断结果">
+              <el-form-item label="诊断结果" prop="diagnosisResult">
                 <el-input
                   v-model="detailInfo.diagnosisResult"
                   :disabled="!isEdit"
@@ -909,7 +909,7 @@ color: #333333;"
           size="small"
         >
           <el-col :span="24">
-            <el-form-item label="回访情况">
+            <el-form-item label="回访情况" prop="followContent">
               <el-input
                 v-model="detailInfo.followContent"
                 :disabled="!isEdit || detailInfo.followTime"
@@ -963,11 +963,8 @@ export default {
   },
   data() {
     return {
+      // 表单校验
       formRules: {
-        // 宠物昵称非空校验
-        petNickname: [
-          { required: true, message: '宠物昵称不能为空', trigger: 'change' }
-        ],
         // 宠物性别非空校验
         petSex: [
           { required: true, message: '宠物性别不能为空', trigger: 'change' }
@@ -992,6 +989,22 @@ export default {
         insure: [
           { required: true, message: '保险情况不能为空', trigger: 'change' }
         ],
+        // 主诉非空校验
+        mainSuit: [
+          { required: true, message: '主诉不能为空', trigger: 'change' }
+        ],
+        // 医嘱非空校验
+        doctorAdvice: [
+          { required: true, message: '医嘱不能为空', trigger: 'change' }
+        ],
+        // 诊断结果非空校验
+        diagnosisResult: [
+          { required: true, message: '诊断结果不能为空', trigger: 'change' }
+        ],
+        // 回访情况非空校验
+        followContent: [
+          { required: true, message: '回访情况不能为空', trigger: 'change' }
+        ],
 
         // 诊位名称
         poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' },
@@ -1000,6 +1013,13 @@ export default {
         // 状态校验
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
       },
+      // 检查信息表单校验
+      checkRules: {
+        // 检查类型非空校验
+        checkType: [
+          { required: true, message: '检查类型不能为空', trigger: 'change' }
+        ]
+      },
       // 进度
       scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
       // 宠物出生日期校验
@@ -1022,7 +1042,6 @@ export default {
       drugForm: {}, // 用药管理table编辑
       drugRules: {},
       checkForm: {}, // 检查table编辑
-      checkRules: {},
       treatForm: {}, // 治疗table编辑
       treatRules: {},
       detailInfo: {

src/views/medical-record-management/medical-record-management.vue

@@ -39,8 +39,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="departmentId">
-          <el-select v-model.trim="queryParams.departmentId" clearable placeholder="兽医所属科室">
+        <el-form-item prop="hospitalDepartmentName">
+          <el-select v-model.trim="queryParams.hospitalDepartmentName" clearable placeholder="兽医所属科室">
             <el-option
               v-for="item in departmentList"
               :key="item.deptId"
@@ -58,17 +58,20 @@
             value-format="yyyy-MM-dd"
           />
         </el-form-item>
+
         <el-form-item prop="sort">
           <el-select
-            v-model.trim="queryParams.sort"
+            v-model.trim="column"
             clearable
+            value-key="id"
             placeholder="请选择排序方式"
+            @change="handleSort"
           >
             <el-option
               v-for="item in sortList"
-              :key="item.value"
+              :key="item.id"
               :label="item.label"
-              :value="item.value"
+              :value="item"
             />
           </el-select>
         </el-form-item>
@@ -191,6 +194,7 @@ export default {
   dicts: ['pet_insure'],
   data() {
     return {
+      column: '',
       // 所属科室下拉框字典写死
       departmentList: [],
       // 所属科室下拉框字典写死
@@ -225,8 +229,12 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        orderByColumn: null,
+        isAsc: null,
         // 排序方式声明
-        sort: '',
+        params: {
+          sort: null
+        },
         pageNum: 1,
         pageSize: 10,
         petNickname: null,
@@ -252,12 +260,16 @@ export default {
       // 排序方式下拉框字典写死
       sortList: [
         {
+          id: 1,
+          collation: 'desc',
           label: '按就诊日期倒序',
-          value: '01'
+          column: 'visit_date'
         },
         {
+          id: 2,
+          collation: 'asc',
           label: '按就诊日期正序',
-          value: '02'
+          column: 'visit_date'
         }
       ],
       // 表单参数
@@ -303,7 +315,12 @@ export default {
         name: 'MedicalDetail', params: { id: row.id }
       })
     },
-
+    // 选择排序规则
+    handleSort(val) {
+      console.log('选择排序方式', val)
+      this.queryParams.orderByColumn = val.column
+      this.queryParams.isAsc = val.collation
+    },
     // 选择全部
     checkAll() {
       this.recordIds = this.recordIdsForever
@@ -383,6 +400,11 @@ export default {
     /** 查询病例管理列表 */
     getList() {
       this.loading = true
+      if (this.queryParams.orderByColumn === null) {
+        this.queryParams.orderByColumn = 'visit_date'
+        this.queryParams.isAsc = 'desc'
+      }
+      console.log('查詢--', this.queryParams)
       listRecord(this.queryParams).then(response => {
         console.log('病历列表的数据：', response)
         this.recordList = response.rows.rows
@@ -444,12 +466,15 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log('参数:', this.queryParams)
       this.queryParams.pageNum = 1
       this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
+      this.queryParams.isAsc = null
+      this.queryParams.isAsc = 'desc'
       this.handleQuery()
     },
     /** 编辑按钮操作--跳转文章编辑页 */