Skip to content

P
pet-business-web
Commit c4ec70d9 authored by v_liuhuaizhi's avatar v_liuhuaizhi
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents aa81961c 3bbb8d0e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2643 additions and 917 deletions
src/api/business/register.js
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -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/document-management/entry-contract/entry-contract.vue
View file @ c4ec70d9
......@@ -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/use-management/use-management.vue
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -3,23 +3,23 @@
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
<el-form-item prop="petNickname">
<el-input
v-model="queryParams.name"
v-model="queryParams.petNickname"
placeholder="宠物昵称/宠主姓名"
clearable
/>
</el-form-item>
<el-form-item prop="petWeight">
<el-select v-model="queryParams.petNickname" clearable placeholder="检查类型">
<el-form-item prop="checkType">
<el-select v-model="queryParams.checkType" clearable placeholder="检查类型">
<el-option
v-for="item in dict.type.exam_type"
v-for="item in checkTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="petColor">
<el-select v-model="queryParams.petNickname" clearable placeholder="检查项目">
<el-form-item prop="checkName">
<el-select v-model="queryParams.checkName" clearable placeholder="检查项目">
<el-option
v-for="item in options"
:key="item.value"
......@@ -28,10 +28,10 @@
/>
</el-select>
</el-form-item>
<el-form-item prop="checkSchedule">
<el-select v-model="queryParams.petNickname" clearable placeholder="检查状态">
<el-form-item>
<el-select v-model="queryParams.checkSchedule" clearable placeholder="检查状态">
<el-option
v-for="item in options"
v-for="item in checkStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -40,18 +40,18 @@
</el-form-item>
<el-form-item prop="payAmount">
<el-date-picker
v-model="queryParams.petNickname"
v-model="queryParams.payAmount"
type="date"
placeholder="请选择检查时间"
/>
</el-form-item>
<el-form-item prop="shadowReport">
<el-select v-model="queryParams.petNickname" clearable placeholder="请选择排序方式">
<el-form-item>
<el-select v-model="sortColumn" clearable placeholder="请选择排序方式" @change="handleSort">
<el-option
v-for="item in options"
:key="item.value"
v-for="item in sortList"
:key="item.id"
:label="item.label"
:value="item.value"
:value="item"
/>
</el-select>
</el-form-item>
......@@ -123,8 +123,8 @@
</el-table-column>
<el-table-column label="检查状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope">
<span v-show="scope.row.checkSchedule < 3">未检查</span>
<span v-show="scope.row.checkSchedule === 3">已检查</span>
<span v-show="scope.row.checkSchedule !== '3'">未检查</span>
<span v-show="scope.row.checkSchedule === '3'">已检查</span>
</template>
</el-table-column>
<el-table-column label="检查日期" align="center" :show-overflow-tooltip="true" prop="reportTime">
......@@ -169,7 +169,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="设备" prop="registId">
<el-select v-model="form.shebei" clearable placeholder="请选择设备">
<el-select v-model="form.shebei" clearable placeholder="请选择设备" @change="changeDeviceName">
<el-option
v-for="item in dict.type.exam_type"
:key="item.value"
......@@ -198,13 +198,28 @@
<el-table
:data="deviceList"
style="width: 100%">
<el-table-column prop="date" align="left" label="设备名称" />
<el-table-column prop="date" align="left" label="检查日期" />
<el-table-column prop="date" align="left" label="检查时段" />
<el-table-column prop="date" align="left" label="剩余可预约" />
<el-table-column prop="deviceName" align="left" label="设备名称" />
<el-table-column prop="checkDate" align="left" label="检查日期" />
<el-table-column prop="checkTime" align="left" label="检查时段" />
<el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column prop="date" align="left" label="设备服务费" />
<el-table-column prop="date" align="left" label="操作" />
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<el-button
class="fourWordsBtn"
size="mini"
@click="handleSubscribeDevice(scope.row)"
>立即预约</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="deviceTotal>0"
:total="deviceTotal"
:page.sync="deviceQueryParams.pageNum"
:limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice"
/>
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
......@@ -215,7 +230,7 @@
<script>
import { getManage, delManage, addManage, updateManage, listCheckManage } from '@/api/business/manage'
import { listReservationDevice } from '@/api/business/device'
import { listDeviceAll, listReservationDevice } from '@/api/business/device'
export default {
name: 'MedicalRecordManagement',
......@@ -235,20 +250,57 @@ export default {
showSearch: true,
// 总条数
total: 0,
deviceTotal: 0,
// 业务管理-检查管理表格数据
manageList: [{}],
manageList: [],
// 是否显示弹出层
open: false,
sortColumn: '',
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
medicalRecordId: null,
petsId: null,
petOwnersId: null,
orderByColumn: null,
isAsc: null,
petNickname: null,
petBreed: null,
petSex: null
checkType: null,
checkSchedule: null
},
// 排序方式集合
sortList: [
{
id: 1,
collation: 'desc',
label: '按检查日期倒序',
column: 'c.check_start_time'
},
{
id: 2,
collation: 'asc',
label: '按检查日期正序',
column: 'c.check_start_time'
}
],
// 检查状态
checkStatusOptions: [
{
value: '',
label: '全部'
},
{
value: '0',
label: '已检查'
},
{
value: '1',
label: '未检查'
}
],
deviceQueryParams: {
pageNum: 1,
pageSize: 10,
reservationTime: null,
isPrivate: null
},
// 表单参数
form: {},
......@@ -256,22 +308,45 @@ export default {
rules: {
},
// 设备集合
deviceList: []
deviceList: [],
// 检查类型列表
checkTypeOptions: [
{
value: '',
label: '全部'
},
{
value: '0',
label: '医院自有服务'
},
{
value: '2',
label: '预约外部服务'
}
]
}
},
created() {
this.getList()
this.getAllDevice()
},
methods: {
/** 查询业务管理-检查管理列表 */
getList() {
this.loading = true
console.log('检查状态', typeof this.queryParams.checkSchedule)
listCheckManage(this.queryParams).then(response => {
this.manageList = response.rows
this.total = response.total
this.loading = false
})
},
/** 获取所有设备用于设备下拉 */
getAllDevice() {
listDeviceAll().then(res => {
console.log('设备下拉框', res)
})
},
// 取消按钮
cancel() {
this.open = false
......@@ -283,16 +358,20 @@ export default {
name: 'CheckItem'
})
},
// 设备选择下拉框触发
changeDeviceName() {
},
// 选择排序方式触发的回调函数
handleSort(val) {
console.log('handleSort', val)
this.queryParams.isAsc = val.collation
this.queryParams.orderByColumn = val.column
},
// 表单重置
reset() {
this.form = {
id: null,
petsId: null,
petOwnersId: null,
petNickname: null,
petBreed: null,
petSex: null,
petAge: null
checkType: null
}
this.resetForm('form')
},
......@@ -305,17 +384,34 @@ export default {
handleSubscribe(row) {
this.open = true
console.log('点击立即预约', row)
// 设置检查类型
if (row.checkType === '2') {
this.deviceQueryParams.isPrivate = '0'
} else if (row.checkType === '0') {
this.deviceQueryParams.isPrivate = '1'
}
// 设置检查项目id
this.getDevice()
},
/** 对话框立即预约设备 */
handleSubscribeDevice() {
},
/** 获取设备列表 */
getDevice() {
listReservationDevice({ reservationTime: '2023-06-15' }).then(res => {
this.deviceQueryParams.reservationTime = '2023-06-15'
listReservationDevice(this.deviceQueryParams).then(res => {
console.log('设备', res)
this.deviceList = res.rows.table
this.deviceTotal = res.total
})
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.sortColumn = ''
this.queryParams.orderByColumn = ''
this.queryParams.isAsc = ''
this.queryParams.checkSchedule = ''
this.handleQuery()
},
// 多选框选中数据
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -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
View file @ c4ec70d9
......@@ -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 0 → 100644
View file @ c4ec70d9
<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 0 → 100644
View file @ c4ec70d9
<template>
<div>11</div>
</template>
<script>
export default {
name: 'TreatmentSubscribe'
}
</script>
<style scoped>
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment