Merge remote-tracking branch 'origin/master'

src/api/business/manage.js

@@ -9,6 +9,14 @@ export function listManage(query) {
   })
 }
 
+export function listCheckManage(query) {
+  return request({
+    url: '/business/check/checkList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询业务管理-检查管理详细
 export function getManage(id) {
   return request({

src/router/index.js

@@ -117,6 +117,7 @@ export const constantRoutes = [
         component: () => import('@/views/equipment-management/equipment-management/equipment-management'),
         name: 'EquipmentManagement',
         meta: { title: '设备管理', icon: 'date' }
+
       },
       {
         path: 'equipment-detail/:id',
@@ -132,6 +133,7 @@ export const constantRoutes = [
         name: 'EquipmentAdd',
         meta: { title: '设备新增' }
       },
+
       {
         path: 'use-management',
         props: true,
@@ -144,7 +146,7 @@ export const constantRoutes = [
         props: true,
         component: () => import('@/views/equipment-management/use-management/use-details'),
         name: 'UseDetails',
-        meta: { title: '使用详情', icon: 'table' }
+        meta: { title: '使用详情', icon: 'table', activeMenu: '/use-details' }
       }
     ]
   },

src/views/document-management/about-us/about-us.vue

@@ -104,6 +104,7 @@ export default {
 
     .title-text {
       margin-left: 10px;
+      font-weight: bold;
     }
   }
 }

src/views/document-management/privacy-policy/privacy-policy.vue

@@ -105,6 +105,7 @@ export default {
 
     .title-text {
       margin-left: 10px;
+      font-weight: bold;
     }
   }
 }

src/views/document-management/user-protocol/user-protocol.vue

@@ -104,6 +104,7 @@ export default {
 
     .title-text {
       margin-left: 10px;
+      font-weight: bold;
     }
   }
 }

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

@@ -84,20 +84,20 @@
 
     <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" align="center" prop="petOwnersId" />
-      <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" prop="petWeight" />
-      <el-table-column label="联系方式" align="center" prop="petColor" />
-      <el-table-column label="预约兽医" align="center" prop="sterilizationStatus" />
-      <el-table-column label="所属科室" align="center" prop="vaccineSituation" />
-      <el-table-column label="缴费状态" align="center" prop="insure" />
+      <el-table-column label="序号" type="index" align="center" />
+      <el-table-column label="检查类型" align="center" prop="checkType" />
+      <el-table-column label="检查项目" align="center" prop="checkItemsName" />
+      <el-table-column label="宠物昵称" align="center" prop="petNickname" />
+      <el-table-column label="宠物保险" align="center" prop="insure" />
+      <el-table-column label="宠主姓名" align="center" prop="nickname" />
+      <el-table-column label="联系方式" align="center" prop="phonenumber" />
+      <el-table-column label="预约兽医" align="center" prop="doctorName" />
+      <el-table-column label="所属科室" align="center" prop="doctorDeptName" />
+      <el-table-column label="缴费状态" align="center" prop="payType" />
       <el-table-column label="预约状态" align="center" prop="checkSchedule" />
-      <el-table-column label="检查状态" align="center" prop="payAmount" />
-      <el-table-column label="检查日期" align="center" prop="payType" />
-      <el-table-column label="检查时段" align="center" prop="payTime" width="180">
+      <el-table-column label="检查状态" align="center" prop="checkSchedule" />
+      <el-table-column label="检查日期" align="center" prop="reportTime" />
+      <el-table-column label="检查时段" align="center" prop="checkStartTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -150,7 +150,7 @@
 </template>
 
 <script>
-import { listManage, getManage, delManage, addManage, updateManage } from '@/api/business/manage'
+import { getManage, delManage, addManage, updateManage, listCheckManage } from '@/api/business/manage'
 export default {
   name: 'MedicalRecordManagement',
   dicts: ['exam_type'],
@@ -200,11 +200,10 @@ export default {
     /** 查询业务管理-检查管理列表 */
     getList() {
       this.loading = true
-      listManage(this.queryParams).then(response => {
+      listCheckManage(this.queryParams).then(response => {
         this.manageList = response.rows
         this.total = response.total
         this.loading = false
-        this.manageList.push({})
       })
     },
     // 取消按钮