Commit 5c7fea2f authored by 小费同学阿's avatar 小费同学阿 💬

文章编辑二次弹窗按钮×的修复

parent 8e5e5244
...@@ -3,47 +3,47 @@ ...@@ -3,47 +3,47 @@
<el-form ref="doctorForm" :model="doctorForm" label-width="100px" size="small"> <el-form ref="doctorForm" :model="doctorForm" label-width="100px" size="small">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="医生姓名:"> <el-form-item prop="name" label="医生姓名">
<el-input v-model="doctorForm.doctorName" :disabled="true" maxlength="20" /> <el-input v-model="doctorForm.doctorName" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="医生ID:"> <el-form-item prop="name" label="医生ID">
<el-input v-model="doctorForm.ruleId" :disabled="true" maxlength="20" /> <el-input v-model="doctorForm.ruleId" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="手机号:"> <el-form-item prop="name" label="手机号">
<el-input v-model="doctorForm.phone" :disabled="true" maxlength="20" /> <el-input v-model="doctorForm.phone" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="所属科室:"> <el-form-item prop="name" label="所属科室">
<el-input v-model="doctorForm.departmentName" :disabled="true" maxlength="20" /> <el-input v-model="doctorForm.departmentName" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="医生职称:"> <el-form-item prop="name" label="医生职称">
<el-input v-model="doctorForm.doctorTitleValue" :disabled="true" maxlength="20" /> <el-input :value="selectDictLabel(dict.type.doctor_title, doctorForm.doctorTitleValue)" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="当前诊位:"> <el-form-item prop="name" label="当前诊位">
<el-input v-model="doctorForm.positionName" :disabled="true" maxlength="20" /> <el-input v-model="doctorForm.positionName" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item prop="name" label="擅长领域:"> <el-form-item prop="name" label="擅长领域">
<el-input v-model="doctorForm.areaExpertise" type="textarea" :disabled="true" maxlength="20" /> <el-input :value="doctorForm.areaExpertise || '暂无数据'" type="textarea" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item prop="name" label="医生简介:"> <el-form-item prop="name" label="医生简介">
<el-input v-model="doctorForm.doctorProfile" type="textarea" :disabled="true" maxlength="20" /> <el-input :value="doctorForm.doctorProfile || '暂无数据'" type="textarea" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="证书:"> <el-form-item prop="name" label="证书">
<el-image <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="baseURL+doctorForm.certificateUrl" :src="baseURL+doctorForm.certificateUrl"
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="门诊诊查费:"> <el-form-item prop="name" label="门诊诊查费">
<el-input v-model="doctorForm.examinationFee" :disabled="true" maxlength="20" /> <el-input v-model="doctorForm.examinationFee" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<script> <script>
import { getRegisterDetail } from '@/api/business/registration' import { getRegisterDetail } from '@/api/business/registration'
import { selectDictLabel } from '@/utils/ruoyi'
export default { export default {
name: 'DoctorDetail', name: 'DoctorDetail',
...@@ -79,6 +80,7 @@ export default { ...@@ -79,6 +80,7 @@ export default {
default: '' default: ''
} }
}, },
dicts: ['doctor_title'],
data() { data() {
return { return {
// 图片基础地址 // 图片基础地址
...@@ -97,6 +99,7 @@ export default { ...@@ -97,6 +99,7 @@ export default {
created() { created() {
}, },
methods: { methods: {
selectDictLabel,
// 获取相应id的医生详情 // 获取相应id的医生详情
getRegisterMsg() { getRegisterMsg() {
getRegisterDetail(this.doctorId).then(response => { getRegisterDetail(this.doctorId).then(response => {
......
<template> <template>
<div class="registration-add-module"> <div class="registration-add-module">
<el-form ref="from" :model="form" :rules="rules" class="registration-add-form" label-width="110px" size="small"> <el-form ref="from" :model="form" :rules="rules" class="registration-add-form" label-width="72px" size="small">
<div class="basicInformation"> <div class="basicInformation">
<div class="title">宠物信息</div> <div class="title">宠物信息</div>
<div class="pet-add-btns"> <div class="pet-add-btns">
...@@ -44,41 +44,44 @@ ...@@ -44,41 +44,44 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8" style="display: flex; flex-basis: 0; flex-grow: 0">
<el-form-item class="petBreed" label="宠物品种:" prop="petBreed"> <el-form-item
<el-form-item> class="pet-breed__form-item"
<el-select label="宠物品种:"
v-model="form.petBreedId" prop="petBreedId"
:disabled="!isEdit" >
clearable <el-select
:placeholder="isEdit? '请选择主品种' : '暂无数据'" v-model="form.petBreedId"
style="width: 100%" :disabled="!isEdit"
@change="changePetBreedId" clearable
> class="petBreed"
<el-option :placeholder="isEdit? '请选择宠物品种' : '暂无数据'"
v-for="(item, index) in dict.type.pet_breed" @change="changePetBreedId"
:key="index" >
:label="item.label" <el-option
:value="item.value" v-for="(item, index) in dict.type.pet_breed"
/> :key="index"
</el-select> :label="item.label"
<el-select :value="item.value"
v-model="form.petChildBreedId" />
:disabled="!isEdit" </el-select>
clearable </el-form-item>
:placeholder="isEdit? '请选择子品种' : '暂无数据'" <el-form-item prop="petChildBreedId" label-width="5px">
style="width: 100%" <el-select
class="petChildBreed" v-model="form.petChildBreedId"
@change="changePetChildBreedId" :disabled="!isEdit"
> clearable
<el-option :placeholder="isEdit? '请选择宠物子品种' : '暂无数据'"
v-for="(item, index) in petOptions[form.petBreedId]" class="petChildBreed"
:key="index" @change="changePetChildBreedId"
:label="item.label" >
:value="item.value" <el-option
/> v-for="(item, index) in petOptions[form.petBreedId]"
</el-select> :key="index"
</el-form-item> :label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -370,16 +373,20 @@ export default { ...@@ -370,16 +373,20 @@ export default {
rules: { rules: {
// 宠物昵称非空校验 // 宠物昵称非空校验
petNickname: [ petNickname: [
{ required: true, message: '请输入宠物昵称', trigger: 'change' } { required: true, message: '请输入宠物昵称', trigger: 'blur' }
], ],
// 宠物性别非空校验 // 宠物性别非空校验
petSex: [ petSex: [
{ required: true, message: '请选择宠物性别', trigger: 'change' } { required: true, message: '请选择宠物性别', trigger: 'change' }
], ],
// 宠物父级品种非空校验 // 宠物父级品种非空校验
petBreed: [ petBreedId: [
{ required: true, message: '请选择宠物品种', trigger: 'change' } { required: true, message: '请选择宠物品种', trigger: 'change' }
], ],
// 宠物子级品种非空校验
petChildBreedId: [
{ required: true, message: '请选择宠物子品种', trigger: 'change' }
],
// 宠物生日非空校验 // 宠物生日非空校验
petBirthday: [ petBirthday: [
{ required: true, message: '请选择宠物生日', trigger: 'change' } { required: true, message: '请选择宠物生日', trigger: 'change' }
...@@ -643,9 +650,17 @@ export default { ...@@ -643,9 +650,17 @@ export default {
} }
.registration-add-form { .registration-add-form {
.pet-breed__form-item {
.el-form-item__content {
display: flex;
}
}
.pet-weight-single { .pet-weight-single {
margin-left: 10px; margin-left: 10px;
} }
::v-deep .el-form-item--small.el-form-item {
margin-right: 0 !important;
}
} }
::v-deep .el-input--small { ::v-deep .el-input--small {
...@@ -690,10 +705,6 @@ export default { ...@@ -690,10 +705,6 @@ export default {
.el-form-item__content { .el-form-item__content {
display: flex; display: flex;
.petChildBreed {
margin-left: 5px;
}
} }
} }
} }
......
...@@ -13,7 +13,7 @@ color: #333333;" ...@@ -13,7 +13,7 @@ color: #333333;"
</div> </div>
<!-- 整体卡片内页面的样式--边距--> <!-- 整体卡片内页面的样式--边距-->
<div style="padding: 20px 20px 20px 20px;"> <div style="padding: 20px 20px 20px 20px;">
<el-form ref="form" :model="detailInfo" label-width="110px" size="small"> <el-form ref="form" class="register-detail__form" :model="detailInfo" label-width="81px" size="small">
<!--宠物头像--> <!--宠物头像-->
<div style="display: flex"> <div style="display: flex">
<!-- 1-- 宠物基本信息的页面--标签头 --> <!-- 1-- 宠物基本信息的页面--标签头 -->
...@@ -48,7 +48,7 @@ color: #333333;" ...@@ -48,7 +48,7 @@ color: #333333;"
<div class="base-inner"> <div class="base-inner">
<!--宠物昵称--> <!--宠物昵称-->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<el-form-item label="宠物昵称"> <el-form-item label="宠物昵称">
<el-input v-model="detailInfo.petNickname" placeholder="暂无数据" disabled /> <el-input v-model="detailInfo.petNickname" placeholder="暂无数据" disabled />
</el-form-item> </el-form-item>
...@@ -62,13 +62,13 @@ color: #333333;" ...@@ -62,13 +62,13 @@ color: #333333;"
<el-col :span="8"> <el-col :span="8">
<!--宠物品种--> <!--宠物品种-->
<el-form-item label="宠物品种" prop="petBreed" class="petBreed"> <el-form-item label="宠物品种" prop="petBreed" class="petBreed">
<el-input v-model="detailInfo.petBreed" placeholder="暂无数据" disabled /> <el-input v-model="detailInfo.petBreed" placeholder="暂无数据" disabled class="half__-5px" />
<el-input v-model="detailInfo.petChildBreed" placeholder="暂无数据" class="petChildBreed" disabled /> <el-input v-model="detailInfo.petChildBreed" placeholder="暂无数据" class="petChildBreed half" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<!--宠物性别--> <!--宠物性别-->
<el-form-item label="宠物性别"> <el-form-item label="宠物性别">
<el-select <el-select
...@@ -76,7 +76,6 @@ color: #333333;" ...@@ -76,7 +76,6 @@ color: #333333;"
clearable clearable
disabled disabled
placeholder="暂无数据" placeholder="暂无数据"
style="width: 100%"
> >
<el-option <el-option
v-for="(item, index) in dict.type.pet_sex" v-for="(item, index) in dict.type.pet_sex"
...@@ -106,7 +105,7 @@ color: #333333;" ...@@ -106,7 +105,7 @@ color: #333333;"
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<!--宠物毛色--> <!--宠物毛色-->
<el-form-item label="宠物毛色"> <el-form-item label="宠物毛色">
<el-input v-model="detailInfo.petColor" placeholder="暂无数据" disabled /> <el-input v-model="detailInfo.petColor" placeholder="暂无数据" disabled />
...@@ -120,7 +119,6 @@ color: #333333;" ...@@ -120,7 +119,6 @@ color: #333333;"
clearable clearable
disabled disabled
placeholder="暂无数据" placeholder="暂无数据"
style="width: 100%"
> >
<el-option <el-option
v-for="(item, index) in dict.type.sterilization_status" v-for="(item, index) in dict.type.sterilization_status"
...@@ -139,7 +137,6 @@ color: #333333;" ...@@ -139,7 +137,6 @@ color: #333333;"
clearable clearable
disabled disabled
placeholder="暂无数据" placeholder="暂无数据"
style="width: 100%"
> >
<el-option <el-option
v-for="(item, index) in dict.type.vaccine_situation" v-for="(item, index) in dict.type.vaccine_situation"
...@@ -152,7 +149,7 @@ color: #333333;" ...@@ -152,7 +149,7 @@ color: #333333;"
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<!--保险情况--> <!--保险情况-->
<el-form-item label="宠物保险"> <el-form-item label="宠物保险">
<el-select <el-select
...@@ -160,7 +157,6 @@ color: #333333;" ...@@ -160,7 +157,6 @@ color: #333333;"
clearable clearable
disabled disabled
placeholder="暂无数据" placeholder="暂无数据"
style="width: 100%"
> >
<el-option <el-option
v-for="(item, index) in dict.type.pet_insure" v-for="(item, index) in dict.type.pet_insure"
...@@ -187,7 +183,7 @@ color: #333333;" ...@@ -187,7 +183,7 @@ color: #333333;"
<!-- 3-- 主人信息的页面--内部信息 --> <!-- 3-- 主人信息的页面--内部信息 -->
<div class="ownerMsg-inner"> <div class="ownerMsg-inner">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<el-form-item label="宠主姓名"> <el-form-item label="宠主姓名">
<el-input v-model="detailInfo.petOwnerBo.nickName" placeholder="暂无数据" disabled /> <el-input v-model="detailInfo.petOwnerBo.nickName" placeholder="暂无数据" disabled />
</el-form-item> </el-form-item>
...@@ -204,7 +200,7 @@ color: #333333;" ...@@ -204,7 +200,7 @@ color: #333333;"
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<el-form-item label="创建日期"> <el-form-item label="创建日期">
<span class="content-style"> <span class="content-style">
<el-date-picker <el-date-picker
...@@ -226,7 +222,6 @@ color: #333333;" ...@@ -226,7 +222,6 @@ color: #333333;"
clearable clearable
placeholder="暂无数据" placeholder="暂无数据"
disabled disabled
style="width: 100%"
> >
<el-option <el-option
v-for="dict in membershipLevelList" v-for="dict in membershipLevelList"
...@@ -244,7 +239,7 @@ color: #333333;" ...@@ -244,7 +239,7 @@ color: #333333;"
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="detailInfo.petOwnerBo.status" placeholder="暂无数据" disabled> <el-select v-model="detailInfo.petOwnerBo.status" placeholder="暂无数据" disabled>
<el-option <el-option
...@@ -257,7 +252,6 @@ color: #333333;" ...@@ -257,7 +252,6 @@ color: #333333;"
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="绑定宠物数量"> <el-form-item label="绑定宠物数量">
<el-input v-model="detailInfo.petOwnerBo.petCount" placeholder="暂无数据" disabled /> <el-input v-model="detailInfo.petOwnerBo.petCount" placeholder="暂无数据" disabled />
</el-form-item> </el-form-item>
...@@ -284,7 +278,7 @@ color: #333333;" ...@@ -284,7 +278,7 @@ color: #333333;"
<div class="base-inner"> <div class="base-inner">
<!--挂号方式--> <!--挂号方式-->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<el-form-item label="挂号方式"> <el-form-item label="挂号方式">
<el-select v-model="detailInfo.type" placeholder="暂无数据" disabled> <el-select v-model="detailInfo.type" placeholder="暂无数据" disabled>
<el-option <el-option
...@@ -325,7 +319,7 @@ color: #333333;" ...@@ -325,7 +319,7 @@ color: #333333;"
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<!--就诊日期--> <!--就诊日期-->
<el-form-item label="就诊日期"> <el-form-item label="就诊日期">
<el-date-picker <el-date-picker
...@@ -356,7 +350,7 @@ color: #333333;" ...@@ -356,7 +350,7 @@ color: #333333;"
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<!--缴费状态--> <!--缴费状态-->
<el-form-item label="缴费状态"> <el-form-item label="缴费状态">
<el-select v-model="detailInfo.payStatus" disabled> <el-select v-model="detailInfo.payStatus" disabled>
...@@ -404,7 +398,7 @@ color: #333333;" ...@@ -404,7 +398,7 @@ color: #333333;"
<div class="base-inner"> <div class="base-inner">
<!--挂号方式--> <!--挂号方式-->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" class="form__left">
<el-form-item label="病历号"> <el-form-item label="病历号">
<el-input v-model="detailInfo.medicalRecordNo" placeholder="暂无数据" disabled /> <el-input v-model="detailInfo.medicalRecordNo" placeholder="暂无数据" disabled />
</el-form-item> </el-form-item>
...@@ -861,6 +855,14 @@ export default { ...@@ -861,6 +855,14 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
.el-col-8 {
padding-left: 41px;
}
.form__left {
margin-left: -50px;
}
//2--宠物保险--模块内信息整体样式 //2--宠物保险--模块内信息整体样式
.pet-insurance { .pet-insurance {
margin: 35px 1% 20px; margin: 35px 1% 20px;
...@@ -898,6 +900,26 @@ export default { ...@@ -898,6 +900,26 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.register-detail__form {
.el-form-item {
margin-right: 0 !important;
&__content {
.el-input, .el-select {
width: 100% !important;
}
.el-select ::v-deep .el-input {
width: 100% !important;
}
.half {
width: 50% !important;
}
.half__-5px {
width: calc(50% - 5px) !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