Merge remote-tracking branch 'origin/master'

src/api/business/device.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询设备列表
 export function listDevice(query) {
   return request({
-    url: '/business/device/list',
+    url: '/system/device/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listDevice(query) {
 // 查询设备详细
 export function getDevice(id) {
   return request({
-    url: '/business/device/' + id,
+    url: '/system/device/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getDevice(id) {
 // 新增设备
 export function addDevice(data) {
   return request({
-    url: '/business/device',
+    url: '/system/device',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addDevice(data) {
 // 修改设备
 export function updateDevice(data) {
   return request({
-    url: '/business/device',
+    url: '/system/device',
     method: 'put',
     data: data
   })
@@ -38,8 +38,54 @@ export function updateDevice(data) {
 // 删除设备
 export function delDevice(data) {
   return request({
-    url: '/business/device/del',
+    url: '/system/device/del',
     method: 'Put',
     data: data
   })
 }
+
+// import request from '@/utils/request'
+//
+// // 查询设备列表
+// export function listDevice(query) {
+//   return request({
+//     url: '/business/device/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+//
+// // 查询设备详细
+// export function getDevice(id) {
+//   return request({
+//     url: '/business/device/' + id,
+//     method: 'get'
+//   })
+// }
+//
+// // 新增设备
+// export function addDevice(data) {
+//   return request({
+//     url: '/business/device',
+//     method: 'post',
+//     data: data
+//   })
+// }
+//
+// // 修改设备
+// export function updateDevice(data) {
+//   return request({
+//     url: '/business/device',
+//     method: 'put',
+//     data: data
+//   })
+// }
+//
+// // 删除设备
+// export function delDevice(data) {
+//   return request({
+//     url: '/business/device/del',
+//     method: 'Put',
+//     data: data
+//   })
+// }

src/api/business/use.js

+import request from '@/utils/request'
+
+// 查看使用管理详情
+export function useManagementDetail(id) {
+  return request({
+    url: '/manage/use/' + id,
+    method: 'get'
+  })
+}
+// 查询使用列表分页
+export function listUseManagement(query) {
+  return request({
+    url: '/manage/useList',
+    method: 'get',
+    params: query
+  })
+}

src/router/index.js

@@ -118,6 +118,13 @@ export const constantRoutes = [
         name: 'EquipmentManagement',
         meta: { title: '设备管理', icon: 'date' }
       },
+      {
+        path: 'equipment-detail',
+        props: true,
+        component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
+        name: 'EquipmentDetail',
+        meta: { title: '设备详情' }
+      },
       {
         path: 'use-management',
         props: true,
@@ -244,12 +251,36 @@ export const constantRoutes = [
         path: '/check-detail',
         props: true,
         hidden: true,
-        component: () => import('@/views/service-management/medical-record-management/check-detail'),
+        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'
+        }
       }
     ]
   },

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

@@ -105,16 +105,13 @@
         <template slot-scope="scope">
         <span
           v-if="scope.row.status === '1'"
-            style="color: #5FB54B;"
-          >{{ showStatus(scope.row.status) || '-' }}</span>
+          style="color: #5FB54B;">{{ showStatus(scope.row.status)}}</span>
         <span
           v-else-if="scope.row.status === '2'"
-            style="color: #FF9D4E;"
-          >{{ showStatus(scope.row.status) || '-' }}</span>
+          style="color: #FF9D4E;">{{ showStatus(scope.row.status)}}</span>
         <span
           v-else
-            style="color: #DB4747;"
-          >{{ showStatus(scope.row.status) || '-' }}</span>
+          style="color: #DB4747;">{{ showStatus(scope.row.status) || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width">

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

@@ -132,6 +132,7 @@
       <div class="title-paragraph">
         <span class="title-text">预约信息</span>
       </div>
+      <el-button @click="bookNow">立即预约</el-button>
       <el-row>
         <el-col :span="8">
           <el-form-item label="检查类型">
@@ -207,6 +208,14 @@ export default {
     return {
       checkDetail: ''
     }
+  },
+  methods: {
+    // 点击 预约信息-立即预约
+    bookNow() {
+      this.$router.push({
+        path: '/check-subscribe'
+      })
+    }
   }
 }
 </script>

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

+<template>
+  <div class="app-container">
+    检查项目
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'CheckItem'
+}
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  background-color: #FFFFFF;
+}
+</style>

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

@@ -7,7 +7,7 @@
         font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
         font-weight: bold;
         color: #333333;"
-      >详情</span>
+      >立即预约</span>
     </div>
     <el-form ref="form" :model="checkDetail" label-width="100px">
       <div class="title-paragraph">
@@ -76,7 +76,7 @@
         </el-col>
       </el-row>
       <div class="title-paragraph">
-        <span class="title-text">检查信息</span>
+        <span class="title-text">参考信息</span>
       </div>
       <!-- 1 -->
       <el-row>
@@ -86,53 +86,92 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="设备服务器">
+          <el-form-item label="检查项目">
             <span>2</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="下单时间">
+          <el-form-item label="缴费金额">
             <span>3</span>
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- 2 -->
+    </el-form>
+    <div class="title-paragraph">
+      <span class="title-text">设备预约</span>
+    </div>
+    <el-form ref="formDevice" :model="queryParams" label-width="100px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="检查日期">
-            <span>1</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="检查时段">
-            <span>2</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="报告上传时间">
-            <span>3</span>
+          <el-form-item label="设备">
+            <el-select v-model="queryParams.device" clearable multiple collapse-tags placeholder="请选择设备">
+              <el-option
+                v-for="item in dict.type.exam_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- 3 -->
-      <el-row>
         <el-col :span="8">
-          <el-form-item label="影像报告">
-            <span>1</span>
+          <el-form-item label="检查日期">
+            <el-select v-model="queryParams.data" clearable multiple collapse-tags placeholder="请选择检查日期">
+              <el-option
+                v-for="item in dict.type.exam_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
+    <!-- 设备表格 -->
+    <el-table >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备名称" align="center" prop="petNickname" />
+      <el-table-column label="检查日期" align="center" prop="petBreed" />
+      <el-table-column label="检查时段" align="center" prop="petSex" />
+      <el-table-column label="剩余可预约" align="center" prop="petAge" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+        <template slot-scope="scope">
+          <el-button
+            class="bookNow"
+            size="mini"
+            icon="el-icon-check"
+            @click="handleDelete(scope.row)"
+          >立即预约</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
 export default {
   name: 'CheckSubscribe',
+  dicts: ['exam_type'],
   data() {
     return {
-      checkDetail: ''
+      checkDetail: {},
+      queryParams: {},
+      total: 0
     }
+  },
+  methods: {
+    handleDelete() {
+    },
+    getList() {}
   }
 }
 </script>

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

@@ -76,6 +76,7 @@
         class="fourWordsBtn"
         icon="el-icon-download"
         size="mini"
+        @click="checkItem()"
       >检查项目</el-button>
       <el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       <el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@@ -194,7 +195,7 @@ export default {
     }
   },
   created() {
-    // this.getList()
+    this.getList()
   },
   methods: {
     /** 查询业务管理-检查管理列表 */
@@ -212,6 +213,12 @@ export default {
       this.open = false
       this.reset()
     },
+    // 点击检查项目
+    checkItem() {
+      this.$router.push({
+        path: '/check-item'
+      })
+    },
     // 表单重置
     reset() {
       this.form = {