63955

src/api/business/register.js

@@ -17,6 +17,22 @@ export function getDepartment() {
   })
 }
 
+// 查询医生下拉
+export function getDoctorment() {
+  return request({
+    url: '/system/manage/listAll',
+    method: 'get'
+  })
+}
+
+// 查询医生下拉
+export function getHospital() {
+  return request({
+    url: '/system/hospital/list-all',
+    method: 'get'
+  })
+}
+
 // 查询挂号详细
 export function getRegister(id) {
   return request({

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

@@ -963,7 +963,7 @@ export default {
   },
   data() {
     return {
-      rules: {
+      formRules: {
         // 宠物昵称非空校验
         petNickname: [
           { required: true, message: '宠物昵称不能为空', trigger: 'change' }
@@ -992,9 +992,12 @@ export default {
         insure: [
           { required: true, message: '保险情况不能为空', trigger: 'change' }
         ],
+
+        // 诊位名称
         poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' },
           { min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
           { pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', trigger: 'change' }],
+        // 状态校验
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
       },
       // 进度
@@ -1024,7 +1027,7 @@ export default {
       treatRules: {},
       detailInfo: {},
       form: {},
-      formRules: [],
+
       // 排序下拉框
       insureList: [
         {

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

@@ -13,7 +13,7 @@
       >
         <el-form-item prop="petNickname">
           <el-input
-            v-model="queryParams.petNickname"
+            v-model="queryParams.medicalRecordNo"
             clearable
             placeholder="请输入病历号/宠物昵称/宠主手机号"
             @keyup.enter.native="handleQuery"
@@ -23,35 +23,35 @@
           <el-select v-model.trim="queryParams.doctorName" clearable placeholder="主治兽医">
             <el-option
               v-for="item in doctorNameList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.doctorId"
+              :label="item.doctorName"
+              :value="item.doctorName"
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="deptId">
-          <el-select v-model.trim="queryParams.doctorName" clearable placeholder="所属医院">
+        <el-form-item prop="hospitalId">
+          <el-select v-model.trim="queryParams.hospitalName" clearable placeholder="所属医院">
             <el-option
-              v-for="item in deptIdList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in HospitalList"
+              :key="item.hospitalId"
+              :label="item.hospitalName"
+              :value="item.hospitalName"
             />
           </el-select>
         </el-form-item>
         <el-form-item prop="departmentId">
           <el-select v-model.trim="queryParams.departmentId" clearable placeholder="兽医所属科室">
             <el-option
-              v-for="item in departIdList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in departmentList"
+              :key="item.deptId"
+              :label="item.departmentName"
+              :value="item.departmentName"
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="visitTime">
+        <el-form-item prop="visitDate">
           <el-date-picker
-            v-model="queryParams.visitTime"
+            v-model="queryParams.visitDate"
             clearable
             placeholder="请选择就诊日期"
             type="date"
@@ -60,7 +60,7 @@
         </el-form-item>
         <el-form-item prop="sort">
           <el-select
-            v-model.trim="queryParams.params.sort"
+            v-model.trim="queryParams.sort"
             clearable
             placeholder="请选择排序方式"
           >
@@ -183,6 +183,7 @@
 
 <script>
 import { listRecord } from '@/api/business/record'
+import { getDepartment, getDoctorment, getHospital } from '@/api/business/register'
 
 export default {
   name: 'MedicalRecordManagement',
@@ -190,13 +191,18 @@ export default {
   dicts: ['pet_insure'],
   data() {
     return {
+      // 所属科室下拉框字典写死
+      departmentList: [],
+      // 所属科室下拉框字典写死
+      doctorNameList: [],
+      // 所属科室下拉框字典写死
+      HospitalList: [],
       // 所有挂号信息ID(选择全部-临时表)
       recordIds: [],
       // 所有挂号信息ID(在不点击选择全部时-临时表)
       registerEmptyIds: [],
       // 所有挂号信息ID(用于辅助, 里面的数据永远不变, 除了 新增/删除 数据时)
       recordIdsForever: [],
-      doctorNameList: [],
       deptIdList: [],
       departIdList: [],
       // 遮罩层
@@ -220,9 +226,7 @@ export default {
       // 查询参数
       queryParams: {
         // 排序方式声明
-        params: {
-          sort: null
-        },
+        sort: '',
         pageNum: 1,
         pageSize: 10,
         petNickname: null,
@@ -264,8 +268,32 @@ export default {
   },
   created() {
     this.getList()
+    this.getDoctorList()
+    this.getDeptList()
+    this.getHospitalList()
   },
   methods: {
+    /** 查询科室下拉*/
+    getDeptList() {
+      getDepartment().then(res => {
+        this.departmentList = res.data
+      })
+    },
+    /** 查询医生名字下拉*/
+    getDoctorList() {
+      getDoctorment().then(res => {
+        this.doctorNameList = res.data
+        console.log('这是我要的医生下拉框:', this.doctorNameList)
+      })
+    },
+    /** 查询医生名字下拉*/
+    getHospitalList() {
+      getHospital().then(res => {
+        this.HospitalList = res.data
+        console.log('这是我要的医院下拉框:', this.HospitalList)
+      })
+    },
+
     /** 详情按钮操作--跳转文章详情页 */
     handleDetail(row) {
       this.reset()
@@ -376,27 +404,41 @@ export default {
     reset() {
       this.form = {
         id: null,
+        type: null,
+        petId: null,
         petNickname: null,
-        nickname: null,
-        petOwnerNumber: null,
+        petBreed: null,
+        petSex: null,
+        petAge: null,
+        petWeight: null,
+        petColor: null,
+        sterilizationStatus: null,
+        vaccineSituation: null,
+        insure: null,
+        checkSchedule: null,
+        payAmount: null,
+        payType: null,
+        payTime: null,
+        doctorId: null,
         doctorName: null,
         deptId: null,
-        departmentId: null,
-        diagnosticResults: null,
-        visitNumber: null,
+        hospitalDepartmentId: null,
+        hospitalDepartmentName: null,
+        doctorPhone: null,
+        visitWay: null,
+        firstVisit: null,
+        visitDate: null,
         visitTime: null,
-        visitOffice: null,
-        visitInformation: null,
-        orders: null,
-        medicationInformation: null,
-        petId: null,
-        petOwnerId: null,
-        doctorId: null,
+        scheduleId: null,
+        visitFirstTime: null,
+        payStatus: null,
+        delFlag: null,
+        createBy: null,
         createTime: null,
+        updateBy: null,
         updateTime: null,
-        petJson: null,
-        doctorJson: null,
-        ownerJson: null
+        remark: null,
+        petOwnersId: null
       }
       this.resetForm('form')
     },