Skip to content

P
pet-business-web
Commit 44e3a905 authored by 高滢's avatar 高滢
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 47229f0e 9ae9c095
Hide whitespace changes
Inline Side-by-side
Showing with 369 additions and 340 deletions
.env.development
View file @ 44e3a905
# 页面标题
VUE_APP_TITLE = 萌宠医院信息管理平台
VUE_APP_TITLE = 百邦萌宠医院管理系统
# 开发环境配置
ENV = 'development'
......
.env.edit
View file @ 44e3a905
# 开发使用的环境配置文件
# 页面标题
VUE_APP_TITLE = 萌宠医院信息管理平台
VUE_APP_TITLE = 百邦萌宠医院管理系统
# 生产环境配置
ENV = 'edit'
......
.env.production
View file @ 44e3a905
# 演示环境配置文件
# 页面标题
VUE_APP_TITLE = 萌宠医院信息管理平台
VUE_APP_TITLE = 百邦萌宠医院管理系统
# 生产环境配置
ENV = 'production'
......
.env.staging
View file @ 44e3a905
# 页面标题
VUE_APP_TITLE = 萌宠医院信息管理平台
VUE_APP_TITLE = 百邦萌宠医院管理系统
NODE_ENV = production
......
.env.test
View file @ 44e3a905
# 测试环境配置文件
# 页面标题
VUE_APP_TITLE = 萌宠医院信息管理平台
VUE_APP_TITLE = 百邦萌宠医院管理系统
# 生产环境配置
ENV = 'test'
......
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ 44e3a905
......@@ -365,11 +365,11 @@ export default {
rules: {
deviceName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' },
{ min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
{ min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
],
head: [
{ min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
{ min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
],
phone: [
{
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 44e3a905
......@@ -699,11 +699,11 @@ export default {
rules: {
deviceName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' },
{ min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
{ min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
],
head: [
{ min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
{ min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
],
phone: [
{
......@@ -795,21 +795,6 @@ export default {
serviceAreaS: [],
// 检查项目下拉框
checkItemOptions: [],
serviceAreaList: [
{
value: '1',
label: '天津市-天津市-和平区'
},
{
value: '2',
label: '北京市-北京市-大兴区'
},
{
value: '3',
label: '河北省-张家口市-阳原县'
}
],
serviceArea: [],
// 可用时段
useTime: {
......
src/views/medical-record-management/medical-edit.vue
View file @ 44e3a905
......@@ -56,50 +56,55 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称" prop="petNickname">
<el-input v-model="detailInfo.petNickname" :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petNickname" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<!--宠物ID-->
<el-form-item label="宠物ID" prop="petsId">
<el-input v-model="detailInfo.petsId" :placeholder="isEdit? '请输入宠物ID' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petsId" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<!--宠物品种-->
<el-form-item v-if="isEdit" class="petBreed" label="宠物品种" prop="petBreed">
<el-select
v-model="detailInfo.petBreedId"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请选择主品种' : '暂无数据'"
style="width: 100%"
@change="changePetBreedId"
>
<el-option
v-for="(item, index) in dict.type.pet_breed"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-select
v-model="detailInfo.petChildBreedId"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请选择子品种' : '暂无数据'"
style="width: 100%"
class="petChildBreed"
@change="changePetChildBreedId"
>
<el-option
v-for="(item, index) in petOptions[detailInfo.petBreedId]"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<div class="petBreed" style="display: flex" v-if="isEdit">
<el-form-item v-if="isEdit" class="petBreed" label="宠物品种" prop="petBreedId">
<el-select
v-model="detailInfo.petBreedId"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请选择主品种' : '暂无数据'"
style="width: 100%"
@change="changePetBreedId"
>
<el-option
v-for="(item, index) in dict.type.pet_breed"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="petChildBreedId" label-width="5px">
<el-select
v-model="detailInfo.petChildBreedId"
:disabled="!isEdit"
clearable
filterable
:placeholder="isEdit? '请选择子品种' : '暂无数据'"
style="width: 100%"
class="petChildBreed"
@change="changePetChildBreedId"
>
<el-option
v-for="(item, index) in petOptions[detailInfo.petBreedId]"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
<el-form-item v-else class="petBreed" label="宠物品种" prop="petBreed">
<el-input v-model="detailInfo.petBreed" :placeholder="isEdit? '请选择主品种' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petChildBreed" :placeholder="isEdit? '请选择分品种' : '暂无数据'" class="petChildBreed" disabled />
......@@ -149,7 +154,7 @@ color: #333333;"
<el-col :span="8">
<!--宠物体重-->
<el-form-item label="宠物体重" prop="petWeight">
<el-input v-model="detailInfo.petWeight" :placeholder="isEdit? '请输入宠物体重' : '暂无数据'" :disabled="!isEdit">
<el-input v-model="detailInfo.petWeight" :maxlength="10" :placeholder="isEdit? '请输入宠物体重' : '暂无数据'" :disabled="!isEdit">
<template #suffix>kg</template>
</el-input>
</el-form-item>
......@@ -159,7 +164,7 @@ color: #333333;"
<el-col :span="8">
<!--宠物毛色-->
<el-form-item label="宠物毛色" prop="petColor">
<el-input v-model="detailInfo.petColor" :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'" :disabled="!isEdit" />
<el-input v-model.trim="detailInfo.petColor" :maxlength="10" :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'" :disabled="!isEdit" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -235,17 +240,17 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="宠主姓名">
<el-input v-model="detailInfo.petOwnerBo.nickName" :placeholder="isEdit? '请输入宠主姓名' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petOwnerBo.nickName" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号">
<el-input v-model="detailInfo.petOwnerBo.phoneNumber" :placeholder="isEdit? '请输入手机号' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petOwnerBo.phoneNumber" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户ID">
<el-input v-model="detailInfo.petOwnerBo.ownersId" :placeholder="isEdit? '请输入用户ID' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petOwnerBo.ownersId" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
</el-row>
......@@ -257,7 +262,7 @@ color: #333333;"
v-model="detailInfo.petOwnerBo.createTime"
clearable
disabled
:placeholder="isEdit? '请选择创建日期' : '暂无数据'"
:placeholder="'暂无数据'"
type="date"
value-format="yyyy/MM/dd"
format="yyyy/MM/dd"
......@@ -271,7 +276,7 @@ color: #333333;"
v-model="detailInfo.petOwnerBo.membershipLevel"
clearable
disabled
:placeholder="isEdit? '请选择会员等级' : '暂无数据'"
:placeholder="'暂无数据'"
style="width: 100%"
>
<el-option
......@@ -285,7 +290,7 @@ color: #333333;"
</el-col>
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="会员卡余额">
<el-input v-model="detailInfo.petOwnerBo.cardBalance" :placeholder="isEdit? '请输入会员卡余额' : '暂无数据'" disabled>
<el-input v-model="detailInfo.petOwnerBo.cardBalance" :placeholder="'暂无数据'" disabled>
<template #suffix>元</template>
</el-input>
</el-form-item>
......@@ -294,7 +299,7 @@ color: #333333;"
<el-row v-if="deptLevel !== '1'">
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="状态">
<el-select v-model="detailInfo.petOwnerBo.status" :placeholder="isEdit? '请选择状态' : '暂无数据'" disabled>
<el-select v-model="detailInfo.petOwnerBo.status" :placeholder="'暂无数据'" disabled>
<el-option
v-for="({value, label}, index) in statusList"
:key="index"
......@@ -307,7 +312,7 @@ color: #333333;"
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="绑定宠物数量">
<el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="isEdit? '请输入绑定宠物数量' : '暂无数据'" disabled />
<el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
</el-row>
......@@ -324,32 +329,32 @@ color: #333333;"
<el-row :gutter="41">
<el-col :span="8">
<el-form-item label="医生姓名" prop="doctorName">
<el-input v-model="detailInfo.doctorName" :placeholder="isEdit? '请输入医生姓名' : '暂无数据'" disabled />
<el-input v-model="detailInfo.doctorName" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="医生ID" prop="doctorId">
<el-input v-model="detailInfo.doctorId" :placeholder="isEdit? '请输入医生ID' : '暂无数据'" disabled />
<el-input v-model="detailInfo.doctorId" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号" prop="doctorPhone">
<el-input v-model="detailInfo.doctorPhone" :placeholder="isEdit? '请输入手机号' : '暂无数据'" disabled />
<el-input v-model="detailInfo.doctorPhone" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属医院" prop="hospitalName">
<el-input v-model="detailInfo.hospitalName" :placeholder="isEdit? '请输入所属医院' : '暂无数据'" disabled />
<el-input v-model="detailInfo.hospitalName" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属科室" prop="hospitalDepartmentName">
<el-input v-model="detailInfo.hospitalDepartmentName" :placeholder="isEdit? '请输入所属科室' : '暂无数据'" disabled />
<el-input v-model="detailInfo.hospitalDepartmentName" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="医生职称" prop="doctorTitleLabel">
<el-input v-model="detailInfo.doctorTitleLabel" :placeholder="isEdit? '请输入医生职称' : '暂无数据'" disabled />
<el-input v-model="detailInfo.doctorTitleLabel" :placeholder="'暂无数据'" disabled />
</el-form-item>
</el-col>
</el-row>
......@@ -370,7 +375,7 @@ color: #333333;"
<el-form-item label="病历号">
<el-input
v-model="detailInfo.medicalRecordNo"
:placeholder="isEdit? '请输入病历号' : '暂无数据'"
:placeholder="'暂无数据'"
disabled
/>
</el-form-item>
......@@ -391,7 +396,7 @@ color: #333333;"
<el-col :span="8">
<!--是否首诊-->
<el-form-item label="就诊诊位">
<el-input v-model="detailInfo.visitLocation" placeholder="请输入就诊诊位" disabled />
<el-input v-model="detailInfo.visitLocation" placeholder="暂无数据" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -400,7 +405,7 @@ color: #333333;"
v-model="detailInfo.mainSuit"
:disabled="!isEdit"
maxlength="400"
:placeholder="isEdit? '请输入患者主诉' : '暂无数据'"
:placeholder="isEdit? '请输入主诉' : '暂无数据'"
type="textarea"
show-word-limit
style="width: 85% !important"
......@@ -413,7 +418,7 @@ color: #333333;"
v-model="detailInfo.doctorAdvice"
show-word-limit
:disabled="!isEdit"
maxlength="200"
maxlength="400"
:placeholder="isEdit? '请输入医嘱' : '暂无数据'"
type="textarea"
style="width: 85% !important"
......@@ -423,10 +428,10 @@ color: #333333;"
<el-col :span="24">
<el-form-item label="诊断结果" prop="diagnosisResult">
<el-input
v-model="detailInfo.diagnosisResult"
v-model.trim="detailInfo.diagnosisResult"
show-word-limit
:disabled="!isEdit"
maxlength="30"
maxlength="20"
:placeholder="isEdit? '请输入诊断结果' : '暂无数据'"
style="width: 85% !important"
/>
......@@ -530,7 +535,7 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.sallNum ? scope.row.sallNum + scope.row.sallUnit : '-' }}
{{ scope.row.sallNum ? scope.row.sallNum + scope.row.sallUnit : '-' }}
</span>
</template>
</el-table-column>
......@@ -885,7 +890,7 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.treatStartTime ? scope.row.treatStartTime : '-' }}
{{ scope.row.treatStartTime ? moment(scope.row.treatStartTime).format('YYYY/MM/DD') : '-' }}
</span>
</template>
</el-table-column>
......@@ -1163,10 +1168,10 @@ color: #333333;"
<el-col :span="24">
<el-form-item label="回访情况" prop="followContent">
<el-input
v-model="detailInfo.followContent"
v-model.trim="detailInfo.followContent"
:disabled="!isEdit || detailInfo.followTime"
maxlength="200"
show-word-limit
:placeholder="isEdit? '请输入回访情况' : '暂无数据'"
type="textarea"
style="width: 85% !important"
......@@ -1227,6 +1232,7 @@ import {
} from '@/api/business/mdeicalRecord'
import { mapGetters } from 'vuex'
import { addHospital, delHospital, listHospital, updateHospitalRecord } from '@/api/business/inHospital'
import moment from 'moment/moment'
export default {
name: 'MedicalEdit',
......@@ -1256,10 +1262,18 @@ export default {
petBirthday: [
{ required: true, message: '请选择宠物生日', trigger: 'blur' }
],
// 宠物父级品种非空校验
petBreedId: [
{ required: true, message: '请选择宠物品种', trigger: 'change' }
],
// 宠物子级品种非空校验
petChildBreedId: [
{ required: true, message: '请选择宠物子品种', trigger: 'change' }
],
// 宠物体重非空校验
petWeight: [
{ required: true, message: '请输入宠物体重', trigger: 'blur' },
{ pattern: /^\d+(\.\d+)?$/, message: '宠物体重必须是数字' }
{ pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '仅支持数字、小数点（保留两位小数）', trigger: 'blur' }
],
// 绝育情况非空校验
sterilizationStatus: [
......@@ -1450,6 +1464,9 @@ export default {
}
},
computed: {
moment() {
return moment
},
...mapGetters(['deptId', 'name', 'deptLevel']),
/** 判断该页面是编辑还是详情*/
isEdit() {
......@@ -1566,51 +1583,55 @@ export default {
isEmpty,
// 表单提交
submit() {
const temp = {
'id': this.detailInfo.id,
'medicalRecordNo': this.detailInfo.medicalRecordNo,
'petsId': this.detailInfo.petsId,
'petOwnersId': this.detailInfo.petOwnersId,
'petNickname': this.detailInfo.petNickname,
'petPicture': this.detailInfo.petPicture,
'petBreed': this.detailInfo.petBreed,
'petBreedId': this.detailInfo.petBreedId,
'petChildBreed': this.detailInfo.petChildBreed,
'petChildBreedId': this.detailInfo.petChildBreedId,
'petSex': this.detailInfo.petSex,
'petWeight': this.detailInfo.petWeight,
'petColor': this.detailInfo.petColor,
'sterilizationStatus': this.detailInfo.sterilizationStatus,
'vaccineSituation': this.detailInfo.vaccineSituation,
'insure': this.detailInfo.insure,
'registId': this.detailInfo.registId,
'mainSuit': this.detailInfo.mainSuit,
'doctorAdvice': this.detailInfo.doctorAdvice,
'diagnosisResult': this.detailInfo.diagnosisResult,
'delFlag': this.detailInfo.delFlag,
'followContent': this.detailInfo.followContent,
'petBirthday': this.detailInfo.petBirthday,
'followStatus': this.detailInfo.followStatus
}
console.log('病例编辑页的提交字段大集合!!!', temp)
this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn',
type: 'warning'
}).then(() => {
editRecord(temp).then(res => {
this.$message({
type: 'success',
message: '修改成功'
this.$refs['form'].validate(valid => {
if (valid) {
const temp = {
'id': this.detailInfo.id,
'medicalRecordNo': this.detailInfo.medicalRecordNo,
'petsId': this.detailInfo.petsId,
'petOwnersId': this.detailInfo.petOwnersId,
'petNickname': this.detailInfo.petNickname,
'petPicture': this.detailInfo.petPicture,
'petBreed': this.detailInfo.petBreed,
'petBreedId': this.detailInfo.petBreedId,
'petChildBreed': this.detailInfo.petChildBreed,
'petChildBreedId': this.detailInfo.petChildBreedId,
'petSex': this.detailInfo.petSex,
'petWeight': this.detailInfo.petWeight,
'petColor': this.detailInfo.petColor,
'sterilizationStatus': this.detailInfo.sterilizationStatus,
'vaccineSituation': this.detailInfo.vaccineSituation,
'insure': this.detailInfo.insure,
'registId': this.detailInfo.registId,
'mainSuit': this.detailInfo.mainSuit,
'doctorAdvice': this.detailInfo.doctorAdvice,
'diagnosisResult': this.detailInfo.diagnosisResult,
'delFlag': this.detailInfo.delFlag,
'followContent': this.detailInfo.followContent,
'petBirthday': this.detailInfo.petBirthday,
'followStatus': this.detailInfo.followStatus
}
console.log('病例编辑页的提交字段大集合!!!', temp)
this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn',
type: 'warning'
}).then(() => {
editRecord(temp).then(res => {
this.$message({
type: 'success',
message: '修改成功'
})
this.goBack()
console.log('editRecord', res)
this.$router.push('/medical-record-management/index')
})
this.goBack()
})
this.goBack()
console.log('editRecord', res)
this.$router.push('/medical-record-management/index')
})
this.goBack()
}
})
},
// 设置当前行检查名称
......
src/views/medical-record-management/medical-record-management.vue
View file @ 44e3a905
......@@ -148,6 +148,11 @@
<span>{{ scope.row.ownerName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="left" label="宠主ID" prop="ownersId" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.ownersId || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="left" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petOwnerPhone || '-' }}</span>
......
src/views/service-management/hospitalization-management/hospitalization-management.vue
View file @ 44e3a905
......@@ -204,8 +204,8 @@
@click="handleDetails(scope.row)"
>详情</el-button>
<el-button
v-hasPermi="['business:hospital:edit']"
v-if="scope.row.status==='2' || scope.row.status==='0'"
v-hasPermi="['business:hospital:edit']"
icon="el-icon-paperclip"
plain
size="mini"
......@@ -223,8 +223,8 @@
:disabled="true"
>办理入院</el-button>
<el-button
v-hasPermi="['business:hospital:edit']"
v-else-if="scope.row.status==='3'"
v-hasPermi="['business:hospital:edit']"
icon="el-icon-paperclip"
plain
size="mini"
......
src/views/service-management/medical-record-management/check-detail.vue
View file @ 44e3a905
......@@ -186,15 +186,15 @@
<span class="title-text" style="font-size: 16px;font-weight: bold;">检查进度</span>
</div>
<!-- 步骤条 -->
<!-- <div>-->
<!-- <el-steps :active="schedule" align-center>-->
<!-- <el-step title="开具处方单" :description="parseTime(checkDetail.createTime, '{y}-{m}-{d} {h}:{i}')" />-->
<!-- <el-step title="缴费开票" :description="parseTime(checkDetail.payTime, '{y}-{m}-{d} {h}:{i}') || '暂未缴费'" />-->
<!-- <el-step title="预约检查" :description="parseTime(checkDetail.checkStartTime, '{y}-{m}-{d} {h}:{i}') || '暂未预约'" />-->
<!-- <el-step title="检查获取报告" :description="parseTime(checkDetail.reportTime, '{y}-{m}-{d} {h}:{i}') || '暂未检查'" />-->
<!-- </el-steps>-->
<!-- </div>-->
<CheckSchedule :scheduleKey="scheduleKey" />
<!-- <div>-->
<!-- <el-steps :active="schedule" align-center>-->
<!-- <el-step title="开具处方单" :description="parseTime(checkDetail.createTime, '{y}-{m}-{d} {h}:{i}')" />-->
<!-- <el-step title="缴费开票" :description="parseTime(checkDetail.payTime, '{y}-{m}-{d} {h}:{i}') || '暂未缴费'" />-->
<!-- <el-step title="预约检查" :description="parseTime(checkDetail.checkStartTime, '{y}-{m}-{d} {h}:{i}') || '暂未预约'" />-->
<!-- <el-step title="检查获取报告" :description="parseTime(checkDetail.reportTime, '{y}-{m}-{d} {h}:{i}') || '暂未检查'" />-->
<!-- </el-steps>-->
<!-- </div>-->
<CheckSchedule :schedule-key="scheduleKey" />
<!-- 缴费信息 -->
<div class="title-paragraph">
<span class="title-text" style="font-size: 16px;font-weight: bold;">缴费信息</span>
......@@ -346,7 +346,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="影像报告" label-width="84px">
<!-- <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
<!-- <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
<span v-if="checkDetail.shadowReport === null || checkDetail.shadowReport === ''">{{ '暂未上传' }}</span>
<el-link
v-else
......
src/views/service-management/medical-record-management/check-schedule.vue
View file @ 44e3a905
......@@ -2,13 +2,13 @@
<!--进度信息模块封装-->
<div class="schedule-info">
<!-- 1--tip样式-->
<!-- <div class="progress-tip">-->
<!-- <div class="tip-green" />-->
<!-- <div-->
<!-- class="tip-content"-->
<!-- >进度信息-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="progress-tip">-->
<!-- <div class="tip-green" />-->
<!-- <div-->
<!-- class="tip-content"-->
<!-- >进度信息-->
<!-- </div>-->
<!-- </div>-->
<!-- 2--内容样式-->
<div class="progress-base">
<div class="display-base">
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ 44e3a905
......@@ -19,6 +19,7 @@
placeholder="请输入宠物ID"
@keyup.enter.native="handleQuery"
@blur="handleQuery"
@clear="handleQuery"
/>
</el-form-item>
<div class="basicInformation">
......@@ -31,6 +32,7 @@
placeholder="请输入宠主姓名"
@keyup.enter.native="handleQuery"
@blur="handleQuery"
@clear="handleQuery"
/>
</el-form-item>
<el-form-item prop="phone" label="手机号">
......@@ -41,6 +43,7 @@
@keyup.enter.native="handleQuery"
@blur="handleQuery"
@input="handleInput"
@clear="handleQuery"
/>
</el-form-item>
</el-form>
......@@ -286,6 +289,8 @@ export default {
this.total = response.total
this.loading = false
})
} else {
this.petsList = []
}
}
}
......
src/views/service-management/registration-queue/components/doctor-card.vue
View file @ 44e3a905
......@@ -56,19 +56,18 @@
<div class="divider" />
<!--卡片中间部分-->
<div class="mid-bottom-framework">
<!-- <div-->
<!-- v-for="(pic,picIndex) in item.pictureUrl"-->
<!-- :key="`picIndex${picIndex}`"-->
<!-- class="mid-bottom"-->
<!-- >-->
<!-- <el-image-->
<!-- :src="baseURL+pic"-->
<!-- class="mid-bottom-inner"-->
<!-- fit="cover"-->
<!-- />-->
<!-- </div>-->
<!-- <div v-if="item.pictureUrl && item.pictureUrl.length === 0" class="mid-bottom-nobody">-->
<div class="mid-bottom-nobody">
<div
v-for="(pic,picIndex) in item.pictureUrl"
:key="`picIndex${picIndex}`"
class="mid-bottom"
>
<el-image
:src="baseURL+pic"
class="mid-bottom-inner"
fit="cover"
/>
</div>
<div v-if="item.pictureUrl && item.pictureUrl.length === 0" class="mid-bottom-nobody">
当前时段暂无等候中...
</div>
</div>
......@@ -201,10 +200,6 @@ export default {
/** 获取当日值班医生列表*/
this.getDoctorList()
},
created() {
/** 获取宠物信息 */
this.getDoctorList()
},
methods: {
/** 获取当日值班医生列表*/
getDoctorList() {
......
src/views/service-management/registration-queue/components/doctor-detail.vue
View file @ 44e3a905
......@@ -54,7 +54,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="name" label="门诊诊查费">
<el-form-item prop="name" label="门诊诊察费">
<div style="display: flex;">
<el-input v-model="doctorForm.examinationFee" :disabled="true" maxlength="20" />
<div style="margin-left: 10px;">元</div>
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 44e3a905
......@@ -49,7 +49,7 @@
<el-table-column label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip />
<el-table-column label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip />
<el-table-column
label="门诊诊查费"
label="门诊诊察费"
min-width="80"
prop="fees"
show-overflow-tooltip
......@@ -146,11 +146,11 @@ export default {
},
fristVisitOptions: [
{
label: '是',
label: '首诊',
value: '0'
},
{
label: '否',
label: '复诊',
value: '1'
}
]
......@@ -158,7 +158,6 @@ export default {
},
watch: {
doctorId(val) {
console.log('KKKK555555555KKKKKKK', val)
this.getRegisterMsg()
}
},
......
src/views/service-management/registration-queue/components/schedule-info.vue
View file @ 44e3a905
......@@ -30,7 +30,7 @@
<div v-if="scheduleKey.registrationTime!=null" class="status-on">
{{ parseTime(scheduleKey.registrationTime, '{y}/{m}/{d} {h}:{i}') }}
</div>
<div v-else class="status-off">暂未挂号</div>
<div v-else class="status-off">进行中</div>
</div>
</div>
<!-- 箭头指示-->
......
src/views/service-management/registration-queue/registration-add.vue
View file @ 44e3a905
......@@ -403,7 +403,11 @@ export default {
rules: {
// 宠物昵称非空校验
petNickname: [
{ required: true, message: '请输入宠物昵称', trigger: 'blur' }
{ required: true, message: '请输入宠物昵称', trigger: 'blur' },
{ pattern: /^[a-zA-Z0-9\u4e00-\u9fa5]+$/, message: '仅支持中英文数字', trigger: 'blur' }
],
petColor: [
{ pattern: /^[\u4e00-\u9fa5a-zA-Z]+$/, message: '仅支持中英文', trigger: 'blur' }
],
// 宠物性别非空校验
petSex: [
......@@ -424,7 +428,7 @@ export default {
// 宠物体重非空校验
petWeight: [
{ required: true, message: '请输入宠物体重', trigger: 'change' },
{ pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '请输入整数和小数（只保留小数点后两位）', trigger: 'blur' }
{ pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '仅支持数字、小数点（保留两位小数）', trigger: 'blur' }
],
// 绝育情况非空校验
sterilizationStatus: [
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ 44e3a905
......@@ -344,8 +344,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!--门诊诊查费-->
<el-form-item label="门诊诊查费">
<!--门诊诊察费-->
<el-form-item label="门诊诊察费">
<div class="reg-payAmount">
<el-input v-model="detailInfo.payAmount" placeholder="暂无数据" disabled />
<span>元</span>
......@@ -402,104 +402,112 @@
<div class="base-inner">
<!--挂号方式-->
<el-row>
<el-col :span="8" class="form__left">
<el-form-item label="病历号">
<el-input v-model="detailInfo.medicalRecordNo" placeholder="暂无数据" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<!--挂号时间-->
<el-form-item label="就诊日期">
<el-date-picker
v-model="detailInfo.visitDate"
clearable
disabled
placeholder="暂无数据"
type="date"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<!--是否首诊-->
<el-form-item label="就诊诊位">
<el-input v-model="detailInfo.visitLocation" placeholder="暂无数据" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
<!-- 新学的第二种方法-->
<el-form-item
label="主诉"
prop="mainSuit"
:rules="[{validator: (rules, value, callback) => {
if (isEmpty(visitForm.mainSuit)) {
callback(new Error('请输入患者主诉'))
} else {
callback()
}
}, trigger: 'blur'}]"
>
<el-input
v-model.trim="visitForm.mainSuit"
maxlength="400"
placeholder="请输入患者主诉(0/400)"
type="textarea"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="医嘱"
prop="doctorAdvice"
:rules="[{validator: (rules, value, callback) => {
if (isEmpty(visitForm.doctorAdvice)) {
callback(new Error('请输入医嘱'))
} else {
callback()
}
}, trigger: 'blur'}]"
>
<el-input
v-model.trim="visitForm.doctorAdvice"
maxlength="200"
placeholder="请输入医嘱(0/200)"
type="textarea"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="诊断结果"
prop="diagnosisResult"
:rules="[{validator: (rules, value, callback) => {
if (isEmpty(visitForm.diagnosisResult)) {
callback(new Error('请输入诊断结果'))
} else {
callback()
}
}, trigger: 'blur'}]"
>
<el-input
v-model.trim="visitForm.diagnosisResult"
class="reg-diagnosisResult"
maxlength="30"
placeholder="请输入诊断结果(0/30)"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="处方单">
<el-button
class="fourWordsBtn"
icon="el-icon-date"
size="mini"
@click="prescribing"
<el-form ref="visitForm" class="register-detail__form" :model="visitForm" label-width="81px" size="small">
<el-col :span="8" class="form__left">
<el-form-item label="病历号">
<el-input v-model="detailInfo.medicalRecordNo" placeholder="暂无数据" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<!--挂号时间-->
<el-form-item label="就诊日期">
<el-date-picker
v-model="detailInfo.visitDate"
clearable
disabled
placeholder="暂无数据"
type="date"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<!--是否首诊-->
<el-form-item label="就诊诊位">
<el-input v-model="detailInfo.visitLocation" placeholder="暂无数据" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
<!-- 新学的第二种方法-->
<el-form-item
label="主诉"
prop="mainSuit"
:rules="[
{ required: true, message: '请输入主诉', trigger: 'change' },
{validator: (rules, value, callback) => {
if (isEmpty(visitForm.mainSuit)) {
callback(new Error('请输入主诉'))
} else {
callback()
}
}, trigger: 'blur'}]"
>
<el-input
v-model.trim="visitForm.mainSuit"
maxlength="400"
placeholder="请输入患者主诉(0/400)"
type="textarea"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="医嘱"
prop="doctorAdvice"
:rules="[
{ required: true, message: '请输入医嘱', trigger: 'change' },
{validator: (rules, value, callback) => {
if (isEmpty(visitForm.doctorAdvice)) {
callback(new Error('请输入医嘱'))
} else {
callback()
}
}, trigger: 'blur'}]"
>
开具处方
</el-button>
</el-form-item>
</el-col>
<el-input
v-model.trim="visitForm.doctorAdvice"
maxlength="200"
placeholder="请输入医嘱(0/200)"
type="textarea"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="诊断结果"
prop="diagnosisResult"
:rules="[
{ required: true, message: '请输入诊断结果', trigger: 'change' },
{validator: (rules, value, callback) => {
if (isEmpty(visitForm.diagnosisResult)) {
callback(new Error('请输入诊断结果'))
} else {
callback()
}
}, trigger: 'blur'}]"
>
<el-input
v-model.trim="visitForm.diagnosisResult"
class="reg-diagnosisResult"
maxlength="30"
placeholder="请输入诊断结果(0/30)"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="处方单">
<el-button
class="fourWordsBtn"
icon="el-icon-date"
size="mini"
@click="prescribing"
>
开具处方
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
</div>
</div>
......@@ -592,10 +600,10 @@ export default {
label: '全部',
value: ''
}, {
label: '是',
label: '首诊',
value: '0'
}, {
label: '否',
label: '复诊',
value: '1'
}],
// 缴费状态（待改）
......@@ -608,6 +616,9 @@ export default {
}, {
label: '已缴费',
value: '1'
}, {
label: '挂账',
value: '2'
}],
// 会员等级下拉框
membershipLevelList: [
......@@ -687,55 +698,59 @@ export default {
},
// 提交表单
submitForm() {
const temp = {
'id': this.regiterForm.medicalRecordId,
'medicalRecordNo': this.regiterForm.medicalRecordNo,
'registId': this.regiterForm.id,
'petsId': this.regiterForm.petsId,
'petOwnersId': this.regiterForm.petOwnersId,
'petOwnersName': this.regiterForm.petOwnersName,
'petOwnersPhone': this.regiterForm.petOwnersPhone,
'petNickname': this.regiterForm.petNickname,
'petBreed': this.regiterForm.petBreed,
'petBreedId': this.regiterForm.petBreedId,
'petChildBreed': this.regiterForm.petChildBreed,
'petChildBreedId': this.regiterForm.petChildBreedId,
'petSex': this.regiterForm.petSex,
'petAge': this.regiterForm.petAge,
'petWeight': this.regiterForm.petWeight,
'petColor': this.regiterForm.petColor,
'sterilizationStatus': this.regiterForm.sterilizationStatus,
'vaccineSituation': this.regiterForm.vaccineSituation,
'insure': this.regiterForm.insure,
'doctorId': this.regiterForm.doctorId,
'userId': this.regiterForm.userId,
'doctorName': this.regiterForm.doctorName,
'hospitalId': this.regiterForm.hospitalId,
'hospitalName': this.regiterForm.hospitalName,
'hospitalDepartmentId': this.regiterForm.hospitalDepartmentId,
'hospitalDepartmentName': this.regiterForm.hospitalDepartmentName,
'doctorPhone': this.regiterForm.doctorPhone,
'visitWay': this.regiterForm.visitWay,
'firstVisit': this.regiterForm.firstVisit,
'petPicture': this.regiterForm.petPicture,
'delFlag': this.regiterForm.delFlag,
'doctorSignatureUrl': this.regiterForm.doctorSignatureUrl,
'visitLocation': this.regiterForm.visitLocation,
'doctorTitleLabel': this.regiterForm.doctorTitleLabel,
'mainSuit': this.visitForm.mainSuit,
'doctorAdvice': this.visitForm.doctorAdvice,
'diagnosisResult': this.visitForm.diagnosisResult,
'registTime': this.regiterForm.registrationTime,
'diagnosisTime': this.regiterForm.diagnosisTime,
'petBirthday': this.regiterForm.petBirthday
}
console.log('表单参数2333', temp)
this.$refs.visitForm.validate(valid => {
if (valid) {
const temp = {
'id': this.regiterForm.medicalRecordId,
'medicalRecordNo': this.regiterForm.medicalRecordNo,
'registId': this.regiterForm.id,
'petsId': this.regiterForm.petsId,
'petOwnersId': this.regiterForm.petOwnersId,
'petOwnersName': this.regiterForm.petOwnersName,
'petOwnersPhone': this.regiterForm.petOwnersPhone,
'petNickname': this.regiterForm.petNickname,
'petBreed': this.regiterForm.petBreed,
'petBreedId': this.regiterForm.petBreedId,
'petChildBreed': this.regiterForm.petChildBreed,
'petChildBreedId': this.regiterForm.petChildBreedId,
'petSex': this.regiterForm.petSex,
'petAge': this.regiterForm.petAge,
'petWeight': this.regiterForm.petWeight,
'petColor': this.regiterForm.petColor,
'sterilizationStatus': this.regiterForm.sterilizationStatus,
'vaccineSituation': this.regiterForm.vaccineSituation,
'insure': this.regiterForm.insure,
'doctorId': this.regiterForm.doctorId,
'userId': this.regiterForm.userId,
'doctorName': this.regiterForm.doctorName,
'hospitalId': this.regiterForm.hospitalId,
'hospitalName': this.regiterForm.hospitalName,
'hospitalDepartmentId': this.regiterForm.hospitalDepartmentId,
'hospitalDepartmentName': this.regiterForm.hospitalDepartmentName,
'doctorPhone': this.regiterForm.doctorPhone,
'visitWay': this.regiterForm.visitWay,
'firstVisit': this.regiterForm.firstVisit,
'petPicture': this.regiterForm.petPicture,
'delFlag': this.regiterForm.delFlag,
'doctorSignatureUrl': this.regiterForm.doctorSignatureUrl,
'visitLocation': this.regiterForm.visitLocation,
'doctorTitleLabel': this.regiterForm.doctorTitleLabel,
'mainSuit': this.visitForm.mainSuit,
'doctorAdvice': this.visitForm.doctorAdvice,
'diagnosisResult': this.visitForm.diagnosisResult,
'registTime': this.regiterForm.registrationTime,
'diagnosisTime': this.regiterForm.diagnosisTime,
'petBirthday': this.regiterForm.petBirthday
}
console.log('表单参数2333', temp)
insertDiagnosis(temp).then(res => {
console.log(res)
if (res.code === 200) {
this.$message.success('提交成功')
this.goBack()
insertDiagnosis(temp).then(res => {
console.log(res)
if (res.code === 200) {
this.$message.success('提交成功')
this.goBack()
}
})
}
})
},
......
src/views/service-management/treatment-management/treatment-detail.vue
View file @ 44e3a905
......@@ -186,14 +186,14 @@
<span class="title-text" style="font-size: 16px;font-weight: bold;">治疗进度</span>
</div>
<!-- 步骤条 -->
<!-- <div>-->
<!-- <el-steps :active="schedule" align-center>-->
<!-- <el-step title="开具处方单" :description="createTime" />-->
<!-- <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />-->
<!-- <el-step title="分配诊室" :description="checkDetail.consultRoomTime || '暂未预约'" />-->
<!-- <el-step title="治疗" :description="checkDetail.reportTime || '暂未治疗'" />-->
<!-- </el-steps>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-steps :active="schedule" align-center>-->
<!-- <el-step title="开具处方单" :description="createTime" />-->
<!-- <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />-->
<!-- <el-step title="分配诊室" :description="checkDetail.consultRoomTime || '暂未预约'" />-->
<!-- <el-step title="治疗" :description="checkDetail.reportTime || '暂未治疗'" />-->
<!-- </el-steps>-->
<!-- </div>-->
<TreatmentSchedule :schedule-key="scheduleKey" />
<!-- 缴费信息 -->
<div class="title-paragraph">
......@@ -334,7 +334,7 @@
<el-col :span="8">
<el-form-item label="治疗日志">
<span v-if="checkDetail.shadowReport===''||checkDetail.shadowReport===null">{{ '暂未上传' }}</span>
<!-- <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
<!-- <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
<el-link
v-else
:href="`${baseUrl}${checkDetail.shadowReport}`"
......
src/views/service-management/treatment-management/treatment-schedule.vue
View file @ 44e3a905
......@@ -2,13 +2,13 @@
<!--进度信息模块封装-->
<div class="schedule-info">
<!-- 1--tip样式-->
<!-- <div class="progress-tip">-->
<!-- <div class="tip-green" />-->
<!-- <div-->
<!-- class="tip-content"-->
<!-- >进度信息-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="progress-tip">-->
<!-- <div class="tip-green" />-->
<!-- <div-->
<!-- class="tip-content"-->
<!-- >进度信息-->
<!-- </div>-->
<!-- </div>-->
<!-- 2--内容样式-->
<div class="progress-base">
<div class="display-base">
......
vue.config.js
View file @ 44e3a905
......@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '萌宠医院信息管理平台' // 网页标题
const name = process.env.VUE_APP_TITLE || '百邦萌宠医院管理系统' // 网页标题
const port = 1099 // 端口
......
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