Skip to content

P
pet-business-web
Commit 2c44b00c authored by 王飞龙's avatar 王飞龙
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b6a6c3d2 ddfbec1d
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 53 deletions
src/api/business/register.js
View file @ 2c44b00c
......@@ -16,6 +16,13 @@ export function getRegister(id) {
method: 'get'
})
}
// 查询挂号详细--录入诊断
export function inputDiagnosis(id) {
return request({
url: '/business/register/inputDiagnosis/' + id,
method: 'get'
})
}
// 新增挂号
export function addRegister(data) {
......
src/views/medical-record-management/medical-edit.vue
View file @ 2c44b00c
......@@ -879,14 +879,14 @@ export default {
},
data() {
return {
// 进度
scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
// 宠物出生日期校验
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now()
}
},
// 进度
scheduleKey: {},
checkItemOptions: [], // 项目选项列表 根据检查类型变化
treatItemOptions: [], // 治疗项目选项列表
checkManageBos: [], // 检查列表数据
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ 2c44b00c
......@@ -105,7 +105,7 @@ export default {
// 宠物表格数据
petsList: [],
// 遮罩层
loading: true,
loading: false,
// 查询参数
queryParams: {
// 导出列表
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 2c44b00c
<template>
<el-dialog
:before-close="closeModle"
:title="registrationType === 'usual' ? '挂号' : '加号'"
:title="registrationType === '0' ? '挂号' : '加号'"
:visible.sync="isShow"
append-to-body
class="register-modle"
......@@ -43,9 +43,9 @@
<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/>
<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 />
<el-table-column
align="center"
label="门诊诊查费"
......@@ -104,9 +104,9 @@ export default {
type: Number
},
// 当前页
currentPage: {
type: Number
},
// currentPage: {
// type: Number
// },
// 新增挂号宠物的所有信息
doctorForm: {
type: Object
......@@ -129,7 +129,7 @@ export default {
},
data() {
return {
// currentPage: 0,
currentPage: 0,
// 选中数组
ids: [],
// 总条数
......@@ -141,7 +141,7 @@ export default {
mainDoctor: '',
firstVisit: '0',
pageNum: 1,
pageSize: 2
pageSize: 10
},
fristVisitOptions: [
......@@ -165,6 +165,7 @@ export default {
created() {
// 获取当前时间
this.currentTime()
this.getRegisterMsg()
},
methods: {
/**
......@@ -192,9 +193,14 @@ export default {
return current.isBetween(startTime, endTime, 'minute')
},
parseTime,
// 获取相应id的医生详情
/**
* 获取医生当日排班列表
* currentPage默认值为0，是加号弹出框时的逻辑（registrationType = 1为加号）
* 在初次进入加号时currentPage字段保证后台返回当时页面
* 再次点击分页按钮后按照正常页面传值 currentPage被赋值大于0
* */
getRegisterMsg() {
console.log('HHHHHHHHHHHHHHHUUUUUUUUUUUUUUUUUU', this.doctorId, this.currentPage, this.registrationType)
console.log('getRegisterMsg', this.doctorId, this.currentPage, this.registrationType)
timeRegister({
userId: this.doctorId,
type: this.registrationType,
......@@ -206,7 +212,10 @@ export default {
this.petsList = response.rows.rows
console.log('这是预约数据：', this.petsList)
this.total = response.total
this.queryParams.pageNum = response.rows.currentPage
if (this.registrationType === '1' && this.currentPage === 0) {
this.queryParams.pageNum = response.rows.currentPage
this.currentPage = response.rows.currentPage
}
})
},
// 新增预约接口
......
src/views/service-management/registration-queue/components/schedule-info.vue
View file @ 2c44b00c
......@@ -109,7 +109,7 @@
</div>
</div>
</div>
</div>
</template>
<script>
......
src/views/service-management/registration-queue/registration-add.vue
View file @ 2c44b00c
......@@ -222,6 +222,7 @@
<doctor-detail :doctor-id="doctorId" :is-show="showDoctorModle" @doctorModleClose="closeDoctorModle" />
<!-- 挂号/加号弹出框-->
<register-modle
v-if="showRegistrationModle"
:current-page="currentPage"
:doctor-form="test"
:doctor-id="doctorIdNd"
......@@ -273,7 +274,7 @@ export default {
doctorId: '', // 医生id用来获取详情等信息(详情)
// 医生id用来获取详情等信息(挂号+加号)
doctorIdNd: 0,
petForm: '',
petForm: {},
registrationType: '0', // 挂号/加号
currentPage: 0,
isEdit: false, // 表单是否可编辑 默认不可编辑
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ 2c44b00c
......@@ -17,7 +17,7 @@ color: #333333;"
<!--宠物头像-->
<div style="display: flex">
<!-- 1-- 宠物基本信息的页面--标签头 -->
<div class="tip-green"/>
<div class="tip-green" />
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>宠物头像
......@@ -28,14 +28,14 @@ color: #333333;"
<div>
<!--宠物图片-->
<div class="petPicture" style="padding-bottom: 40px;">
<ImagePreview :height="150" :src="baseURL+detailInfo.petPicture" :width="150"/>
<ImagePreview :height="150" :src="baseURL+detailInfo.petPicture" :width="150" />
</div>
</div>
</div>
<!--基本信息-->
<div style="display: flex">
<!-- 1-- 宠物基本信息的页面--标签头 -->
<div class="tip-green"/>
<div class="tip-green" />
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>宠物信息
......@@ -50,19 +50,19 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称">
<el-input v-model="detailInfo.petNickname" disabled/>
<el-input v-model="detailInfo.petNickname" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<!--宠物ID-->
<el-form-item label="宠物ID">
<el-input v-model="detailInfo.petsId" disabled/>
<el-input v-model="detailInfo.petsId" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<!--宠物品种-->
<el-form-item label="宠物品种">
<el-input v-model="detailInfo.petBreed" disabled/>
<el-input v-model="detailInfo.petBreed" disabled />
</el-form-item>
</el-col>
</el-row>
......@@ -92,14 +92,14 @@ color: #333333;"
<el-col :span="8">
<!--宠物年龄-->
<el-form-item label="宠物年龄">
<el-input v-model="detailInfo.petAge" disabled/>
<el-input v-model="detailInfo.petAge" disabled />
岁
</el-form-item>
</el-col>
<el-col :span="8">
<!--宠物体重-->
<el-form-item label="宠物体重">
<el-input v-model="detailInfo.petWeight" disabled/>
<el-input v-model="detailInfo.petWeight" disabled />
kg
</el-form-item>
</el-col>
......@@ -108,7 +108,7 @@ color: #333333;"
<el-col :span="8">
<!--宠物毛色-->
<el-form-item label="宠物毛色">
<el-input v-model="detailInfo.petColor" disabled />
<el-input v-model="detailInfo.petColor" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -177,7 +177,7 @@ color: #333333;"
<!--主人信息-->
<div style="display: flex">
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>宠主信息
......@@ -188,17 +188,17 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="宠主姓名">
<el-input v-model="detailInfo.petOwnerBo.nickName" disabled />
<el-input v-model="detailInfo.petOwnerBo.nickName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号">
<el-input v-model="detailInfo.petOwnerBo.phoneNumber" disabled />
<el-input v-model="detailInfo.petOwnerBo.phoneNumber" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户ID">
<el-input v-model="detailInfo.petOwnerBo.ownersId" disabled />
<el-input v-model="detailInfo.petOwnerBo.ownersId" disabled/>
</el-form-item>
</el-col>
</el-row>
......@@ -236,7 +236,7 @@ color: #333333;"
</el-col>
<el-col :span="8">
<el-form-item label="会员卡余额">
<el-input v-model="detailInfo.petOwnerBo.cardBalance" disabled />
<el-input v-model="detailInfo.petOwnerBo.cardBalance" disabled/>
</el-form-item>
</el-col>
</el-row>
......@@ -255,19 +255,19 @@ color: #333333;"
<el-col :span="8">
<el-form-item label="绑定宠物数量">
<el-input v-model="detailInfo.petOwnerBo.petCount" disabled />
<el-input v-model="detailInfo.petOwnerBo.petCount" disabled/>
</el-form-item>
</el-col>
</el-row>
</div>
<!--进度信息-->
<schedule-info />
<schedule-info :schedule-key="scheduleKey"/>
<!--挂号信息-->
<div style="display: flex">
<!-- 1-- 挂号信息的页面--标签头 -->
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>挂号信息
......@@ -332,13 +332,13 @@ color: #333333;"
<el-col :span="8">
<!--就诊时段-->
<el-form-item label="就诊时段">
<el-input v-model="detailInfo.visitTime" disabled />
<el-input v-model="detailInfo.visitTime" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<!--门诊诊查费-->
<el-form-item label="门诊诊查费">
<el-input v-model="detailInfo.payAmount" disabled />
<el-input v-model="detailInfo.payAmount" disabled/>
元
</el-form-item>
</el-col>
......@@ -376,7 +376,7 @@ color: #333333;"
<div v-if="$route.params.type === 'enter'" class="visit-info">
<div style="display: flex">
<!-- 1-- 就诊信息的页面--标签头 -->
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>就诊信息
......@@ -390,7 +390,7 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="病历号">
<el-input v-model="detailInfo.medicalRecordNo" disabled />
<el-input v-model="detailInfo.medicalRecordNo" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -408,7 +408,7 @@ color: #333333;"
<el-col :span="8">
<!--是否首诊-->
<el-form-item label="就诊诊位">
<el-input v-model="detailInfo.visitLocation" disabled />
<el-input v-model="detailInfo.visitLocation" disabled/>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -433,7 +433,7 @@ color: #333333;"
</el-col>
<el-col :span="24">
<el-form-item label="诊断结果">
<el-input v-model="visitForm.diagnosisResult" maxlength="30" placeholder="请输入诊断结果" />
<el-input v-model="visitForm.diagnosisResult" maxlength="30" placeholder="请输入诊断结果"/>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -455,13 +455,15 @@ color: #333333;"
<!-- 开具处方弹出框-->
<prescribing-modle
:is-show="showPrescribing"
:visit-form="visitForm"
:register-form="openForm"
:visit-form="visitForm"
@prescrib-close="prescribClose"
/>
</div>
<!--底部返回按钮-->
<el-button v-if="$route.params.type === 'enter'" class="queryBtn" icon="el-icon-check" @click="submitForm">提 交</el-button>
<el-button v-if="$route.params.type === 'enter'" class="queryBtn" icon="el-icon-check" @click="submitForm">提
交
</el-button>
<el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
</el-form>
</div>
......@@ -472,7 +474,7 @@ color: #333333;"
// 导入获取宠物信息的接口
import { checkRole } from '@/utils/permission'
import { parseTime, selectDictLabel } from '@/utils/ruoyi'
import { getRegister, queryPrescribing } from '@/api/business/register'
import { getRegister, inputDiagnosis, queryPrescribing } from '@/api/business/register'
import scheduleInfo from '@/views/service-management/registration-queue/components/schedule-info'
import prescribingModle from '@/views/service-management/registration-queue/components/prescribing-modle'
......@@ -488,6 +490,8 @@ export default {
},
data() {
return {
// 进度
scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
// 挂号处方信息传值
openForm: {},
regiterForm: {},
......@@ -661,7 +665,7 @@ export default {
'diagnosisResult': this.visitForm.diagnosisResult,
'registTime': this.regiterForm.registrationTime,
'diagnosisTime': this.regiterForm.diagnosisTime,
'petBirthday': this.regiterForm.petBirthday,
'petBirthday': this.regiterForm.petBirthday
}
console.log('表单参数2333', temp)
......@@ -712,13 +716,45 @@ export default {
},
/** 获取宠物信息(传参传宠物表id)*/
getInfo(id) {
getRegister(id).then(response => {
console.log('录入诊断需要的信息', response)
this.detailInfo = { ...response.data }
// 挂号信息赋值
this.regiterForm = { ...this.detailInfo }
console.log('这是我进入处方需要的信息：', this.regiterForm)
})
if (this.$route.params.type !== 'enter') {
getRegister(id).then(response => {
console.log('录入诊断需要的信息', response)
this.detailInfo = { ...response.data }
// 挂号信息赋值
this.regiterForm = { ...this.detailInfo }
console.log('这是我进入处方需要的信息：', this.regiterForm)
// 主键
this.scheduleKey.checkSchedule = this.regiterForm.checkSchedule
// 挂号时间
this.scheduleKey.registrationTime = this.regiterForm.registrationTime
// 录入时间
this.scheduleKey.diagnosisTime = this.regiterForm.diagnosisTime
// 病历时间
this.scheduleKey.reportTime = this.regiterForm.reportTime
// 开具处方时间
this.scheduleKey.recipelTime = this.regiterForm.recipelTime
console.log('这是我要传的checkSchedule的值：值 挂号时间 录入时间 病历时间 开具处方时间', this.scheduleKey.registrationTime, this.scheduleKey.diagnosisTime, this.scheduleKey.reportTime, this.scheduleKey.recipelTime)
})
} else {
inputDiagnosis(id).then(response => {
console.log('录入诊断需要的信息', response)
this.detailInfo = { ...response.data }
// 挂号信息赋值
this.regiterForm = { ...this.detailInfo }
console.log('这是我进入处方需要的信息：', this.regiterForm)
// 主键
this.scheduleKey.checkSchedule = this.regiterForm.checkSchedule
// 挂号时间
this.scheduleKey.registrationTime = this.regiterForm.registrationTime
// 录入时间
this.scheduleKey.diagnosisTime = this.regiterForm.diagnosisTime
// 病历时间
this.scheduleKey.reportTime = this.regiterForm.reportTime
// 开具处方时间
this.scheduleKey.recipelTime = this.regiterForm.recipelTime
console.log('这是我要传的checkSchedule的值：值 挂号时间 录入时间 病历时间 开具处方时间', this.scheduleKey.registrationTime, this.scheduleKey.diagnosisTime, this.scheduleKey.reportTime, this.scheduleKey.recipelTime)
})
}
}
}
}
......@@ -845,9 +881,10 @@ export default {
::v-deep .el-textarea {
width: 90% !important;
}
.bottom-input-style{
.bottom-input-style {
//输入框样式
::v-deep .el-input__inner{
::v-deep .el-input__inner {
width: 400% !important;
}
}
......
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