Merge remote-tracking branch 'origin/master'

src/api/business/mdeicalRecord.js

+import request from '@/utils/request'
+
+// 查询病例详情
+export function getRecord(id) {
+  return request({
+    url: '/business/record/' + id,
+    method: 'get'
+  })
+}
+// 根据检查类型查询检查项目
+export function listByType(params) {
+  return request({
+    url: '/business/item/listByType',
+    method: 'get',
+    params
+  })
+}
+// 根据宠物id查询检查信息列表
+export function checkList(params) {
+  return request({
+    url: '/business/check/list',
+    method: 'get',
+    params
+  })
+}
+// 查询治疗项目
+export function getTreatOptions(params) {
+  return request({
+    url: '/business/item/list',
+    method: 'get',
+    params
+  })
+}
+export function deleteCheck(id) {
+  return request({
+    url: '/business/check/' + id,
+    method: 'delete'
+  })
+}
+// 新增检查
+export function addCheck(data) {
+  return request({
+    url: '/business/check',
+    method: 'post',
+    data
+  })
+}
+// 编辑检查
+export function updateCheck(data) {
+  return request({
+    url: '/business/check',
+    method: 'put',
+    data
+  })
+}
+// 新增治疗
+export function addTreat(data) {
+  return request({
+    url: '/business/treat',
+    method: 'post',
+    data
+  })
+}
+// 编辑治疗
+export function updateTreat(data) {
+  return request({
+    url: '/business/treat',
+    method: 'put',
+    data
+  })
+}
+export function deleteTreat(id) {
+  return request({
+    url: '/business/treat/' + id,
+    method: 'delete'
+  })
+}

src/api/business/register.js

@@ -51,4 +51,22 @@ export function timeRegister(params) {
     params: params
   })
 }
+// 打开开具处方
+export function queryPrescribing(data) {
+  return request({
+    url: '/business/record/prescribing',
+    method: 'post',
+    data: data
+  })
+}
 
+/**
+ * 检查宠物是否有重复
+ */
+export function checkPet(data) {
+  return request({
+    url: '/business/register/checkPet',
+    method: 'post',
+    data: data
+  })
+}

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/assets/styles/element-ui.scss

@@ -431,3 +431,10 @@ input::-webkit-input-placeholder {
   color: #5FB54B;
   cursor: pointer;
 }
+.el-input-number .el-input input {
+  text-align: center;
+}
+.el-cascader{
+  color: #5FB54B;
+}
+

src/main.js

@@ -90,8 +90,9 @@ function render(props = {}) {
     store.commit('SET_TOKEN', temp.token)
     store.commit('SET_ROLES', temp.roles)
     store.commit('SET_PERMISSIONS', temp.permissions)
-    store.commit('SET_NAME', temp.userName)
+    store.commit('SET_NAME', temp.name)
     store.commit('SET_AVATAR', temp.avatar)
+    store.commit('SET_DEPTID', temp.deptId)
   }
 
   instance = new Vue({

src/router/index.js

@@ -133,6 +133,13 @@ export const constantRoutes = [
         name: 'EquipmentAdd',
         meta: { title: '设备新增' }
       },
+      {
+        path: 'equipment-check',
+        props: true,
+        component: () => import('@/views/equipment-management/equipment-management/equipment-check'),
+        name: 'EquipmentCheck',
+        meta: { title: '检查项目' }
+      },
 
       {
         path: 'use-management',

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  deptId: state => state.user.deptId,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -7,7 +7,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    deptId: ''
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
     }
   },
 
@@ -59,6 +63,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.userName)
+          commit('SET_DEPTID', user.deptId)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

src/views/document-management/entry-contract/entry-contract.vue

@@ -79,8 +79,8 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="getContract"
       style="margin: 0 50px 0 0"
+      @pagination="getContract"
     />
   </div>
 </template>

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

@@ -8,7 +8,7 @@
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
-              <span class="title-text">基本信息</span>
+              <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">基本信息</div>
             </div>
             <!--            1-->
             <el-row>
@@ -23,8 +23,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="医院是否自有设备" prop="isPrivate">
-                  <el-select v-model="form.isPrivate" style="width: 250px">
+                <el-form-item label="医院自有设备" prop="isPrivate">
+                  <el-select v-model="form.isPrivate" style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
                       v-for="index in optionss"
                       :key="index"
@@ -48,8 +48,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="设备类型" prop="deviceType">
-                  <el-select v-model="form.deviceType" style="width: 250px">
+                <el-form-item label="设备类型">
+                  <el-select v-model="form.deviceType" style="width: 250px" placeholder="请选择设备类型">
                     <el-option
                       v-for="(item,index) in dict.type.device_type"
                       :key="index"
@@ -69,7 +69,7 @@
                     v-model="form.selectedOptions"
                     size="large"
                     :options="cityOptions"
-                    placeholder="请选择地区"
+                    placeholder="请选择服务地点"
                     expand-trigger="hover"
                     clearable
                     style="width: 250px"
@@ -89,15 +89,15 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
               <el-col :span="8">
-                <el-form-item label="单位时段服务数">
-                  <el-input
+                <el-form-item label="单位时段服务数" prop="useNum">
+                  <el-input-number
                     v-model.trim="form.useNum"
-                    style="width: 250px"
-                    placeholder="请输入单位时段服务数"
-                    clearable
+                    controls-position="right"
+                    style="width: 220px"
+                    @blur="handleBlur"
                   />
+                  <span style="margin-left: 15px">{{ "次" }}</span>
                 </el-form-item>
               </el-col>
 
@@ -122,7 +122,7 @@
                     v-model="form.ams"
                     style="width: 250px"
                     is-range
-                    placeholder="开始时间"
+                    placeholder="请选择上午开始时间"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -139,7 +139,7 @@
                     v-model="form.ame"
                     style="width: 250px"
                     is-range
-                    placeholder="结束时间"
+                    placeholder="请选择上午结束时间"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -161,7 +161,7 @@
                     v-model="form.pms"
                     style="width: 250px"
                     is-range
-                    placeholder="开始时间"
+                    placeholder="请选择下午开始时间"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -178,7 +178,7 @@
                     v-model="form.pme"
                     style="width: 250px"
                     is-range
-                    placeholder="结束时间"
+                    placeholder="请选择下午结束时间"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -195,11 +195,19 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="权重" prop="sort">
-                  <el-input-number v-model.trim="form.sort" :min="0" :max="9999" style="width: 250px" @blur="handleBlur" />
+                  <el-input-number
+                    v-model.trim="form.sort"
+                    controls-position="right"
+                    :min="0"
+                    :max="9999"
+                    style="width: 250px"
+                    @blur="handleBlur"
+                  />
                 </el-form-item>
               </el-col>
+
               <el-col :span="8">
-                <el-form-item label="创建时间">
+                <el-form-item label="创建日期">
                   <span>{{ form.createTime || "-" }}</span>
                 </el-form-item>
 
@@ -225,7 +233,7 @@
                     <el-input
                       v-model.trim="form.remark"
                       type="textarea"
-                      placeholder="请输入备注"
+                      placeholder="请输入备注（2~200字）"
                       maxlength="200"
                       style="width:1050px;"
                       :rows="4"
@@ -238,12 +246,12 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区" prop="serviceArea">
-                  <el-select v-model="form.serviceArea" multiple placeholder="请选择" style="width: 300px">
+                  <el-select v-model="form.serviceArea" multiple placeholder="请选择支持服务地区" style="width: 300px">
                     <el-option
-                      v-for="item in serviceAreaList"
-                      :key="item.label"
-                      :label="item.label"
-                      :value="item.value"
+                      v-for="dict in dict.type.service_area"
+                      :key="dict.label"
+                      :label="dict.label"
+                      :value="dict.value"
                     />
                   </el-select>
                 </el-form-item>
@@ -252,8 +260,8 @@
             <!--         9-->
             <el-row>
               <el-col>
-                <el-form-item label="支持检查类型" prop="checkType">
-                  <el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px">
+                <el-form-item label="支持检查项目" prop="checkType">
+                  <el-select v-model="form.checkType" multiple placeholder="请选择支持检查项目" style="width: 300px">
                     <el-option
                       v-for=" dict in dict.type.exam_type"
                       :key="dict.label"
@@ -285,7 +293,7 @@ import { getInfo } from '@/api/login'
 
 export default {
   name: 'EquipmentAdd',
-  dicts: ['device_status', 'device_type', 'exam_type', 'check_type'],
+  dicts: ['device_status', 'device_type', 'exam_type', 'check_type','service_area'],
 
   data() {
     return {
@@ -298,12 +306,13 @@ export default {
       // 是否医院自有设备
       option: [
         {
+          value: '0',
+          label: '否'
+
+        }, {
           value: '1',
           label: '是'
 
-        }, {
-          value: '0',
-          label: '否'
         }
       ],
       cityOptions: regionData,
@@ -341,20 +350,23 @@ export default {
         addressCode: [
           { required: true, message: '请选择服务地点', trigger: 'change,blur' }
         ],
+        useNum: [
+          { required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' }
+        ],
         address: [
-          { required: true, message: '请输入详细地址', trigger: 'blur' }
+          { required: true, message: '请输入服务地址', trigger: 'blur' }
         ],
         ams: [
-          { validator: this.validateMorningStart, trigger: 'blur' }
+          { required: true, validator: this.validateMorningStart, trigger: 'blur' }
         ],
         ame: [
-          { validator: this.validateMorningEnd, trigger: 'blur' }
+          { required: true, validator: this.validateMorningEnd, trigger: 'blur' }
         ],
         pms: [
-          { validator: this.validateAfternoonStart, trigger: 'blur' }
+          { required: true, validator: this.validateAfternoonStart, trigger: 'blur' }
         ],
         pme: [
-          { validator: this.validateAfternoonEnd, trigger: 'blur' }
+          { required: true, validator: this.validateAfternoonEnd, trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重', trigger: 'change' },
@@ -377,17 +389,21 @@ export default {
         ]
       },
       // 是否医院自有设备
-      optionss: [{
-        value: '0',
-        label: '否'
-      }, {
-        value: '1',
-        label: '是'
-      }],
+      optionss: [
+        {
+          value: '1',
+          label: '是'
+        },
+        {
+          value: '0',
+          label: '否'
+        }
+
+      ],
       // 预约方式
       options: [{
         value: '1',
-        label: '按时间选择'
+        label: '按时段预约'
       }
       //   {
       //   value: '2',
@@ -427,9 +443,11 @@ export default {
         useTime: '',
         // appointmentMethod: '',
         sort: 0,
+        isPrivate: '1',
         serviceArea: '',
         head: '',
         phone: '',
+        useNum: 0,
         deviceType: '',
         reservationMethod: '',
         status: '',
@@ -578,8 +596,9 @@ export default {
         this.form.addressCode = this.selectedOptions.join(',')
         console.log('xxaa', this.selectedOptions)
       }
-      // if (this.addtions.names != null) {
-      //   this.form.addressText = this.addtions.names
+      if (this.addtions.names != null) {
+        this.form.addressText = this.addtions.names
+      }
       //   this.form.city = this.city
       //   console.log('city', this.form.city)
       // }

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

@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="queryParams.checkTypeList" placeholder="请选择检查类型" multiple collapse-tags clearable>
+        <el-select v-model="queryParams.checkTypeList" placeholder="请选择检查项目" multiple collapse-tags clearable>
           <el-option
             v-for="dict in dict.type.exam_type"
             :key="dict.value"
@@ -102,9 +102,15 @@
           @click="handleExport"
         >批量导出
         </el-button>
+        <el-button
+          class="fourWordsBtn"
+          icon="el-icon-download"
+          size="mini"
+          @click="checkItem()"
+        >检查项目</el-button>
       </el-col>
       <el-col :span="12" style="padding-bottom: 20px;text-align: end;">
-        <el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <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-col>
     </el-row>
@@ -119,7 +125,7 @@
           <span>{{ scope.row.head || "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="手机号" align="center" prop="phone">
+      <el-table-column label="手机号" align="center" prop="phone" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.phone || "-" }}</span>
         </template>
@@ -135,19 +141,32 @@
           <span v-else-if="scope.row.isPrivate === '0'">否</span>
         </template>
       </el-table-column>
-      <el-table-column label="服务地点" align="center" prop="reservationMethod" show-overflow-tooltip />
-      <el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice">
+      <el-table-column label="服务地点" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+
+          <span>{{ scope.row.addressText + scope.row.address || "-" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="预约方式" align="center" prop="reservationMethod" show-overflow-tooltip >
+        <template slot-scope="scope">
+          <span>{{ scope.row.reservationMethod == 1 ? "按时段预约"  :"-" }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice" >
         <template slot-scope="scope">
-          <span>{{ scope.row.orderPrice || "-" }}</span>
+          <span>{{(scope.row.orderPrice == "" ||scope.row.orderPrice==null)? "-" :scope.row.orderPrice +"元"}}</span>
+<!--          <span>{{ scope.row.orderPrice +"元" || "-" }}</span>-->
         </template>
       </el-table-column>
 
       <el-table-column label="设备服务费" align="center" prop="servicePrice">
         <template slot-scope="scope">
-          <span>{{ scope.row.servicePrice || "-" }}</span>
+          <span>{{(scope.row.servicePrice == "" ||scope.row.servicePrice==null)? "-" :scope.row.servicePrice +"元"}}</span>
+<!--          <span>{{ scope.row.servicePrice +"元"|| "-" }}</span>-->
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip>
+      <el-table-column label="创建日期" align="center" prop="createTime" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ replace(scope.row.createTime) || '-' }}</span>
         </template>
@@ -168,11 +187,7 @@
             style="color: #DB4747;"
           >{{ showStatus(scope.row.status) || '-' }}</span>
         </template>
-        <!--        <template slot-scope="scope">-->
-        <!--          <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
-        <!--            {{ showStatus(scope.row.status)||'-' }}-->
-        <!--          </span>-->
-        <!--        </template>-->
+
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -242,12 +257,6 @@ export default {
         pme: null
       },
       sortedList: [
-        {
-          id: 2,
-          collation: 'desc',
-          sortedColumn: '按创建时间降序',
-          nameColumn: 'e.create_time'
-        },
         {
           id: 1,
           collation: 'asc',
@@ -255,21 +264,32 @@ export default {
           nameColumn: 'e.create_time'
         },
         {
-          id: 4,
+          id: 2,
           collation: 'desc',
-          sortedColumn: '按服务价格降序',
-          nameColumn: 'e.service_price'
+          sortedColumn: '按创建时间倒序',
+          nameColumn: 'e.create_time'
         },
         {
           id: 3,
           collation: 'asc',
           sortedColumn: '按服务价格升序',
           nameColumn: 'e.service_price'
+
+        },
+        {
+          id: 4,
+          collation: 'desc',
+          sortedColumn: '按服务价格倒序',
+          nameColumn: 'e.service_price'
+
         }
       ],
 
       // 是否医院自有设备
       option: [
+        {
+          label: '全部'
+        },
         {
           value: '1',
           label: '是'
@@ -277,10 +297,8 @@ export default {
         }, {
           value: '0',
           label: '否'
-        },
-        {
-          label: '全部'
         }
+
       ],
       // 预约方式
       options: [{
@@ -437,7 +455,7 @@ export default {
       } else if (date === '2') {
         return '• 维护中'
       } else if (date === '3') {
-        return '• 已报废'
+        return '• 设备下架'
       }
     },
 
@@ -481,6 +499,12 @@ export default {
         this.loading = false
       })
     },
+    // 点击检查项目
+    checkItem() {
+      this.$router.push({
+        name: 'CheckItem'
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false

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

@@ -83,7 +83,7 @@
       <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>
@@ -91,28 +91,56 @@
     <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/medical-record-management/check-detail.vue

@@ -35,7 +35,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="宠物性别">
-            <span>{{ checkDetail.petSex === '0' ? '公' : (checkDetail.petSex === '1' ? '母' : '未知')}}</span>
+            <span>{{ checkDetail.petSex === '0' ? '公' : (checkDetail.petSex === '1' ? '母' : '未知') }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物体重">
-            <span>{{ checkDetail.petWeight + 'kg'}}</span>
+            <span>{{ checkDetail.petWeight + 'kg' }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -160,7 +160,7 @@
         <div class="title-paragraph">
           <span class="title-text">检查信息</span>
         </div>
-        <el-button class="fourWordsBtn" v-show="checkDetail.checkSchedule >=2 && checkDetail.reportTime === null">上传报告</el-button>
+        <el-button v-show="checkDetail.checkSchedule >=2 && checkDetail.reportTime === null" class="fourWordsBtn">上传报告</el-button>
         <!-- 检查信息 -->
         <el-row>
           <el-col :span="8">

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

@@ -212,7 +212,7 @@
               class="fourWordsBtn"
               size="mini"
               @click="handleSubscribeDevice(scope.row)"
-            >立即预约</el-button>
+            ></el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -95,6 +95,9 @@ export default {
   },
   data() {
     return {
+      chooseForm: {
+        petStatus: ''
+      },
       // 选中数据
       chooseData: {},
       // 总条数
@@ -147,6 +150,7 @@ export default {
     choosePet() {
       this.$emit('petChoose', this.chooseData)
       this.$emit('petModleClose', false)
+      this.form.petStatus = '1'
     },
     closeModle() {
       this.$emit('petModleClose', false)

src/views/service-management/registration-queue/components/doctor-card.vue

@@ -5,7 +5,7 @@
     <div v-if="docList.length>0" class="doctor-card">
       <!--标签-->
       <div class="progress-tip">
-        <div class="tip-green"/>
+        <div class="tip-green" />
         <div
           class="tip-content"
         >挂号信息
@@ -53,7 +53,7 @@
               </div>
             </div>
             <!--分割线-->
-            <div class="divider"/>
+            <div class="divider" />
             <!--卡片中间部分-->
             <div class="mid-bottom-framework">
               <div
@@ -111,7 +111,7 @@
             >
               <div class="detail" @click="doctorDetail(item.id)">
                 <div class="detail-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/>
+                  <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')" />
                 </div>
                 <el-button
                   type="text"
@@ -121,14 +121,14 @@
               <!--给它传一个userId,一个类型和一个默认页数-->
               <div class="register" @click="registration(item.userId,'0',item)">
                 <div class="register-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')"/>
+                  <el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')" />
                 </div>
                 <el-button type="text">挂号</el-button>
               </div>
               <!--给它传一个userId,一个类型和一个默认页数-->
               <div class="add" @click="registration(item.userId, '1',item)">
                 <div class="add-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/>
+                  <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
                 </div>
                 <el-button type="text">加号</el-button>
               </div>
@@ -137,7 +137,27 @@
         </el-card>
       </div>
     </div>
-    <div v-else>-</div>
+    <div v-else class="doctor-card">
+      <!--标签-->
+      <div class="progress-tip">
+        <div class="tip-green" />
+        <div
+          class="tip-content"
+        >挂号信息
+        </div>
+      </div>
+      <!-- 详细内容-->
+      <div>
+        <div style=" margin: 20px; height: 200px; border: 1px solid #d6d7d7;">
+          <div style="margin-left:45%;margin-top: 5%;">
+            <div style=" width:50px;height: 50px;">
+              <el-image :src="require('@/assets/register/zanwushuju.png')" />
+            </div>
+            <div style="color: #b2b2b2">暂无数据</div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 

src/views/service-management/registration-queue/components/register-modle.vue

@@ -38,7 +38,11 @@
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column align="center" label="日期" min-width="80" prop="workDate" show-overflow-tooltip />
+      <el-table-column align="center" label="日期" min-width="80" prop="workDate" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.workDate, '{y}/{m}/{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="时段" min-width="80" prop="hours" show-overflow-tooltip />
       <el-table-column align="center" label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip />
       <el-table-column align="center" label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip />
@@ -77,7 +81,7 @@
 </template>
 
 <script>
-import { timeRegister } from '@/api/business/register'
+import { addRegister, timeRegister } from '@/api/business/register'
 
 export default {
   name: 'RegisterModle',
@@ -98,6 +102,14 @@ export default {
     doctorForm: {
       type: Object
     },
+    // 医生选择
+    doctorChoose: {
+      type: Object
+    },
+    // 宠物选择
+    petChoose: {
+      type: Object
+    },
     singleDoctor: {
       type: Object
     }
@@ -154,65 +166,65 @@ export default {
       console.log('这是弹窗本身的行信息：', data)
       console.log('这是宠物宠主本身的信息：', this.doctorForm)
       console.log('这是当日挂号列表信息 ：', this.singleDoctor)
-      data.visitWay = '0'
-      data.visitFirstTime = ''
-      data.payStatus = '0'
-      data.petPicture = ''
       // 进度
-      data.checkSchedule = '0'
-      data.payAmount = ''
-      data.payType = '0'
       const temp = {
         type: this.registrationType,
         // 宠物宠主本身的信息
-        petsId: this.doctorForm.petsId,
-        petOwnersId: this.doctorForm.ownersId,
+        petsId: null,
+        petType: this.doctorForm.petStatus,
+        petOwnersId: this.doctorForm.ownerId,
+        ownersId: this.doctorForm.ownersId,
         petOwnersName: this.doctorForm.nickName,
         petOwnersPhone: this.doctorForm.phoneNumber,
         petNickname: this.doctorForm.petNickname,
         petBreed: this.doctorForm.petBreed,
         petSex: this.doctorForm.petSex,
-        petAge: this.doctorForm.petBrithday,
+        petBirthday: this.doctorForm.petBirthday.replaceAll('-', '/'),
         petWeight: this.doctorForm.petWeight,
         petColor: this.doctorForm.petColor,
         sterilizationStatus: this.doctorForm.sterilizationStatus,
         vaccineSituation: this.doctorForm.vaccineSituation,
         insure: this.doctorForm.insure,
         // 进度
-        checkSchedule: data.checkSchedule,
-        payAmount: data.payAmount,
-        payType: data.payType,
-        visitDateTime: this.doctorForm.visitDateTime,
+        checkSchedule: '0',
+        payAmount: null,
+        payType: '0',
         // 这是当日挂号列表信息
         doctorId: this.singleDoctor.doctorCode,
         userId: this.singleDoctor.userId,
         doctorName: this.singleDoctor.doctorName,
         hospitalId: this.singleDoctor.deptId,
-        hospitalName: this.singleDoctor.deptName,
         hospitalDepartmentId: this.singleDoctor.departmentId,
         hospitalDepartmentName: this.singleDoctor.departmentName,
         doctorPhone: this.singleDoctor.doctorPhone,
         // 给传0
-        visitWay: data.visitWay,
+        visitWay: '0',
         // 下拉传值
         firstVisit: this.queryParams.firstVisit,
         visitDate: data.workDate,
         visitTime: data.hours,
-
         scheduleId: data.scheduleId,
         // 拼接 (日期+时间段的第一个时间)
-        visitFirstTime: data.visitFirstTime,
+        visitFirstTime: data.workDate.replaceAll('/', '-') + ' ' + data.hours.split('~')[0],
         // 默认是0代缴费
-        payStatus: data.payStatus,
+        payStatus: '0',
         // 给传个null
-        petPicture: data.petPicture,
+        petPicture: null,
 
         doctorSignatureUrl: this.singleDoctor.doctorSignatureUrl,
         visitLocation: this.singleDoctor.visitLocation,
         doctorTitleLabel: this.singleDoctor.doctorTitleValue
       }
       console.log('终极大表', temp)
+      addRegister(temp).then(response => {
+        this.$message({
+          type: 'success',
+          message: '预约成功!'
+        })
+        this.$emit('registerModleClose', false)
+      })
     },
+
     submit() {
     },
     /** 关闭弹窗*/

src/views/service-management/registration-queue/registration-queue.vue

@@ -157,8 +157,7 @@
               style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
               type="warning"
               @click="handleDetail(scope.row, 'enter')"
-            >
-            </el-button>
+            />
           </template>
         </el-table-column>
       </el-table>
@@ -281,7 +280,7 @@
 </template>
 
 <script>
-import { listRegister, getRegister, delRegister, addRegister, updateRegister } from '@/api/business/register'
+import { listRegister, getRegister, delRegister, addRegister, updateRegister, checkPet } from '@/api/business/register'
 import { listAllArticle } from '@/api/business/article'
 
 export default {
@@ -602,9 +601,27 @@ export default {
       this.reset()
       // TODO: 请清除该行输出
       console.log(`row`, row)
-      this.$router.push({
-        name: 'RegistrationDetail', params: { id: row.id, type }
-      })
+      if (type === 'detail') {
+        this.$router.push({
+          name: 'RegistrationDetail', params: { id: row.id, type }
+        })
+      } else {
+        // 进入挂号页面先获取是否有重复的宠物数据
+        checkPet(row).then(({ msg }) => {
+          if (msg) {
+            this.$modal.confirm('当前宠物已经存在是否覆盖数据')
+              .then(_ => {
+                this.$router.push({
+                  name: 'RegistrationDetail', params: { id: row.id, type }
+                })
+              })
+          } else {
+            this.$router.push({
+              name: 'RegistrationDetail', params: { id: row.id, type }
+            })
+          }
+        })
+      }
     }
 
   }

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

 <template>
-<div>33</div>
+  <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'
+  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 scoped>
+<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>