Commit 12cb2201 authored by 陈明豪's avatar 陈明豪

Merge remote-tracking branch 'origin/master'

parents 85070215 84729270
......@@ -87,7 +87,7 @@ export default {
},
data() {
const weightValidator = (rule, value, callback) => {
if (value === 0) callback(new Error('权重不能为0'))
if (value === 0) callback(new Error('权重为0'))
else callback()
}
return {
......
......@@ -337,7 +337,7 @@ export default {
// 表单校验
rules: {
articleStatus: [
{ required: true, message: '文章状态不能为空', trigger: 'change' }
{ required: true, message: '文章状态为空', trigger: 'change' }
]
}
}
......
......@@ -21,7 +21,7 @@
<el-input v-model="form.ruleId" :disabled="true" placeholder="暂无数据" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col v-show="userType==='3' || userType==='2'" :span="8">
<el-form-item label="医院自有设备" prop="isPrivate">
<el-select v-model="form.isPrivate" :disabled="true" placeholder="暂无数据">
<el-option
......@@ -33,6 +33,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col v-show="userType==='00'" :span="8">
<el-form-item label="平台自有设备" prop="isPrivate">
<el-input v-model="isPrivate" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
......@@ -273,7 +278,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="缴费金额">
<el-input v-model="form.payAmount" :disabled="true" placeholder="暂无数据"/>
<el-input v-model="form.payAmount" :disabled="true" placeholder="暂无数据" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -313,12 +318,15 @@
<script>
import { selectCheckItem, useManagementDetail } from '@/api/business/use'
import { CodeToText } from 'element-china-area-data'
import { getInfo } from '@/api/login'
export default {
name: 'UseDetails',
dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure', 'reservation_method'],
data() {
return {
isPrivate: '是',
userType: '',
useId: '',
createTime: '',
// 检查时间
......@@ -352,8 +360,16 @@ export default {
this.useId = localStorage.getItem('useId')
this.getUseDetail()
this.getCheckList()
this.getUserLogin()
},
methods: {
// 获取登陆人信息
getUserLogin() {
getInfo().then(res => {
this.userType = res.user.userType
console.log('登陆人', res)
})
},
// 检查项目下拉框
getCheckList() {
selectCheckItem().then(res => {
......
......@@ -1023,58 +1023,58 @@ export default {
formRules: {
// 宠物性别非空校验
petSex: [
{ required: true, message: '宠物性别不能为空', trigger: 'blur' }
{ required: true, message: '请选择宠物性别', trigger: 'blur' }
],
// 宠物生日非空校验
petBirthday: [
{ required: true, message: '宠物生日不能为空', trigger: 'blur' }
{ required: true, message: '请选择宠物生日', trigger: 'blur' }
],
// 宠物体重非空校验
petWeight: [
{ required: true, message: '宠物体重不能为空', trigger: 'blur' },
{ required: true, message: '请输入宠物体重', trigger: 'blur' },
{ pattern: /^\d+(\.\d+)?$/, message: '宠物体重必须是数字' }
],
// 绝育情况非空校验
sterilizationStatus: [
{ required: true, message: '绝育情况不能为空', trigger: 'change' }
{ required: true, message: '请选择绝育情况', trigger: 'change' }
],
// 疫苗情况非空校验
vaccineSituation: [
{ required: true, message: '疫苗情况不能为空', trigger: 'change' }
{ required: true, message: '请选择疫苗情况', trigger: 'change' }
],
// 保险情况非空校验
insure: [
{ required: true, message: '保险情况不能为空', trigger: 'change' }
{ required: true, message: '请选择保险情况', trigger: 'change' }
],
// 主诉非空校验
mainSuit: [
{ required: true, message: '主诉不能为空', trigger: 'blur' }
{ required: true, message: '请输入主诉', trigger: 'blur' }
],
// 医嘱非空校验
doctorAdvice: [
{ required: true, message: '医嘱不能为空', trigger: 'blur' }
{ required: true, message: '请输入医嘱', trigger: 'blur' }
],
// 诊断结果非空校验
diagnosisResult: [
{ required: true, message: '诊断结果不能为空', trigger: 'blur' }
{ required: true, message: '请输入诊断结果', trigger: 'blur' }
],
// 回访情况非空校验
followContent: [
{ required: true, message: '回访情况不能为空', trigger: 'blur' }
{ required: true, message: '请输入回访情况', trigger: 'blur' }
],
// 诊位名称
poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' },
poName: [{ required: true, message: '请输入诊位名称', trigger: 'change' },
{ min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
{ pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', trigger: 'change' }],
// 状态校验
status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
status: [{ required: true, message: '请选择状态', trigger: 'change' }]
},
// 检查信息表单校验
checkRules: {
// 检查类型非空校验
checkType: [
{ required: true, message: '检查类型不能为空', trigger: 'change' }
{ required: true, message: '请选择检查类型', trigger: 'change' }
]
},
// 进度
......
......@@ -119,59 +119,59 @@
@selection-change="handleSelectionChange"
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip>
<el-table-column align="left" label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column align="left" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.medicalRecordNo || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
<el-table-column align="left" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip>
<el-table-column align="left" label="宠物ID" prop="petsId" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petsId || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip>
<el-table-column align="left" label="宠主姓名" prop="petNickname" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
<el-table-column align="left" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petOwnerPhone || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip>
<el-table-column align="left" label="归档医院" prop="hospitalName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.hospitalName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip>
<el-table-column align="left" label="主治兽医" prop="doctorName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.doctorName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip>
<el-table-column align="left" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.hospitalDepartmentName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
<el-table-column align="left" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物保险" prop="insure" show-overflow-tooltip>
<el-table-column align="left" label="宠物保险" prop="insure" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
</template>
</el-table-column>
<el-table-column
align="center"
align="left"
class-name="small-padding fixed-width"
label="操作"
min-width="180"
......@@ -285,7 +285,8 @@ export default {
doctorId: null,
petJson: null,
doctorJson: null,
ownerJson: null
ownerJson: null,
createBy: ''
},
// 排序方式下拉框字典写死
sortList: [
......@@ -305,9 +306,15 @@ export default {
user: {}
}
},
// 同步--走的一条路
// 异步--各走各的
async created() {
// 获取当前用户信息
const { user } = await getInfo()
this.user = user
// 设置查询查询参数
this.queryParams.createBy = user.userName
// 这三个一块走
this.getList()
this.getDoctorList()
this.getDeptList()
......
......@@ -36,7 +36,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物品种">
<el-form-item label="宠物品种" label-width="81px">
<el-input
class="input-detail"
placeholder="暂无数据"
......@@ -71,7 +71,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物体重">
<el-form-item label="宠物体重" label-width="81px">
<el-input
class="input-detail"
placeholder="暂无数据"
......@@ -108,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="疫苗情况">
<el-form-item label="疫苗情况" label-width="81px">
<el-select class="input-detail" v-model="subscribeMessage.vaccineSituation" disabled placeholder="暂无数据">
<el-option
v-for="item in dict.type.vaccine_situation"
......@@ -163,7 +163,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费金额">
<el-form-item label="缴费金额" label-width="81px">
<el-input
class="input-detail"
placeholder="暂无数据"
......@@ -177,7 +177,7 @@
<div class="title-paragraph">
<span class="title-text" style="font-size: 16px;font-weight: bold;">设备预约</span>
</div>
<el-form ref="formDevice" :model="queryParams" label-width="100px">
<el-form ref="formDevice" :model="queryParams" label-width="70px">
<el-row>
<el-col :span="8">
<el-form-item label="设备">
......@@ -204,7 +204,7 @@
</el-form-item>
</el-col>
<el-col v-show="subscribeMessage.checkType === '2'" :span="8">
<el-form-item label="支出账户余额">
<el-form-item label="支出账户余额" label-width="81px">
11800.00
</el-form-item>
</el-col>
......@@ -214,6 +214,7 @@
<el-table
:data="deviceList"
:header-cell-style="{background:'#E8E9E8'}"
empty-text="当前暂无可预约设备"
>
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="检查日期" align="center" prop="checkDate">
......
......@@ -282,7 +282,11 @@
</template>
</el-table-column>
<el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column v-if="currentCheckType === '2'" prop="date" align="left" label="设备服务费" />
<el-table-column v-if="currentCheckType === '2'" prop="price" align="left" label="设备服务费">
<template slot-scope="scope">
<span>{{ scope.row.price || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<el-button
......
<template>
<el-dialog class="pet-choose-modle" title="选择宠物" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
<el-dialog :close-on-click-modal="false" class="pet-choose-modle" title="选择宠物" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
<el-form ref="queryForm" :inline="true" :model="queryParams" :rules="rules" label-width="100px" size="small">
<div class="basicInformation">
<div class="title">方式一:输入宠物ID查询</div>
......@@ -105,8 +105,8 @@
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="choosePet">确 定</el-button>
<el-button @click="closeModle">取 消</el-button>
<el-button class="queryBtn" @click="choosePet">确 定</el-button>
<el-button class="resetBtn" @click="closeModle">取 消</el-button>
</div>
</el-dialog>
</template>
......
<template>
<el-dialog class="doctor-detail-modle" title="详情" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
<el-dialog :close-on-click-modal="false" class="doctor-detail-modle" title="详情" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
<el-form ref="doctorForm" :model="doctorForm" label-width="100px" size="small">
<el-row>
<el-col :span="8">
......@@ -58,8 +58,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="choosePet">确 定</el-button>
<el-button @click="closeModle">取 消</el-button>
<el-button class="queryBtn" @click="choosePet">确 定</el-button>
<el-button class="resetBtn" @click="closeModle">取 消</el-button>
</div>
</el-dialog>
</template>
......
<template>
<el-dialog :visible.sync="isShow" append-to-body class="prescribing-modle" title="">
<el-dialog :visible.sync="isShow" append-to-body class="prescribing-modle" title="开具处方">
<el-form ref="prescribingForm" :model="prescribingForm" label-width="80px" size="small">
<!-- 标题区域-->
<div class="prescribing-head">
......
<template>
<el-dialog
:close-on-click-modal="false"
:before-close="closeModle"
:title="registrationType === '0' ? '挂号' : '加号'"
:visible.sync="isShow"
......
......@@ -28,7 +28,7 @@
<el-form-item label="宠物ID:" prop="petsId">
<el-input
v-model="form.petsId"
:placeholder="isEdit? '请输入宠物ID' : '暂无数据'"
placeholder="暂无数据"
:disabled="true"
maxlength="20"
/>
......@@ -331,7 +331,7 @@ export default {
pesonlist: [],
form: {
// 宠物信息开始
petsId: '-',
petsId: '',
// 宠物状态位
petStatus: '',
petNickname: '',
......@@ -370,46 +370,46 @@ export default {
rules: {
// 宠物昵称非空校验
petNickname: [
{ required: true, message: '宠物昵称不能为空', trigger: 'change' }
{ required: true, message: '请选择宠物昵称', trigger: 'change' }
],
// 宠物性别非空校验
petSex: [
{ required: true, message: '宠物性别不能为空', trigger: 'change' }
{ required: true, message: '请选择宠物性别', trigger: 'change' }
],
// 宠物生日非空校验
petBirthday: [
{ required: true, message: '宠物生日不能为空', trigger: 'change' }
{ required: true, message: '请选择宠物生日', trigger: 'change' }
],
// 宠物体重非空校验
petWeight: [
{ required: true, message: '宠物体重不能为空', trigger: 'change' },
{ required: true, message: '请输入宠物体重', trigger: 'change' },
{ pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '请输入整数和小数(只保留小数点后两位)', trigger: 'blur' }
],
// 绝育情况非空校验
sterilizationStatus: [
{ required: true, message: '绝育情况不能为空', trigger: 'change' }
{ required: true, message: '请选择绝育情况', trigger: 'change' }
],
// 疫苗情况非空校验
vaccineSituation: [
{ required: true, message: '疫苗情况不能为空', trigger: 'change' }
{ required: true, message: '请选择疫苗情况', trigger: 'change' }
],
// 保险情况非空校验
insure: [
{ required: true, message: '保险情况不能为空', trigger: 'change' }
{ required: true, message: '请选择保险情况', trigger: 'change' }
],
// 宠主手机号非空校验
masterPhone: [
{ required: true, message: '宠主手机号不能为空', trigger: 'blur' },
{ required: true, message: '请输入宠主手机号', trigger: 'blur' },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
}
],
poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' },
poName: [{ required: true, message: '请输入诊位名称', trigger: 'change' },
{ min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
{ pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', trigger: 'change' }],
status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
status: [{ required: true, message: '请选择状态', trigger: 'change' }]
},
// 宠物品种下拉框--一级选项(二级进行字典维护)
props: { expandTrigger: 'hover' },
......
......@@ -159,7 +159,6 @@ color: #333333;"
v-model="detailInfo.insure"
clearable
disabled
placeholder="暂无数据"
style="width: 100%"
>
......@@ -346,9 +345,10 @@ color: #333333;"
<el-col :span="8">
<!--门诊诊查费-->
<el-form-item label="门诊诊查费">
<el-input v-model="detailInfo.payAmount" placeholder="暂无数据" disabled>
<template #suffix></template>
</el-input>
<div style="display: flex;">
<el-input v-model="detailInfo.payAmount" placeholder="暂无数据" disabled />
<span></span>
</div>
</el-form-item>
</el-col>
</el-row>
......@@ -880,11 +880,13 @@ export default {
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
background-color: #F6FCF5 !important;
}
.petBreed{
::v-deep .el-input--small{
width: 105px!important;
.petBreed {
::v-deep .el-input--small {
width: 105px !important;
}
.petChildBreed{
.petChildBreed {
margin-left: 5px;
}
}
......
......@@ -125,38 +125,38 @@
@selection-change="handleSelectionChange"
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
<el-table-column align="center" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip>
<el-table-column align="left" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
<el-table-column align="left" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip>
<el-table-column align="left" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
<el-table-column align="left" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
</template>
</el-table-column>
<el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip>
<el-table-column align="left" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petOwnersName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip>
<el-table-column align="left" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petOwnersPhone || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
<el-table-column align="left" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="预约兽医" min-width="60" prop="doctorName" show-overflow-tooltip />
<el-table-column align="left" label="预约兽医" min-width="60" prop="doctorName" show-overflow-tooltip />
<el-table-column
align="center"
label="所属科室"
......@@ -164,27 +164,23 @@
prop="hospitalDepartmentName"
show-overflow-tooltip
/>
<el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip>
<el-table-column align="left" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip>
<el-table-column align="left" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.firstVisit || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
<el-table-column align="left" label="就诊时间" min-width="80" prop="visitDateTime" show-overflow-tooltip />
<el-table-column align="left" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
<template slot-scope="scope">
<span :style="scope.row.payStatus === '0' ? 'color: #F56C6C' : 'color: #67C23A'"><dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" /></span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="180">
<el-table-column align="left" class-name="small-padding fixed-width" label="操作" min-width="180">
<template slot-scope="scope">
<el-button
icon="el-icon-document"
......@@ -221,6 +217,7 @@
<script>
import { listRegister, getDepartment, checkPet, getDoctorment } from '@/api/business/register'
import { getInfo } from '@/api/login'
export default {
name: 'Register',
......@@ -333,7 +330,15 @@ export default {
isCheckAll: false
}
},
created() {
// 同步--走的一条路
// 异步--各走各的
async created() {
// 获取当前用户信息
const { user } = await getInfo()
this.user = user
// 设置查询查询参数
this.queryParams.createBy = user.userName
// 这三个一块走
this.getList()
this.getDeptList()
this.getDoctorList()
......
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