Skip to content

P
pet-business-web
Commit 4fb29a90 authored by 盖献康's avatar 盖献康
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 2dc29145 11552ec3
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 87 deletions
src/components/ImageUpload/index.vue
View file @ 4fb29a90
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
:file-list="fileList" :file-list="fileList"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:class="{hide: fileList.length >= limit :class="{hide: fileList.length >= limit
|| $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit}" || $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit
|| number >= limit}"
> >
<i class="el-icon-plus" /> <i class="el-icon-plus" />
</el-upload> </el-upload>
......
src/views/article-management/article-detail.vue
View file @ 4fb29a90
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
class="top-title-style" class="top-title-style"
>详情</span> >详情</span>
</div> </div>
<div style="padding: 32px 20px 20px 20px;"> <div style="padding: 20px;">
<div style="display: flex"> <div style="display: flex">
<!-- 文章信息 --> <!-- 文章信息 -->
<div class="tip-green" /> <div class="tip-green" />
......
src/views/banner_management/banner_detail.vue
View file @ 4fb29a90
...@@ -11,25 +11,43 @@ ...@@ -11,25 +11,43 @@
<div> <div>
<el-form ref="form" :model="form" label-width="133px"> <el-form ref="form" :model="form" label-width="133px">
<el-form-item label="标题：" prop="title"> <el-form-item label="标题：" prop="title">
<span class="formSpan">{{ form.title || '暂无数据' }}</span> <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="20" show-word-limit clearable disabled />
</el-form-item> </el-form-item>
<el-form-item label="轮播图：" prop="img"> <el-form-item label="轮播图：" prop="img">
<el-image :src="baseUrl + form.img" class="formImg" :preview-src-list="srcList" /> <el-image :src="baseUrl + form.img" class="formImg" :preview-src-list="srcList" />
</el-form-item> </el-form-item>
<el-form-item label="跳转地址：" prop="url"> <el-form-item label="跳转地址：" prop="url">
<span class="formSpan">{{ form.url || '暂无数据' }}</span> <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="30" show-word-limit clearable disabled />
</el-form-item> </el-form-item>
<el-form-item label="权重：" prop="sort"> <el-form-item label="权重：" prop="sort">
<span class="formSpan">{{ form.sort || '暂无数据' }}</span> <el-input-number
v-model="form.sort"
class="weight-number"
:max="9999"
:min="0"
controls-position="right"
disabled
/>
</el-form-item> </el-form-item>
<el-form-item label="创建日期：" prop="createTime"> <el-form-item label="创建日期：" prop="createTime">
<span class="formSpan">{{ form.createTime || '暂无数据' }}</span> <span class="formSpan">{{ form.createTime || '暂无数据' }}</span>
</el-form-item> </el-form-item>
<el-form-item label="状态：" prop="status"> <el-form-item label="状态：" prop="status">
<span class="formSpan">{{ form.status === '1' ? '已发布':'未发布' }}</span> <span style="height: 2.5rem;line-height: 2.5rem">
<el-switch
v-model="form.status"
active-color="#13ce66"
inactive-color="#f5aa6c"
active-value="1"
inactive-value="2"
disabled
/>
<span v-if="form.status === '1'" style="color: #67C23A;margin-left: 5px;">已发布</span>
<span v-else style="color: #f5aa6c;margin-left: 5px;">未发布</span>
</span>
</el-form-item> </el-form-item>
<el-form-item label="备注：" prop="notes"> <el-form-item label="备注：" prop="notes">
<span class="formSpan">{{ form.notes || '暂无数据' }}</span> <el-input disabled v-model.trim="form.notes" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button> <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
......
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ 4fb29a90
...@@ -411,7 +411,7 @@ export default { ...@@ -411,7 +411,7 @@ export default {
{ type: 'number', validator: this.validserviceArea, trigger: 'change' } { type: 'number', validator: this.validserviceArea, trigger: 'change' }
], ],
checkType: [ checkType: [
{ required: true, message: '请选择支持检查类型', trigger: 'blur' }, { required: true, message: '请选择支持检查项目', trigger: 'blur' },
{ type: 'number', validator: this.validcheckType, trigger: 'change' } { type: 'number', validator: this.validcheckType, trigger: 'change' }
] ]
}, },
...@@ -597,7 +597,7 @@ export default { ...@@ -597,7 +597,7 @@ export default {
if (this.form.serviceArea.length > 0) { if (this.form.serviceArea.length > 0) {
callback() callback()
} else { } else {
callback(new Error('请选择支持检查项目')) callback(new Error('请选择支持服务地区'))
} }
}, },
// 支持检查类型表单校验 // 支持检查类型表单校验
...@@ -757,5 +757,21 @@ export default { ...@@ -757,5 +757,21 @@ export default {
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td .el-table__cell { ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td .el-table__cell {
background-color: #F6FCF5 !important; background-color: #F6FCF5 !important;
} }
//el.time-select-item.selected{
// color: #5FB54B;
// font-weight: bold;
//}
/* 修改下拉框文字样式 */
::v-deep .el-time-select__input {
font-size: 16px;
color: #5FB54B;
}
/* 修改下拉框背景颜色 */
::v-deep .el-picker-panel {
background-color: #5FB54B;
}
</style> </style>
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 4fb29a90
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持服务地区" prop="serviceArea"> <el-form-item label="支持服务地区" prop="serviceArea">
<el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px" multiple collapse-tags clearable> <el-select v-model="form.serviceArea" placeholder="请选择支持服务地区" style="width: 300px" multiple collapse-tags clearable>
<el-option <el-option
v-for="dictServiceArea in dict.type.service_area" v-for="dictServiceArea in dict.type.service_area"
:key="dictServiceArea.label" :key="dictServiceArea.label"
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持检查项目" prop="checkType"> <el-form-item label="支持检查项目" prop="checkType">
<el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" collapse-tags clearable> <el-select v-model="form.checkType" multiple placeholder="请选择支持检查项目" style="width: 300px" collapse-tags clearable>
<el-option <el-option
v-for="(item,index) in dict.type.exam_type" v-for="(item,index) in dict.type.exam_type"
:key="index.label" :key="index.label"
...@@ -715,8 +715,8 @@ export default { ...@@ -715,8 +715,8 @@ export default {
{ required: true, message: '请选择设备类型', trigger: 'change' } { required: true, message: '请选择设备类型', trigger: 'change' }
], ],
selectedOptions: [ selectedOptions: [
{ required: true, message: '请选择服务地点', trigger: 'blur' }, // { required: true, message: '请选择服务地点', trigger: 'blur' },
{ type: 'number', validator: this.validaddress, trigger: 'change' } { required: true, type: 'number', validator: this.validaddress, trigger: 'change' }
], ],
// addressCode: [ // addressCode: [
// { required: true, message: '请选择服务地点', trigger: 'change,blur' } // { required: true, message: '请选择服务地点', trigger: 'change,blur' }
...@@ -758,7 +758,7 @@ export default { ...@@ -758,7 +758,7 @@ export default {
{ type: 'number', validator: this.validserviceArea, trigger: 'change' } { type: 'number', validator: this.validserviceArea, trigger: 'change' }
], ],
checkType: [ checkType: [
{ required: true, message: '请选择支持检查类型', trigger: 'blur' }, { required: true, message: '请选择支持检查项目', trigger: 'blur' },
{ type: 'number', validator: this.validcheckType, trigger: 'change' } { type: 'number', validator: this.validcheckType, trigger: 'change' }
] ]
}, },
...@@ -918,7 +918,7 @@ export default { ...@@ -918,7 +918,7 @@ export default {
if (this.form.serviceArea.length > 0) { if (this.form.serviceArea.length > 0) {
callback() callback()
} else { } else {
callback(new Error('请选择支持检查项目')) callback(new Error('请选择支持服务地区'))
} }
}, },
// 支持检查类型表单校验 // 支持检查类型表单校验
...@@ -927,7 +927,7 @@ export default { ...@@ -927,7 +927,7 @@ export default {
if (this.form.checkType.length > 0) { if (this.form.checkType.length > 0) {
callback() callback()
} else { } else {
callback(new Error('请选择支持服务地区')) callback(new Error('请选择支持检查项目'))
} }
}, },
// 四个时间的表单校验 // 四个时间的表单校验
......
src/views/medical-record-management/medical-edit.vue
View file @ 4fb29a90
...@@ -1023,58 +1023,58 @@ export default { ...@@ -1023,58 +1023,58 @@ export default {
formRules: { formRules: {
// 宠物性别非空校验 // 宠物性别非空校验
petSex: [ petSex: [
{ required: true, message: '宠物性别不能为空', trigger: 'blur' } { required: true, message: '请选择宠物性别', trigger: 'blur' }
], ],
// 宠物生日非空校验 // 宠物生日非空校验
petBirthday: [ petBirthday: [
{ required: true, message: '宠物生日不能为空', trigger: 'blur' } { required: true, message: '请选择宠物生日', trigger: 'blur' }
], ],
// 宠物体重非空校验 // 宠物体重非空校验
petWeight: [ petWeight: [
{ required: true, message: '宠物体重不能为空', trigger: 'blur' }, { required: true, message: '请输入宠物体重', trigger: 'blur' },
{ pattern: /^\d+(\.\d+)?$/, message: '宠物体重必须是数字' } { pattern: /^\d+(\.\d+)?$/, message: '宠物体重必须是数字' }
], ],
// 绝育情况非空校验 // 绝育情况非空校验
sterilizationStatus: [ sterilizationStatus: [
{ required: true, message: '绝育情况不能为空', trigger: 'change' } { required: true, message: '请选择绝育情况', trigger: 'change' }
], ],
// 疫苗情况非空校验 // 疫苗情况非空校验
vaccineSituation: [ vaccineSituation: [
{ required: true, message: '疫苗情况不能为空', trigger: 'change' } { required: true, message: '请选择疫苗情况', trigger: 'change' }
], ],
// 保险情况非空校验 // 保险情况非空校验
insure: [ insure: [
{ required: true, message: '保险情况不能为空', trigger: 'change' } { required: true, message: '请选择保险情况', trigger: 'change' }
], ],
// 主诉非空校验 // 主诉非空校验
mainSuit: [ mainSuit: [
{ required: true, message: '主诉不能为空', trigger: 'blur' } { required: true, message: '请输入主诉', trigger: 'blur' }
], ],
// 医嘱非空校验 // 医嘱非空校验
doctorAdvice: [ doctorAdvice: [
{ required: true, message: '医嘱不能为空', trigger: 'blur' } { required: true, message: '请输入医嘱', trigger: 'blur' }
], ],
// 诊断结果非空校验 // 诊断结果非空校验
diagnosisResult: [ diagnosisResult: [
{ required: true, message: '诊断结果不能为空', trigger: 'blur' } { required: true, message: '请输入诊断结果', trigger: 'blur' }
], ],
// 回访情况非空校验 // 回访情况非空校验
followContent: [ 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' }, { min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
{ pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', 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: { checkRules: {
// 检查类型非空校验 // 检查类型非空校验
checkType: [ checkType: [
{ required: true, message: '检查类型不能为空', trigger: 'change' } { required: true, message: '请选择检查类型', trigger: 'change' }
] ]
}, },
// 进度 // 进度
......
src/views/medical-record-management/medical-record-management.vue
View file @ 4fb29a90
...@@ -119,59 +119,59 @@ ...@@ -119,59 +119,59 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="55" /> <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="left" 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" prop="medicalRecordNo" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.medicalRecordNo || '-' }}</span> <span>{{ scope.row.medicalRecordNo || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span> <span>{{ scope.row.petNickname || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petsId || '-' }}</span> <span>{{ scope.row.petsId || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span> <span>{{ scope.row.petNickname || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petOwnerPhone || '-' }}</span> <span>{{ scope.row.petOwnerPhone || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.hospitalName || '-' }}</span> <span>{{ scope.row.hospitalName || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.doctorName || '-' }}</span> <span>{{ scope.row.doctorName || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.hospitalDepartmentName || '-' }}</span> <span>{{ scope.row.hospitalDepartmentName || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" /> <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="left"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
min-width="180" min-width="180"
...@@ -285,7 +285,8 @@ export default { ...@@ -285,7 +285,8 @@ export default {
doctorId: null, doctorId: null,
petJson: null, petJson: null,
doctorJson: null, doctorJson: null,
ownerJson: null ownerJson: null,
createBy: ''
}, },
// 排序方式下拉框字典写死 // 排序方式下拉框字典写死
sortList: [ sortList: [
...@@ -305,9 +306,15 @@ export default { ...@@ -305,9 +306,15 @@ export default {
user: {} user: {}
} }
}, },
// 同步--走的一条路
// 异步--各走各的
async created() { async created() {
// 获取当前用户信息
const { user } = await getInfo() const { user } = await getInfo()
this.user = user this.user = user
// 设置查询查询参数
this.queryParams.createBy = user.userName
// 这三个一块走
this.getList() this.getList()
this.getDoctorList() this.getDoctorList()
this.getDeptList() this.getDeptList()
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ 4fb29a90
<template> <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"> <el-form ref="queryForm" :inline="true" :model="queryParams" :rules="rules" label-width="100px" size="small">
<div class="basicInformation"> <div class="basicInformation">
<div class="title">方式一：输入宠物ID查询</div> <div class="title">方式一：输入宠物ID查询</div>
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
@pagination="getList" @pagination="getList"
/> />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="choosePet">确 定</el-button> <el-button class="queryBtn" @click="choosePet">确 定</el-button>
<el-button @click="closeModle">取 消</el-button> <el-button class="resetBtn" @click="closeModle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
......
src/views/service-management/registration-queue/components/doctor-detail.vue
View file @ 4fb29a90
<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-form ref="doctorForm" :model="doctorForm" label-width="100px" size="small">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="choosePet">确 定</el-button> <el-button class="queryBtn" @click="choosePet">确 定</el-button>
<el-button @click="closeModle">取 消</el-button> <el-button class="resetBtn" @click="closeModle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
......
src/views/service-management/registration-queue/components/prescribing-modle.vue
View file @ 4fb29a90
<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"> <el-form ref="prescribingForm" :model="prescribingForm" label-width="80px" size="small">
<!-- 标题区域--> <!-- 标题区域-->
<div class="prescribing-head"> <div class="prescribing-head">
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 4fb29a90
<template> <template>
<el-dialog <el-dialog
:close-on-click-modal="false"
:before-close="closeModle" :before-close="closeModle"
:title="registrationType === '0' ? '挂号' : '加号'" :title="registrationType === '0' ? '挂号' : '加号'"
:visible.sync="isShow" :visible.sync="isShow"
......
src/views/service-management/registration-queue/registration-add.vue
View file @ 4fb29a90
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-form-item label="宠物ID:" prop="petsId"> <el-form-item label="宠物ID:" prop="petsId">
<el-input <el-input
v-model="form.petsId" v-model="form.petsId"
:placeholder="isEdit? '请输入宠物ID' : '暂无数据'" placeholder="暂无数据"
:disabled="true" :disabled="true"
maxlength="20" maxlength="20"
/> />
...@@ -331,7 +331,7 @@ export default { ...@@ -331,7 +331,7 @@ export default {
pesonlist: [], pesonlist: [],
form: { form: {
// 宠物信息开始 // 宠物信息开始
petsId: '-', petsId: '',
// 宠物状态位 // 宠物状态位
petStatus: '', petStatus: '',
petNickname: '', petNickname: '',
...@@ -370,46 +370,46 @@ export default { ...@@ -370,46 +370,46 @@ export default {
rules: { rules: {
// 宠物昵称非空校验 // 宠物昵称非空校验
petNickname: [ petNickname: [
{ required: true, message: '宠物昵称不能为空', trigger: 'change' } { required: true, message: '请选择宠物昵称', trigger: 'change' }
], ],
// 宠物性别非空校验 // 宠物性别非空校验
petSex: [ petSex: [
{ required: true, message: '宠物性别不能为空', trigger: 'change' } { required: true, message: '请选择宠物性别', trigger: 'change' }
], ],
// 宠物生日非空校验 // 宠物生日非空校验
petBirthday: [ petBirthday: [
{ required: true, message: '宠物生日不能为空', trigger: 'change' } { required: true, message: '请选择宠物生日', trigger: 'change' }
], ],
// 宠物体重非空校验 // 宠物体重非空校验
petWeight: [ petWeight: [
{ required: true, message: '宠物体重不能为空', trigger: 'change' }, { 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: [ sterilizationStatus: [
{ required: true, message: '绝育情况不能为空', trigger: 'change' } { required: true, message: '请选择绝育情况', trigger: 'change' }
], ],
// 疫苗情况非空校验 // 疫苗情况非空校验
vaccineSituation: [ vaccineSituation: [
{ required: true, message: '疫苗情况不能为空', trigger: 'change' } { required: true, message: '请选择疫苗情况', trigger: 'change' }
], ],
// 保险情况非空校验 // 保险情况非空校验
insure: [ insure: [
{ required: true, message: '保险情况不能为空', trigger: 'change' } { required: true, message: '请选择保险情况', trigger: 'change' }
], ],
// 宠主手机号非空校验 // 宠主手机号非空校验
masterPhone: [ masterPhone: [
{ required: true, message: '宠主手机号不能为空', trigger: 'blur' }, { required: true, message: '请输入宠主手机号', trigger: 'blur' },
{ {
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
trigger: 'blur' trigger: 'blur'
} }
], ],
poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' }, poName: [{ required: true, message: '请输入诊位名称', trigger: 'change' },
{ min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' }, { min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
{ pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', 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' }, props: { expandTrigger: 'hover' },
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ 4fb29a90
...@@ -159,7 +159,6 @@ color: #333333;" ...@@ -159,7 +159,6 @@ color: #333333;"
v-model="detailInfo.insure" v-model="detailInfo.insure"
clearable clearable
disabled disabled
placeholder="暂无数据" placeholder="暂无数据"
style="width: 100%" style="width: 100%"
> >
...@@ -346,9 +345,10 @@ color: #333333;" ...@@ -346,9 +345,10 @@ color: #333333;"
<el-col :span="8"> <el-col :span="8">
<!--门诊诊查费--> <!--门诊诊查费-->
<el-form-item label="门诊诊查费"> <el-form-item label="门诊诊查费">
<el-input v-model="detailInfo.payAmount" placeholder="暂无数据" disabled> <div style="display: flex;">
<template #suffix>元</template> <el-input v-model="detailInfo.payAmount" placeholder="暂无数据" disabled />
</el-input> <span>元</span>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -880,11 +880,13 @@ export default { ...@@ -880,11 +880,13 @@ export default {
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
background-color: #F6FCF5 !important; background-color: #F6FCF5 !important;
} }
.petBreed{
::v-deep .el-input--small{ .petBreed {
width: 105px!important; ::v-deep .el-input--small {
width: 105px !important;
} }
.petChildBreed{
.petChildBreed {
margin-left: 5px; margin-left: 5px;
} }
} }
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ 4fb29a90
...@@ -125,38 +125,38 @@ ...@@ -125,38 +125,38 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="55" /> <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="left" 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="70" prop="type" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span> <span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span> <span>{{ scope.row.petNickname || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" /> <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petOwnersName || '-' }}</span> <span>{{ scope.row.petOwnersName || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.petOwnersPhone || '-' }}</span> <span>{{ scope.row.petOwnersPhone || '-' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
</template> </template>
</el-table-column> </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 <el-table-column
align="center" align="center"
label="所属科室" label="所属科室"
...@@ -164,27 +164,23 @@ ...@@ -164,27 +164,23 @@
prop="hospitalDepartmentName" prop="hospitalDepartmentName"
show-overflow-tooltip 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"> <template slot-scope="scope">
<span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span> <span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.firstVisit || '-' }}</span> <span>{{ scope.row.firstVisit || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip> <el-table-column align="left" label="就诊时间" min-width="80" prop="visitDateTime" show-overflow-tooltip />
<template slot-scope="scope"> <el-table-column align="left" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
<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>
<template slot-scope="scope"> <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> <span :style="scope.row.payStatus === '0' ? 'color: #F56C6C' : 'color: #67C23A'"><dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" /></span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button <el-button
icon="el-icon-document" icon="el-icon-document"
...@@ -221,6 +217,7 @@ ...@@ -221,6 +217,7 @@
<script> <script>
import { listRegister, getDepartment, checkPet, getDoctorment } from '@/api/business/register' import { listRegister, getDepartment, checkPet, getDoctorment } from '@/api/business/register'
import { getInfo } from '@/api/login'
export default { export default {
name: 'Register', name: 'Register',
...@@ -333,7 +330,15 @@ export default { ...@@ -333,7 +330,15 @@ export default {
isCheckAll: false isCheckAll: false
} }
}, },
created() { // 同步--走的一条路
// 异步--各走各的
async created() {
// 获取当前用户信息
const { user } = await getInfo()
this.user = user
// 设置查询查询参数
this.queryParams.createBy = user.userName
// 这三个一块走
this.getList() this.getList()
this.getDeptList() this.getDeptList()
this.getDoctorList() 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