Merge remote-tracking branch 'origin/master'

src/api/business/register.js

@@ -9,6 +9,30 @@ export function listRegister(query) {
   })
 }
 
+// 查询科室下拉
+export function getDepartment() {
+  return request({
+    url: '/system/department/listAllDepartment',
+    method: 'get'
+  })
+}
+
+// 查询医生下拉
+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/article-management/article-edit.vue

@@ -53,7 +53,7 @@
             </el-form>
           </div>
         </div>
-        <div slot="footer" class="dialog-footer">
+        <div class="dialog-footer">
           <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
           <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
         </div>
@@ -87,6 +87,7 @@ export default {
   data() {
     const weightValidator = (rule, value, callback) => {
       if (value === 0) callback(new Error('权重不能为0'))
+      else callback()
     }
     return {
       // 状态下拉框

src/views/article-management/article-insert.vue

@@ -89,6 +89,7 @@ export default {
   data() {
     const weightValidator = (rule, value, callback) => {
       if (value === 0) callback(new Error('权重不能为0'))
+      else callback()
     }
     return {
       // 状态下拉框

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

@@ -963,6 +963,43 @@ export default {
   },
   data() {
     return {
+      formRules: {
+        // 宠物昵称非空校验
+        petNickname: [
+          { required: true, message: '宠物昵称不能为空', trigger: 'change' }
+        ],
+        // 宠物性别非空校验
+        petSex: [
+          { required: true, message: '宠物性别不能为空', trigger: 'change' }
+        ],
+        // 宠物生日非空校验
+        petBirthday: [
+          { required: true, message: '宠物生日不能为空', trigger: 'change' }
+        ],
+        // 宠物体重非空校验
+        petWeight: [
+          { required: true, message: '宠物体重不能为空', trigger: 'change' }
+        ],
+        // 绝育情况非空校验
+        sterilizationStatus: [
+          { required: true, message: '绝育情况不能为空', trigger: 'change' }
+        ],
+        // 疫苗情况非空校验
+        vaccineSituation: [
+          { required: true, message: '疫苗情况不能为空', trigger: 'change' }
+        ],
+        // 保险情况非空校验
+        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' }]
+      },
       // 进度
       scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
       // 宠物出生日期校验
@@ -988,9 +1025,11 @@ export default {
       checkRules: {},
       treatForm: {}, // 治疗table编辑
       treatRules: {},
-      detailInfo: {},
+      detailInfo: {
+        petOwnerBo: {}
+      },
       form: {},
-      formRules: [],
+
       // 排序下拉框
       insureList: [
         {
@@ -1410,6 +1449,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        console.log('this.editCunt', this.editCunt)
         if (tableName === 'checkManageBos') {
           deleteCheck(rowData.id).then(() => {
             this.$message({

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')
     },

src/views/service-management/medical-record-management/check-detail.vue

@@ -125,7 +125,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="缴费时间">
-            <span>{{ parseTime(checkDetail.payTime, '{y}/{m}/{d} {h}:{m}') }}</span>
+            <span>{{ parseTime(checkDetail.payTime, '{y}/{m}/{d} {h}:{i}') }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -150,7 +150,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="下单时间">
-            <span>{{ parseTime(checkDetail.appointTime, '{y}/{m}/{d} {h}:{m}') || '-' }}</span>
+            <span>{{ parseTime(checkDetail.appointTime, '{y}/{m}/{d} {h}:{i}') || '-' }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -176,7 +176,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="检查状态">
-              <span v-show="checkDetail.checkSchedule !== '3'">未检查</span>
+              <span v-show="checkDetail.checkSchedule === '0' || checkDetail.checkSchedule === '1'">-</span>
+              <span v-show="checkDetail.checkSchedule === '2'">未检查</span>
               <span v-show="checkDetail.checkSchedule === '3'">已检查</span>
             </el-form-item>
           </el-col>
@@ -294,6 +295,10 @@ export default {
     },
     /** 点击确认 */
     centerDialogVisible() {
+      if (this.videoReport === null) {
+        this.$message.error('请上传报告')
+        return
+      }
       this.checkDetail.shadowReport = this.videoReport
       this.checkDetail.reportTime = parseTime(new Date())
       this.checkDetail.checkSchedule = '3'

src/views/service-management/medical-record-management/check-subscribe.vue

@@ -187,7 +187,8 @@ export default {
       // 下拉可选择的设备
       selectableDevice: [],
       // 检查表ID
-      currentCheckId: null
+      currentCheckId: null,
+      currentPayAmount: null
     }
   },
   created() {
@@ -202,8 +203,9 @@ export default {
     }
     this.deviceQueryParams.checkTypeList.push(this.subscribeMessage.checkItemsId)
     this.currentCheckId = this.subscribeMessage.id
+    this.currentPayAmount = this.subscribeMessage.payAmount
     this.getDevice()
-    this.getAllDevice()
+    this.getAllDevice(this.subscribeMessage.checkItemsId)
   },
   methods: {
     // 点击立即预约
@@ -225,6 +227,8 @@ export default {
         checkMessage.appointTime = parseTime(new Date())
         checkMessage.checkStartTime = row.checkDate + ' ' + checkTimeList[0]
         checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
+        checkMessage.checkSchedule = '2' // 把进度改为预约检查
+        checkMessage.devicePrice = this.currentPayAmount
         console.log('需要修改的对象', checkMessage)
         const list = []
         list.push(checkMessage)
@@ -254,8 +258,10 @@ export default {
       })
     },
     // 获取所有设备
-    getAllDevice() {
-      deviceUseInSubscribeList({ isPrivate: '1' }).then(res => {
+    getAllDevice(checkItemsId) {
+      const list = []
+      list.push(checkItemsId)
+      deviceUseInSubscribeList({ isPrivate: '1', checkTypeList: list }).then(res => {
         this.selectableDevice = res.data
       })
     },

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

@@ -131,32 +131,32 @@
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.payment_status"
-            :value="scope.row.insure"
+            :value="scope.row.payType"
           />
         </template>
       </el-table-column>
       <el-table-column label="预约状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule">
         <template slot-scope="scope">
-          <span v-show="scope.row.checkSchedule < 2">未预约</span>
-          <span v-show="scope.row.checkSchedule >= 2">已预约</span>
+          <span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">未预约</span>
+          <span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span>
         </template>
       </el-table-column>
       <el-table-column label="检查状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule">
         <template slot-scope="scope">
-          <span v-show="scope.row.checkSchedule !== '3'">未检查</span>
+          <span v-show="scope.row.checkSchedule === '0' || scope.row.checkSchedule === '1'">-</span>
+          <span v-show="scope.row.checkSchedule === '2'">未检查</span>
           <span v-show="scope.row.checkSchedule === '3'">已检查</span>
         </template>
       </el-table-column>
       <el-table-column label="检查日期" align="center" :show-overflow-tooltip="true" prop="reportTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') }}</span>
+          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-'}}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查时段" align="center" :show-overflow-tooltip="true" prop="checkStartTime" width="80">
         <template slot-scope="scope">
-          <span>{{
-              parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}')
-            }}</span>
+          <span v-if="scope.row.checkStartTime === null && scope.row.checkEndTime === null">{{ '-' }}</span>
+          <span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-'}}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
@@ -372,12 +372,13 @@ export default {
       // 设备下拉框
       selectableDevice: [],
       // 当前的检查ID
-      currentCheckId: null
+      currentCheckId: null,
+      // 当前的设备服务费
+      currentPayAmount: null
     }
   },
   created() {
     this.getList()
-    this.getAllDevice()
   },
   methods: {
     parseTime,
@@ -462,8 +463,10 @@ export default {
       })
     },
     /** 获取所有设备用于设备下拉 */
-    getAllDevice() {
-      deviceUseInSubscribeList({ isPrivate: '1' }).then(res => {
+    getAllDevice(checkItemsId) {
+      const list = []
+      list.push(checkItemsId)
+      deviceUseInSubscribeList({ isPrivate: '1', checkTypeList: list }).then(res => {
         console.log('设备下拉框', res)
         this.selectableDevice = res.data
       })
@@ -518,9 +521,11 @@ export default {
       this.deviceQueryParams.checkTypeList = [...new Set(this.deviceQueryParams.checkTypeList)]
       this.deviceQueryParams.reservationTime = this.getCurrentTime()
       this.currentCheckId = row.id
+      this.currentPayAmount = row.payAmount
       console.log('点击立即预约后的状态', this.deviceQueryParams)
       // 设置检查项目id
       this.getDevice()
+      this.getAllDevice(row.checkItemsId)
     },
     // 获取当前时间
     getCurrentTime() {
@@ -541,7 +546,7 @@ export default {
         confirmButtonClass: 'queryBtn',
         type: 'warning'
       }).then(() => {
-        console.log('确定后...')
+        console.log('确定后...', row)
         const checkMessage = {}
         const checkTimeList = row.checkTime.split('-')
         checkMessage.id = this.currentCheckId
@@ -550,6 +555,8 @@ export default {
         checkMessage.appointTime = parseTime(new Date())
         checkMessage.checkStartTime = row.checkDate + ' ' + checkTimeList[0]
         checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
+        checkMessage.checkSchedule = '2' // 把进度改为预约检查
+        checkMessage.devicePrice = this.currentPayAmount
         console.log('需要修改的对象', checkMessage)
         const list = []
         list.push(checkMessage)
@@ -558,6 +565,7 @@ export default {
             this.$modal.msgSuccess('预约设备成功')
           }
         })
+        this.open = false
       })
     },
     /** 获取设备列表 */
@@ -647,7 +655,7 @@ export default {
       // }, `manage_${new Date().getTime()}.xlsx`)
       if (this.ids.length !== 0) {
         const exportTable = {}
-        exportTable.treatIds = this.ids
+        exportTable.checkIds = this.ids
         this.download('business/check/export', exportTable, `检查管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
         })

src/views/service-management/registration-queue/components/choose-pet.vue

 <template>
   <el-dialog class="pet-choose-modle" title="选择宠物" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
-    <el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
+    <el-form ref="queryForm" :inline="true" :model="queryParams" :rules="rules" label-width="100px" size="small">
       <div class="basicInformation">
         <div class="title">方式一：输入宠物ID查询</div>
       </div>
@@ -106,6 +106,15 @@ export default {
       chooseForm: {
         petStatus: ''
       },
+      rules: {
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ]
+      },
       // 选中数据
       chooseData: {},
       // 总条数
@@ -172,7 +181,7 @@ export default {
     choosePet() {
       this.$emit('petChoose', this.chooseData)
       this.$emit('petModleClose', false)
-      this.form.petStatus = '1'
+      this.chooseForm.petStatus = '1'
     },
     closeModle() {
       this.$emit('petModleClose', false)

src/views/service-management/registration-queue/components/doctor-card.vue

@@ -126,11 +126,11 @@
                 <el-button type="text">挂号</el-button>
               </div>
               <!--给它传一个userId,一个类型和一个默认页数-->
-              <div class="add" @click="registration(item.userId, '1',item,0)">
+              <div class="add">
                 <div class="add-img">
                   <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
                 </div>
-                <el-button type="text">加号</el-button>
+                <el-button type="text" :disabled="item.plusSign === '1'" @click="registration(item.userId, '1',item,0)">加号</el-button>
               </div>
             </div>
           </div>

src/views/service-management/registration-queue/registration-add.vue

@@ -46,6 +46,15 @@
                 clearable
                 collapse-tags
               />
+              <el-cascader
+                v-model.trim="form.petBreed"
+                placeholder="请选择宠物品种"
+                :options="options"
+                :disabled="!isEdit"
+                :props="props"
+                clearable
+                collapse-tags
+              />
             </el-form-item>
           </el-form-item>
         </el-col>
@@ -118,7 +127,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="疫苗情况:" prop="petSex">
+          <el-form-item label="疫苗情况:" prop="vaccineSituation">
             <el-select
               v-model="form.vaccineSituation"
               :disabled="!isEdit"
@@ -173,37 +182,37 @@
       <!--      新建宠物-->
       <el-row v-if="showPetInfo" :gutter="41">
         <el-col :span="8">
-          <el-form-item label="宠主姓名:" prop="masterPhone">
+          <el-form-item label="宠主姓名:">
             {{ form.nickName }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="手机号:" prop="masterPhone">
+          <el-form-item label="手机号:">
             {{ form.phoneNumber }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="用户ID:" prop="masterPhone">
+          <el-form-item label="用户ID:">
             {{ form.ownersId }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="创建时间:" prop="masterPhone">
+          <el-form-item label="创建时间:">
             {{ form.createTime }}
           </el-form-item>
         </el-col>
         <el-col v-if="form.customers==='1'" :span="8">
-          <el-form-item label="会员等级:" prop="masterPhone">
+          <el-form-item label="会员等级:">
             {{ form.membershipLevel ? form.membershipLevel : '-' }}
           </el-form-item>
         </el-col>
         <el-col v-if="form.customers==='1'" :span="8">
-          <el-form-item label="会员卡余额:" prop="masterPhone">
+          <el-form-item label="会员卡余额:">
             {{ form.cardBalance ? form.cardBalance : '-' }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="绑定宠物数量:" prop="masterPhone">
+          <el-form-item label="绑定宠物数量:">
             {{ form.petCount }}
           </el-form-item>
         </el-col>
@@ -337,7 +346,8 @@ export default {
         ],
         // 宠物体重非空校验
         petWeight: [
-          { required: true, message: '宠物体重不能为空', trigger: 'change' }
+          { required: true, message: '宠物体重不能为空', trigger: 'change' },
+          { pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '宠物体重只能输入数字', trigger: 'blur' }
         ],
         // 绝育情况非空校验
         sterilizationStatus: [
@@ -351,6 +361,15 @@ export default {
         insure: [
           { required: true, message: '保险情况不能为空', trigger: 'change' }
         ],
+        // 宠主手机号非空校验
+        masterPhone: [
+          { required: true, message: '宠主手机号不能为空', trigger: 'blur' },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ],
         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' }],
@@ -403,25 +422,27 @@ export default {
     },
     /** 根据手机号判断宠主是否存在，不存在新增宠主 回显宠主信息*/
     checkOwner() {
-      checkPetOwner({ phone: this.form.masterPhone }).then(response => {
-        const data = response.data
-        console.log('这是你家吗，大姐', data)
-        this.petForm = data
-        const temp = {
-          // 宠主信息开始
-          nickName: data.nickName,
-          phoneNumber: data.phoneNumber,
-          ownersId: data.ownersId,
-          createTime: data.createTime,
-          membershipLevel: data.membershipLevel,
-          customers: data.customers, // 是否是新客 0 是 1 否
-          petCount: data.petCount,
-          cardBalance: data.cardBalance,
-          ownerId: data.id
-        }
-        Object.assign(this.form, temp)
-        this.showPetInfo = true
-      })
+      if (this.form.masterPhone) {
+        checkPetOwner({ phone: this.form.masterPhone }).then(response => {
+          const data = response.data
+          console.log('这是你家吗，大姐', data)
+          this.petForm = data
+          const temp = {
+            // 宠主信息开始
+            nickName: data.nickName,
+            phoneNumber: data.phoneNumber,
+            ownersId: data.ownersId,
+            createTime: data.createTime,
+            membershipLevel: data.membershipLevel,
+            customers: data.customers, // 是否是新客 0 是 1 否
+            petCount: data.petCount,
+            cardBalance: data.cardBalance,
+            ownerId: data.id
+          }
+          Object.assign(this.form, temp)
+          this.showPetInfo = true
+        })
+      }
     },
     // 选择新增宠物，使表单可编辑
     handleAdd() {

src/views/service-management/registration-queue/registration-queue.vue

@@ -13,7 +13,7 @@
         </el-form-item>
         <el-form-item prop="departmentId">
           <el-select
-            v-model="queryParams.departmentId"
+            v-model="queryParams.type"
             clearable
             placeholder="挂号方式"
           >
@@ -25,21 +25,21 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="departmentId">
+        <el-form-item prop="hospitalDepartmentName">
           <el-select
-            v-model="queryParams.departmentId"
+            v-model="queryParams.hospitalDepartmentName"
             clearable
             placeholder="所属科室"
           >
             <el-option
               v-for="item in departmentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.deptId"
+              :label="item.departmentName"
+              :value="item.departmentName"
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="departmentId">
+        <el-form-item prop="doctorName">
           <el-select
             v-model="queryParams.doctorName"
             clearable
@@ -47,9 +47,9 @@
           >
             <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>
@@ -64,7 +64,7 @@
         </el-form-item>
         <el-form-item prop="sort">
           <el-select
-            v-model="queryParams.params.sort"
+            v-model="queryParams.sort"
             clearable
             placeholder="请选择排序方式"
           >
@@ -127,7 +127,7 @@
         <el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
         <el-table-column align="center" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span>{{ scope.row.type === '1'? '现场' : '预约' }}</span>
+            <span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip />
@@ -199,7 +199,7 @@
 </template>
 
 <script>
-import { listRegister, checkPet } from '@/api/business/register'
+import { listRegister, getDepartment, checkPet, getDoctorment } from '@/api/business/register'
 
 export default {
   name: 'Register',
@@ -217,7 +217,7 @@ export default {
       registerTypeList: [
         {
           label: '全部',
-          value: '0'
+          value: ''
         },
         {
           label: '现场挂号',
@@ -225,47 +225,13 @@ export default {
         },
         {
           label: '预约挂号',
-          value: '2'
-        }
-      ],
-      // 所属科室下拉框字典写死
-      departmentList: [
-        {
-          label: '全部',
           value: '0'
-        },
-        {
-          label: '胸肺科',
-          value: '1'
-        },
-        {
-          label: '呼吸科',
-          value: '2'
-        },
-        {
-          label: '脑科',
-          value: '3'
         }
       ],
       // 所属科室下拉框字典写死
-      doctorNameList: [
-        {
-          label: '全部',
-          value: '0'
-        },
-        {
-          label: '李萍',
-          value: '1'
-        },
-        {
-          label: '张毅',
-          value: '2'
-        },
-        {
-          label: '赵萌萌',
-          value: '3'
-        }
-      ],
+      departmentList: [],
+      // 所属科室下拉框字典写死
+      doctorNameList: [],
       // 排序方式下拉框字典写死
       sortList: [
         {
@@ -306,9 +272,7 @@ export default {
       // 查询参数
       queryParams: {
         // 排序方式声明
-        params: {
-          sort: null
-        },
+        sort: '',
         pageNum: 1,
         pageSize: 10,
         type: null,
@@ -329,8 +293,8 @@ export default {
         doctorId: null,
         doctorName: null,
         deptId: null,
-        departmentId: null,
-        departmentName: null,
+        hospitalDepartId: null,
+        hospitalDepartmentName: null,
         doctorPhone: null,
         visitWay: null,
         firstVisit: null,
@@ -350,6 +314,8 @@ export default {
   },
   created() {
     this.getList()
+    this.getDeptList()
+    this.getDoctorList()
   },
   methods: {
     /** 查询挂号列表 */
@@ -367,6 +333,21 @@ export default {
         this.manualCheck()
       })
     },
+    /** 查询科室下拉*/
+    getDeptList() {
+      getDepartment().then(res => {
+        this.departmentList = res.data
+      })
+    },
+
+    /** 查询医生名字下拉*/
+    getDoctorList() {
+      getDoctorment().then(res => {
+        this.doctorNameList = res.data
+        console.log('这是我要的医生下拉框:', this.doctorNameList)
+      })
+    },
+
     // 取消按钮
     cancel() {
       this.open = false
@@ -394,8 +375,8 @@ export default {
         doctorId: null,
         doctorName: null,
         deptId: null,
-        departmentId: null,
-        departmentName: null,
+        hospitalDepartmentId: null,
+        hospitalDepartmentName: null,
         doctorPhone: null,
         visitWay: null,
         firstVisit: null,
@@ -494,7 +475,7 @@ export default {
       this.download('business/register/export', {
         ...this.queryParams,
         params: {
-          sort: this.queryParams.params.sort,
+          sort: this.sort,
           idList: this.ids
         }
       }, `register_${new Date().getTime()}.xlsx`)