Merge remote-tracking branch 'origin/master'

src/api/business/manage.js

+import request from '@/utils/request'
+
+// 查询业务管理-检查管理列表
+export function listManage(query) {
+  return request({
+    url: '/business/manage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询业务管理-检查管理详细
+export function getManage(id) {
+  return request({
+    url: '/business/manage/' + id,
+    method: 'get'
+  })
+}
+
+// 新增业务管理-检查管理
+export function addManage(data) {
+  return request({
+    url: '/business/manage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改业务管理-检查管理
+export function updateManage(data) {
+  return request({
+    url: '/business/manage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除业务管理-检查管理
+export function delManage(id) {
+  return request({
+    url: '/business/manage/' + id,
+    method: 'delete'
+  })
+}

src/router/index.js

@@ -212,6 +212,18 @@ export const constantRoutes = [
           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'),
+        name: 'CheckDetail',
+        meta: {
+          title: '检查详情',
+          icon: 'component'
+        }
       }
     ]
   },
@@ -310,6 +322,16 @@ export const constantRoutes = [
         meta: {
           title: '挂号新增', icon: 'component'
         }
+      },
+      // 检查管理
+      {
+        path: 'medical-record-management',
+        component: () => import('@/views/service-management/medical-record-management/medical-record-management.vue'),
+        name: 'MedicalRecordManagement',
+        props: true,
+        meta: {
+          title: '检查管理', icon: 'component'
+        }
       }
     ]
   }

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

@@ -81,37 +81,41 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="userList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" @select-all="selectAll($event, false)">
+      <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
       <el-table-column type="index" label="序号" width="50" />
-      <el-table-column label="设备ID" align="center" prop="deviceCode" />
-      <el-table-column label="检查项目" align="center" prop="deviceName" />
-      <el-table-column label="宠物昵称" align="center" prop="deviceType">
+      <el-table-column label="设备ID" align="left" prop="deviceId" />
+      <el-table-column label="检查项目" align="left" prop="checkItemsName" :show-overflow-tooltip="true"/>
+      <el-table-column label="宠物昵称" align="left" prop="petNickname" :show-overflow-tooltip="true"/>
+      <el-table-column label="宠物保险" align="left" prop="insure" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_type" :value="scope.row.deviceType" />
+          <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
         </template>
       </el-table-column>
-      <el-table-column label="宠物保险" align="center" prop="checkType" :show-overflow-tooltip="true">
+      <el-table-column label="宠主姓名" align="left" prop="ownerNikename"/>
+      <el-table-column label="宠主手机号" align="left" prop="phoneNumber"/>
+      <el-table-column label="检查日期" align="left" prop="checkStartTime" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.exam_type" :value="scope.row.checkTypeArr" />
+          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="宠主姓名" align="center" prop="isPrivate">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isPrivate === '1'">是</span>
-          <span v-else-if="scope.row.isPrivate === '0'">否</span>
-        </template>
+      <el-table-column label="检查时间" align="left" prop="deviceName" >
       </el-table-column>
-      <el-table-column label="宠主手机号" align="center" prop="status">
+      <el-table-column label="缴费金额" align="left" prop="payAmount" />
+      <el-table-column label="设备当前状态" align="left" prop="status" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_status" :value="scope.row.status" />
+        <span
+          v-if="scope.row.status === '1'"
+          style="color: #5FB54B;">{{ showStatus(scope.row.status) || '-' }}</span>
+        <span
+          v-else-if="scope.row.status === '2'"
+          style="color: #FF9D4E;">{{ showStatus(scope.row.status) || '-' }}</span>
+        <span
+          v-else
+          style="color: #DB4747;">{{ showStatus(scope.row.status) || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="检查日期" align="center" prop="deviceName" />
-      <el-table-column label="检查时间" align="center" prop="deviceName" />
-      <el-table-column label="缴费金额" align="center" prop="deviceName" />
-      <el-table-column label="设备当前状态" align="center" prop="deviceName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -141,6 +145,9 @@ export default {
   dicts: ['exam_type', 'device_status'],
   data() {
     return {
+      // 多选框选中id
+      ids: [],
+      loading: false,
       // 下拉框双向绑定值
       sortedColumn: '',
       // 排序规则
@@ -197,6 +204,51 @@ export default {
     }
   },
   methods: {
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /**
+     * 全部选择
+     * @param selection 已选择内容
+     * @param all 是否永远进行全选操作
+     */
+    async selectAll(selection = [], all = true) {
+      if (this.userList.length !== selection.length && !all) {
+        this.effectTableSelect([])
+      } else {
+        await this.changeTableSelect()
+      }
+    },
+    /**
+     * 控制table的选择项
+     * @param data
+     */
+    effectTableSelect(data = []) {
+      this.$refs.table.store.states.selection = data
+      this.$refs.table.store.updateSelectionByRowKey()
+      this.$refs.table.store.updateAllSelected()
+      this.$refs.table.$emit('selection-change', data)
+    },
+    /**
+     * 改变table选择项
+     * @param notIncludeIds 需要排除的id列表
+     */
+    async changeTableSelect(notIncludeIds = []) {
+      // 获取反选的数据
+      // const { data } = await selWardNoPage({ notIncludeIds })
+      // this.effectTableSelect(data)
+    },
+    // 反向选择
+    reverseSelect() {
+      this.changeTableSelect(this.ids)
+    },
+    // 表格
+    getRowKeys(row) {
+      return row.id
+    },
     // 去详情页
     detailsUse(row) {
       this.$router.push({

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

+<template>
+  <div>检查详情1123</div>
+</template>
+
+<script>
+export default {
+  name: 'CheckDetail'
+}
+</script>
+
+<style scoped>
+
+</style>