Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/equipment-management/equipment-management/equipment-detail.vue
#	src/views/equipment-management/use-management/use-management.vue
#	src/views/service-management/medical-record-management/medical-record-management.vue

src/assets/styles/btn.scss

@@ -189,13 +189,13 @@
     background: rgba(95,181,75,0.08);
     opacity: 1;
     border: 1px solid #5FB54B;
-    color: #333333!important;
+    color: #85C776!important;
   }
   &:focus {
     background: rgba(85,163,67,0.08);
     opacity: 1;
     border: 1px solid #55A343;
-    color: #333333!important;
+    color: #55A343!important;
   }
 }
 /** 两个按钮间的间距*/

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-management.vue

@@ -83,36 +83,64 @@
       <el-col :span="12" style="padding-bottom: 20px;">
         <div style="width: 100%;text-align: end;">
           <el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">查询</el-button>
-          <el-button icon="el-icon-refresh" class="resetBtn" @click="resetQuery">重置</el-button>
+          <el-button class="resetBtn" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </div>
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" :header-cell-class-name="cellClass">
       <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" min-width="60" />
-      <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true" />
-      <el-table-column label="设备ID" align="left" prop="deviceCode" min-width="80" :show-overflow-tooltip="true" />
-      <el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="80" :show-overflow-tooltip="true" />
-      <el-table-column label="宠物昵称" align="left" prop="petNickname" min-width="80" :show-overflow-tooltip="true" />
+      <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.deviceName || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备ID" align="left" prop="deviceCode" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.deviceCode || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="检查项目" align="left" prop="checkItemsName"  min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.checkItemsName || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="宠物昵称" align="left" prop="petNickname" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.petNickname || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="宠物保险" align="left" prop="insure" min-width="80" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
         </template>
       </el-table-column>
-      <el-table-column label="宠主姓名" align="left" prop="ownerNikename" :show-overflow-tooltip="true" />
-      <el-table-column label="宠主手机号" align="left" prop="phoneNumber" />
+      <el-table-column label="宠主姓名" align="left" prop="ownerNikename" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.ownerNikename || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="宠主手机号" align="left" prop="phoneNumber" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.phoneNumber || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="检查日期" align="left" prop="checkStartTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') }}</span>
+          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查时间" align="left" prop="checkStartTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') }}</span>
+          <span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') || '-'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="缴费金额" align="left" prop="payAmount" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.payAmount || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="缴费金额" align="left" prop="payAmount" />
       <el-table-column label="设备当前状态" align="left" prop="status">
         <template slot-scope="scope">
           <span

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

+<template>
+  <div class="app-container">
+    <!--   头部标题-->
+    <div style="padding-top:5px;text-align: center;">
+      <span
+        style="font-size: 24px;
+        font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
+        font-weight: bold;
+        color: #333333;"
+      >详情</span>
+    </div>
+    <el-form ref="form" :model="checkDetail" label-width="100px">
+      <div class="title-paragraph">
+        <span class="title-text">宠物信息</span>
+      </div>
+      <!-- 1 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="宠物昵称">
+            <span>{{ checkDetail.petNickname }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="宠物ID">
+            <span>{{ checkDetail.petsId }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="宠物品种">
+            <span>{{ checkDetail.petBreed }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- 2 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="宠物性别">
+            <span>{{ checkDetail.petSex === '0' ? '公' : (checkDetail.petSex === '1' ? '母' : '未知')}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="宠物年龄">
+            <span>{{ checkDetail.petAge }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="宠物体重">
+            <span>{{ checkDetail.petWeight + 'kg'}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- 3 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="宠物毛色">
+            <span>{{ checkDetail.petColor }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="绝育情况">
+            <span>{{ checkDetail.sterilizationStatus === '0' ? '已绝育' : '未绝育' }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="疫苗情况">
+            <span>{{ checkDetail.vaccineSituation === '0' ? '当年已接种' : '当年未接种' }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- 4 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="宠物保险">
+            <span>{{ checkDetail.insure === '0' ? '未购保险' : '已购保险' }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="title-paragraph">
+        <span class="title-text">宠主信息</span>
+      </div>
+      <!-- 1 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="宠主姓名">
+            <span>{{ checkDetail.nickname }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="用户ID">
+            <span>{{ checkDetail.ownersId || '-' }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="手机号">
+            <span>{{ checkDetail.phonenumber }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="title-paragraph">
+        <span class="title-text">治疗进度</span>
+      </div>
+      <!-- 步骤条 -->
+      <div>
+        <el-steps :active="schedule" align-center>
+          <el-step title="开具处方单" :description="checkDetail.createTime" />
+          <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />
+          <el-step title="预约检查" :description="checkDetail.checkStartTime || '暂未预约'" />
+          <el-step title="检查获取报告" :description="checkDetail.reportTime || '暂未检查'" />
+        </el-steps>
+      </div>
+      <div class="title-paragraph">
+        <span class="title-text">缴费信息</span>
+      </div>
+      <!-- 缴费信息 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="缴费金额">
+            <span>{{ checkDetail.payAmount }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="缴费方式">
+            <span>-</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="缴费时间">
+            <span>{{ checkDetail.payTime }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="title-paragraph" style="white-space: nowrap;">
+        <span class="title-text">分配信息</span>
+      </div>
+      <!-- 预约信息 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="检查类型">
+            <span>{{ checkDetail.checkType === '0' ? '医院自有服务' : '预约外部服务' }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="设备服务费用">
+            <span>{{ checkDetail.devicePrice }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="下单时间">
+            <span>{{ checkDetail.appointTime || '-' }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="checkDetail.checkSchedule < 2" style="position: relative;left: 42px;">
+        <el-col :span="8">
+          暂未预约
+        </el-col>
+      </el-row>
+      <div>
+        <div style="display: flex;align-items: center;">
+          <div class="tip1" />
+          <div class="title-text">治疗信息</div>
+          <div style="margin-left: auto;padding-right: 50px">
+            <el-button class="fourWordsBtn" >上传日志</el-button>
+          </div>
+        </div>
+        <!-- 检查信息 -->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="治疗类型">
+              <span>{{ checkDetail.checkItemsName || '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="治疗项目">
+              <span v-show="checkDetail.checkSchedule < 3">未检查</span>
+              <span v-show="checkDetail.checkSchedule === 3">已检查</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="治疗状态">
+              <span>{{ checkDetail.deviceName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 2 -->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="日志上传时间">
+              <span>{{ checkDetail.checkStartTime }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="治疗日志">
+              <span>{{ checkDetail.reportTime || '暂未上传' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <div style="padding-left: 10px">
+      <el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TreatmentDetail',
+  data() {
+    return {
+      checkDetail: {},
+      schedule: 1
+    }
+  },
+  created() {
+    const detail = this.$route.query.detail
+    this.checkDetail = detail
+    this.schedule = parseInt(this.checkDetail.checkSchedule) + 1
+    console.log('传过来的详情信息', detail)
+  },
+  methods: {
+    // 点击 预约信息-立即预约
+    bookNow() {
+      this.$router.push({
+        name: 'CheckSubscribe',
+        query: { subscribe: this.checkDetail }
+      })
+    },
+    // 返回上一页
+    goBack() {
+      this.$router.push({
+        name: 'TreatmentManagement'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.title-paragraph {
+  margin-bottom: 20px;
+  border-left: 5px solid #5FB54B;
+
+  .title-text {
+    padding-left: 10px;
+  }
+}
+.title-text {
+  padding-left: 10px;
+}
+</style>
+<style scoped lang="scss">
+.app-container {
+  background-color: #FFFFFF;
+
+}
+.tip1{
+  height: 20px;
+  border-left: 5px solid #5bb647;
+}
+</style>

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

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