修改挂号筛选项

src/api/business/register.js

@@ -9,6 +9,14 @@ export function listRegister(query) {
   })
 }
 
+// 查询科室下拉
+export function getDepartment() {
+  return request({
+    url: '/system/department/listAllDepartment',
+    method: 'get'
+  })
+}
+
 // 查询挂号详细
 export function getRegister(id) {
   return request({

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

@@ -118,7 +118,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"

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
@@ -49,7 +49,7 @@
               v-for="item in doctorNameList"
               :key="item.value"
               :label="item.label"
-              :value="item.value"
+              :value="item.label"
             />
           </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="请选择排序方式"
           >
@@ -123,27 +123,27 @@
         @select="selectChange"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
+        <el-table-column align="center" type="selection" width="55"/>
+        <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 />
+        <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip/>
         <el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
+            <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure"/>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip />
-        <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip />
+        <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip/>
+        <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip/>
         <el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="预约兽医" min-width="60" prop="doctorName" show-overflow-tooltip />
+        <el-table-column align="center" label="预约兽医" min-width="60" prop="doctorName" show-overflow-tooltip/>
         <el-table-column
           align="center"
           label="所属科室"
@@ -151,8 +151,8 @@
           prop="hospitalDepartmentName"
           show-overflow-tooltip
         />
-        <el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip />
-        <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip />
+        <el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip/>
+        <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip/>
         <el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
@@ -160,7 +160,7 @@
         </el-table-column>
         <el-table-column align="center" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" />
+            <dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus"/>
           </template>
         </el-table-column>
         <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="180">
@@ -199,7 +199,7 @@
 </template>
 
 <script>
-import { listRegister, checkPet } from '@/api/business/register'
+import { listRegister,getDepartment, checkPet } from '@/api/business/register'
 
 export default {
   name: 'Register',
@@ -217,7 +217,7 @@ export default {
       registerTypeList: [
         {
           label: '全部',
-          value: '0'
+          value: ''
         },
         {
           label: '现场挂号',
@@ -225,29 +225,12 @@ export default {
         },
         {
           label: '预约挂号',
-          value: '2'
-        }
-      ],
-      // 所属科室下拉框字典写死
-      departmentList: [
-        {
-          label: '全部',
           value: '0'
-        },
-        {
-          label: '胸肺科',
-          value: '1'
-        },
-        {
-          label: '呼吸科',
-          value: '2'
-        },
-        {
-          label: '脑科',
-          value: '3'
         }
       ],
       // 所属科室下拉框字典写死
+      departmentList: [],
+      // 所属科室下拉框字典写死
       doctorNameList: [
         {
           label: '全部',
@@ -306,9 +289,7 @@ export default {
       // 查询参数
       queryParams: {
         // 排序方式声明
-        params: {
-          sort: null
-        },
+        sort: '',
         pageNum: 1,
         pageSize: 10,
         type: null,
@@ -329,8 +310,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 +331,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getDeptList()
   },
   methods: {
     /** 查询挂号列表 */
@@ -367,6 +349,12 @@ export default {
         this.manualCheck()
       })
     },
+    /** 查询科室下拉*/
+    getDeptList() {
+      getDepartment().then(res => {
+        this.departmentList = res.data
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -394,8 +382,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 +482,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`)