Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -186,78 +186,6 @@ export const constantRoutes = [
       }
     ]
   },
-  //
-  // // 病历路由
-  // {
-  //   path: '',
-  //   hidden: true,
-  //   component: Layout,
-  //   redirect: 'index',
-  //   children: [
-  //     // 病历详情页
-  //     {
-  //       path: '/medical-detail/:id',
-  //       props: true,
-  //       permissions: ['*:*:*'],
-  //       component: () => import('@/views/medical-record-management/medical-detail'),
-  //       name: 'MedicalDetail',
-  //       meta: {
-  //         title: '病历详情',
-  //         icon: 'dashboard',
-  //         activeMenu: '/medical-record-management'
-  //       }
-  //     },
-  //     // 预约设备页面
-  //     {
-  //       path: '/reservation-equipment/:id:pet',
-  //       props: true,
-  //       permissions: ['*:*:*'],
-  //       component: () => import('@/views/medical-record-management/reservation-equipment'),
-  //       name: 'ReservationEquipment',
-  //       meta: {
-  //         title: '预约设备',
-  //         icom: 'dashboard',
-  //         activeMenu: '/medical-record-management/medical-detail'
-  //       }
-  //     },
-  //     // 检查详情
-  //     {
-  //       path: '/check-detail',
-  //       props: true,
-  //       hidden: true,
-  //       component: () => import('@/views/service-management/medical-record-management/check-detail.vue'),
-  //       name: 'CheckDetail',
-  //       meta: {
-  //         title: '检查详情',
-  //         icon: 'component'
-  //       }
-  //     },
-  //     // 检查管理-立即预约
-  //     {
-  //       path: '/check-subscribe',
-  //       props: true,
-  //       hidden: true,
-  //       component: () => import('@/views/service-management/medical-record-management/check-subscribe.vue'),
-  //       name: 'CheckSubscribe',
-  //       meta: {
-  //         title: '立即预约',
-  //         icon: 'component'
-  //       }
-  //     },
-  //     // 检查管理-检查影像
-  //     {
-  //       path: '/check-item',
-  //       props: true,
-  //       hidden: true,
-  //       component: () => import('@/views/service-management/medical-record-management/check-item.vue'),
-  //       name: 'CheckItem',
-  //       meta: {
-  //         title: '检查项目',
-  //         icon: 'component'
-  //       }
-  //     }
-  //   ]
-  // },
   // 个人中心
   {
     path: '/user',
@@ -355,6 +283,16 @@ export const constantRoutes = [
           title: '挂号新增', icon: 'component'
         }
       },
+      // 治疗管理
+      {
+        path: 'treatment-management',
+        component: () => import('@/views/service-management/treatment-management/treatment-management'),
+        name: 'TreatmentManagement',
+        props: true,
+        meta: {
+          title: '治疗管理', icon: 'component'
+        }
+      },
       // 检查管理
       {
         path: 'medical-record-management',
@@ -400,6 +338,42 @@ export const constantRoutes = [
           title: '检查项目',
           icon: 'component'
         }
+      },
+      // 治疗详情
+      {
+        path: 'treatment-detail',
+        props: true,
+        hidden: true,
+        component: () => import('@/views/service-management/treatment-management/treatment-detail'),
+        name: 'TreatmentDetail',
+        meta: {
+          title: '治疗详情',
+          icon: 'component'
+        }
+      },
+      // 治疗管理-立即预约
+      {
+        path: 'treatment-subscribe',
+        props: true,
+        hidden: true,
+        component: () => import('@/views/service-management/treatment-management/treatment-subscribe'),
+        name: 'TreatmentSubscribe',
+        meta: {
+          title: '立即预约',
+          icon: 'component'
+        }
+      },
+      // 治疗管理-治疗項目
+      {
+        path: 'treatment-item',
+        props: true,
+        hidden: true,
+        component: () => import('@/views/service-management/treatment-management/treatment-item'),
+        name: 'TreatmentItem',
+        meta: {
+          title: '治疗项目',
+          icon: 'component'
+        }
       }
     ]
   }

src/views/equipment-management/use-management/use-details.vue

@@ -185,7 +185,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="宠物年龄">
-                <el-input v-model="form.petAge" :disabled="true" />
+                <el-input v-model="form.petAgeHis" :disabled="true" />
               </el-form-item>
             </el-col>
             <el-col :span="8">

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

@@ -198,13 +198,28 @@
       <el-table
         :data="deviceList"
         style="width: 100%">
-        <el-table-column prop="date" align="left" label="设备名称" />
-        <el-table-column prop="date" align="left" label="检查日期" />
-        <el-table-column prop="date" align="left" label="检查时段" />
-        <el-table-column prop="date" align="left" label="剩余可预约" />
+        <el-table-column prop="deviceName" align="left" label="设备名称" />
+        <el-table-column prop="checkDate" align="left" label="检查日期" />
+        <el-table-column prop="checkTime" align="left" label="检查时段" />
+        <el-table-column prop="num" align="left" label="剩余可预约" />
         <el-table-column prop="date" align="left" label="设备服务费" />
-        <el-table-column prop="date" align="left" label="操作" />
+        <el-table-column align="left" label="操作">
+          <template slot-scope="scope">
+            <el-button
+              class="fourWordsBtn"
+              size="mini"
+              @click="handleSubscribeDevice(scope.row)"
+            >立即预约</el-button>
+          </template>
+        </el-table-column>
       </el-table>
+      <pagination
+        v-show="deviceTotal>0"
+        :total="deviceTotal"
+        :page.sync="deviceQueryParams.pageNum"
+        :limit.sync="deviceQueryParams.pageSize"
+        @pagination="getDevice"
+      />
 <!--      <div slot="footer" class="dialog-footer">-->
 <!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
 <!--        <el-button @click="cancel">取 消</el-button>-->
@@ -235,8 +250,9 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      deviceTotal: 0,
       // 业务管理-检查管理表格数据
-      manageList: [{}],
+      manageList: [],
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -250,6 +266,11 @@ export default {
         petBreed: null,
         petSex: null
       },
+      deviceQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        reservationTime: null
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -307,10 +328,16 @@ export default {
       console.log('点击立即预约', row)
       this.getDevice()
     },
+    /** 对话框立即预约设备 */
+    handleSubscribeDevice() {
+    },
     /** 获取设备列表 */
     getDevice() {
-      listReservationDevice({ reservationTime: '2023-06-15' }).then(res => {
+      this.deviceQueryParams.reservationTime = '2023-06-15'
+      listReservationDevice(this.deviceQueryParams).then(res => {
         console.log('设备', res)
+        this.deviceList = res.rows.table
+        this.deviceTotal = res.total
       })
     },
     /** 重置按钮操作 */

src/views/service-management/treatment-management/treatment-detail.vue

+<template>
+<div>33</div>
+</template>
+
+<script>
+export default {
+  name: 'TreatmentDetail'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/service-management/treatment-management/treatment-item.vue

+<template>
+<div>22</div>
+</template>
+
+<script>
+export default {
+  name: 'TreatmentItem'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/service-management/treatment-management/treatment-subscribe.vue

+<template>
+<div>11</div>
+</template>
+
+<script>
+export default {
+  name: 'TreatmentSubscribe'
+}
+</script>
+
+<style scoped>
+
+</style>