Skip to content

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

Merge remote-tracking branch 'origin/master'

parents c6bbcfd2 2e486f29
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 105 deletions
src/assets/styles/element-ui.scss
View file @ e788dc4e
......@@ -426,8 +426,21 @@ input::-webkit-input-placeholder {
// 分頁
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #5FB54B;
color: #FFFFFF;
background: #F2F9F0;
opacity: 1;
border: 1px solid #5FB54B;
color: #5FB54B;
}
.el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li{
font-size: 13px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #666666;
background: #F4F4F4;
border-radius: 4px 4px 4px 4px;
}
.el-pagination.is-background .btn-prev:hover, .el-pagination.is-background .btn-next:hover, .el-pagination.is-background .el-pager li:not(.disabled):hover{
color: #5FB54B;
}
.el-pagination__sizes .el-input .el-input__inner:hover {
......@@ -498,3 +511,38 @@ input::-webkit-input-placeholder {
.el-tooltip__popper {
max-width: 50%
}
// el-table样式修改
.el-tabs--top .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2) {
padding-left: 20px!important;
}
.el-tabs--top .el-tabs__item.is-top:last-child, .el-tabs--top .el-tabs__item.is-bottom:last-child, .el-tabs--bottom .el-tabs__item.is-top:last-child, .el-tabs--bottom .el-tabs__item.is-bottom:last-child {
padding-right: 20px!important;
}
.el-tabs__nav{
.el-tabs__item.is-active{
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #5FB54B;
}
.el-tabs__active-bar{
background-color: #5FB54B;
}
.el-tabs__item:hover {
color: #5FB54B;
}
}
// 弹出框x按钮大小修改
.el-message-box .el-message-box__close {
font-size: 16px;
}
.el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close {
color: #fff;
}
// 点击图片上传，弹出文件夹之后，点取消，颜色
.el-upload:focus {
border-color: #5FB54B;
color: #5FB54B;
}
src/components/ImageUpload/index.vue
View file @ e788dc4e
......@@ -215,6 +215,12 @@ export default {
::v-deep.hide .el-upload--picture-card {
display: none;
}
::v-deep .el-upload-list--picture-card {
line-height: 0;
}
::v-deep .el-upload-list__item {
margin: 0 0.5rem 0 0 !important;
}
// 去掉动画效果
::v-deep .el-list-enter-active,
::v-deep .el-list-leave-active {
......
src/views/article-management/article-management.vue
View file @ e788dc4e
......@@ -109,7 +109,7 @@
ref="table"
v-loading="loading"
:data="articleList"
:header-cell-style="{background:'#e5e5e5'}"
:header-cell-style="{background:'#F4F4F4'}"
row-key="id"
@selection-change="handleSelectionChange"
>
......
src/views/banner_management/banner_add.vue
View file @ e788dc4e
......@@ -110,15 +110,14 @@ export default {
{ validator: titleTest, trigger: 'blur' }
],
img: [
{ required: false, message: '请选择轮播图', trigger: 'change' }
{ required: false, message: '请选择轮播图', trigger: ['change', 'blur'] }
],
url: [
{ required: false, message: '请输入跳转地址', trigger: 'blur' }
],
sort: [
{ required: true, message: '请输入权重', trigger: 'blur' },
{ validator: checkSort, trigger: 'blur' },
{ validator: checkSort, trigger: 'change' }
{ validator: checkSort, trigger: ['blur', 'change'] }
],
status: [
{ required: false, message: '请选择轮播状态', trigger: 'blur' }
......@@ -136,6 +135,9 @@ export default {
} else {
this.rules.img[0].required = false
}
},
'form.img'(newVal) {
this.$refs['form'].validateField('img')
}
},
created() {
......
src/views/banner_management/banner_detail.vue
View file @ e788dc4e
......@@ -17,7 +17,7 @@
<ImagePreview :height="100" :src="baseUrl + form.img" :width="100" />
</el-form-item>
<el-form-item label="跳转地址：" prop="url">
<el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="30" show-word-limit clearable disabled />
<el-input v-model="form.url" class="form-input" style="width: 420px" maxlength="30" show-word-limit clearable disabled />
</el-form-item>
<el-form-item label="权重：" prop="sort">
<el-input-number
......@@ -47,7 +47,7 @@
</span>
</el-form-item>
<el-form-item label="备注：" prop="notes">
<el-input disabled v-model.trim="form.notes" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />
<el-input v-model.trim="form.notes" disabled class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />
</el-form-item>
<el-form-item>
<el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
......@@ -94,6 +94,12 @@ export default {
if (res.code === 200) {
this.form = res.data
this.srcList.push(this.baseUrl + this.form.img)
if (this.form.url === undefined || this.form.url === null || this.form.url === '') {
this.form.url = '暂无数据'
}
if (this.form.notes === undefined || this.form.notes === null || this.form.notes === '') {
this.form.notes = '暂无数据'
}
}
})
},
......
src/views/banner_management/banner_edit.vue
View file @ e788dc4e
......@@ -115,15 +115,14 @@ export default {
{ validator: titleTest, trigger: 'blur' }
],
img: [
{ required: false, message: '请选择轮播图', trigger: 'change' }
{ required: false, message: '请选择轮播图', trigger: 'blur' }
],
url: [
{ required: false, message: '请输入跳转地址', trigger: 'blur' }
],
sort: [
{ required: true, message: '请输入权重', trigger: 'blur' },
{ validator: checkSort, trigger: 'blur' },
{ validator: checkSort, trigger: 'change' }
{ validator: checkSort, trigger: ['blur', 'change'] }
],
status: [
{ required: false, message: '请选择轮播状态', trigger: 'blur' }
......@@ -141,6 +140,12 @@ export default {
} else {
this.rules.img[0].required = false
}
},
'form.img'(newVal) {
this.$refs['form'].validateField('img')
if (newVal !== undefined && newVal !== null && newVal !== '') {
this.$refs['form'].clearValidate('img')
}
}
},
created() {
......@@ -161,6 +166,9 @@ export default {
} else {
this.rules.img[0].required = false
}
if (this.form.img) {
this.$refs['form'].clearValidate()
}
}
})
},
......
src/views/banner_management/banner_management.vue
View file @ e788dc4e
......@@ -27,9 +27,9 @@
<el-form-item prop="status">
<el-select v-model.trim="queryParams.status" clearable placeholder="状态">
<el-option
v-for="item in dict.type.banner_status"
v-for="item in bannerStatus"
:key="item.value"
:label="item.label.substring(0)"
:label="item.label"
:value="item.value"
/>
</el-select>
......@@ -212,10 +212,10 @@ export default {
},
// 轮播图状态下拉框
imgStatus: [
// {
// label: '全部',
// value: 'all'
// },
{
label: '全部',
value: ''
},
{
label: '已上传',
value: 'y'
......@@ -225,6 +225,20 @@ export default {
value: 'n'
}
],
bannerStatus: [
{
label: '全部',
value: ''
},
{
label: '已发布',
value: '1'
},
{
label: '未发布',
value: '2'
}
],
// 表单参数
form: {},
// 表单校验
......
src/views/equipment-management/use-management/use-details.vue
View file @ e788dc4e
......@@ -308,7 +308,7 @@
</el-row>
</el-form>
</div>
<div style="padding-left: 150px;width: 90%;padding-bottom: 20px;;text-align: center;">
<div style="padding-left: 150px;width: 90%;padding-bottom: 20px;">
<el-button icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
</div>
</div>
......
src/views/medical-record-management/medical-edit.vue
View file @ e788dc4e
......@@ -206,7 +206,7 @@ color: #333333;"
v-model="detailInfo.insure"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请选择宠物保险情况' : '暂无数据'"
:placeholder="isEdit? '请选择宠物是否已购保险' : '暂无数据'"
style="width: 100%"
>
<el-option
......@@ -395,6 +395,7 @@ color: #333333;"
maxlength="400"
:placeholder="isEdit? '请输入患者主诉' : '暂无数据'"
type="textarea"
show-word-limit
style="width: 85% !important"
/>
</el-form-item>
......@@ -403,6 +404,7 @@ color: #333333;"
<el-form-item label="医嘱" prop="doctorAdvice">
<el-input
v-model="detailInfo.doctorAdvice"
show-word-limit
:disabled="!isEdit"
maxlength="200"
:placeholder="isEdit? '请输入医嘱' : '暂无数据'"
......@@ -415,6 +417,7 @@ color: #333333;"
<el-form-item label="诊断结果" prop="diagnosisResult">
<el-input
v-model="detailInfo.diagnosisResult"
show-word-limit
:disabled="!isEdit"
maxlength="30"
:placeholder="isEdit? '请输入诊断结果' : '暂无数据'"
......@@ -445,7 +448,7 @@ color: #333333;"
<!-- 内部信息 -->
<div class="table-content">
<el-form ref="drugForm" :model="drugForm" :rules="drugRules" class="demo-ruleForm" label-width="0">
<el-table :data="petProtect" :header-cell-style="{ background:'#e5e5e5'}" border>
<el-table :data="petProtect" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="药品名称" prop="protectName">
<template slot-scope="scope">
<el-form-item
......@@ -560,7 +563,7 @@ color: #333333;"
<el-table
:data="checkManageBos"
class="check-manage-bos__table"
:header-cell-style="{ background:'#e5e5e5'}"
:header-cell-style="{ background:'#F4F4F4'}"
border
>
<el-table-column align="center" label="检查类型" prop="checkType">
......@@ -739,7 +742,7 @@ color: #333333;"
<el-table
:data="treatManageBo"
class="treat-manage-bo__table"
:header-cell-style="{ background:'#e5e5e5'}"
:header-cell-style="{ background:'#F4F4F4'}"
border
>
<el-table-column align="center" label="治疗项目" prop="treatItemsName">
......@@ -868,7 +871,7 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-table :data="petProtect" :header-cell-style="{ background:'#e5e5e5'}" border>
<el-table :data="petProtect" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="入院日期" prop="protectName" />
<el-table-column align="center" label="住院天数" prop="type" />
<el-table-column align="center" label="病情等级" prop="date" />
......@@ -930,7 +933,7 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-table :data="petProtect" :header-cell-style="{ background:'#e5e5e5'}" border>
<el-table :data="petProtect" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="收费项" prop="protectName" />
<el-table-column align="center" label="明细" prop="type" />
<el-table-column align="center" label="数目" prop="date" />
......@@ -1036,7 +1039,7 @@ export default {
],
// 绝育情况非空校验
sterilizationStatus: [
{ required: true, message: '请选择绝育情况', trigger: 'change' }
{ required: true, message: '请选择宠物绝育情况', trigger: 'change' }
],
// 疫苗情况非空校验
vaccineSituation: [
......@@ -1044,7 +1047,7 @@ export default {
],
// 保险情况非空校验
insure: [
{ required: true, message: '请选择保险情况', trigger: 'change' }
{ required: true, message: '请选择宠物是否已购保险', trigger: 'change' }
],
// 主诉非空校验
mainSuit: [
......@@ -1163,15 +1166,15 @@ export default {
// 品种数据字典
options: [{
value: '0',
label: '猫',
label: '宠物猫',
children: []
}, {
value: '1',
label: '狗',
label: '宠物狗',
children: []
}, {
value: '2',
label: '其它',
label: '异宠类',
children: []
}],
// 图片访问
......@@ -1284,10 +1287,25 @@ export default {
'petBirthday': this.detailInfo.petBirthday,
'followStatus': this.detailInfo.followStatus
}
console.log('RRRRRRRRRR', temp)
editRecord(temp).then(res => {
console.log('editRecord', res)
this.$router.push('/medical-record-management/index')
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()
})
},
// 设置当前行检查名称
......
src/views/medical-record-management/medical-record-management.vue
View file @ e788dc4e
......@@ -114,7 +114,7 @@
ref="table"
v-loading="loading"
:data="recordList"
:header-cell-style="{background:'#e5e5e5'}"
:header-cell-style="{background:'#F4F4F4'}"
@select="selectChange"
@selection-change="handleSelectionChange"
>
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ e788dc4e
<template>
<el-dialog :close-on-click-modal="false" 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>
......@@ -40,30 +48,30 @@
ref="table"
v-loading="loading"
:data="petsList"
:header-cell-style="{background:'#e5e5e5'}"
:header-cell-style="{background:'#F4F4F4'}"
border
:header-cell-class-name="cellClass"
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column align="center" min-width="30" reserve-selection type="selection" />
<el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column align="center" label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
<el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.ownerName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="手机号" min-width="80" prop="phone" show-overflow-tooltip>
<el-table-column label="手机号" min-width="80" prop="phone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.phone || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
<el-table-column label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.membershipLevel || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>
<el-table-column label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.balance || '-' }}</span>
</template>
......@@ -81,7 +89,6 @@
<!-- show-overflow-tooltip-->
<!-- />-->
<el-table-column
align="center"
label="宠物品种"
prop="petBreed"
>
......@@ -89,10 +96,9 @@
{{ scope.row.petBreed }}/{{ scope.row.petChildBreed }}
</template>
</el-table-column>
<el-table-column align="center" label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
<el-table-column label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
<template slot-scope="scope">
<i v-if="scope.row.petSex === '0'" class="el-icon-male" />
<i v-else-if="scope.row.petSex === '1'" class="el-icon-female" />
<dict-tag :options="dict.type.pet_sex" :value="scope.row.petSex" />
</template>
</el-table-column>
</el-table>
......@@ -114,9 +120,10 @@
<script>
import { getPetInfo } from '@/api/business/registration'
import { deepClone } from '@/utils'
export default {
// 数据字典
dicts: ['pet_breed', 'cat_breed', 'dog_breed', 'other_breed'],
dicts: ['pet_sex', 'pet_breed', 'cat_breed', 'dog_breed', 'other_breed'],
name: 'ChoosePet',
props: {
isShow: {
......@@ -160,15 +167,15 @@ export default {
},
options: [{
value: '0',
label: '猫',
label: '宠物猫',
children: []
}, {
value: '1',
label: '狗',
label: '宠物狗',
children: []
}, {
value: '2',
label: '其它',
label: '异宠类',
children: []
}]
}
......@@ -252,8 +259,8 @@ export default {
</script>
<style lang="scss" scoped>
.pet-choose-modle{
.basicInformation{
.pet-choose-modle {
.basicInformation {
.title {
//border-bottom: 1px solid #EFEFEF;
color: #333333;
......@@ -263,15 +270,16 @@ export default {
flex: 1;
position: relative;
margin-bottom: 5px;
&::before {
content: '';
display: block;
background-color: #5FB54B;
position: absolute;
left: -13px;
top: -4px;
bottom: -2px;
width: 3px;
content: '';
display: block;
background-color: #5FB54B;
position: absolute;
left: -13px;
top: -4px;
bottom: -2px;
width: 3px;
}
}
}
......
src/views/service-management/registration-queue/components/doctor-detail.vue
View file @ e788dc4e
......@@ -9,7 +9,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name" label="医生ID:">
<el-input v-model="doctorForm.id" :disabled="true" maxlength="20" />
<el-input v-model="doctorForm.ruleId" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -29,7 +29,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name" label="当前诊位:">
<el-input v-model="doctorForm.consultingRoom" :disabled="true" maxlength="20" />
<el-input v-model="doctorForm.positionName" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="24">
......
src/views/service-management/registration-queue/components/prescribing-modle.vue
View file @ e788dc4e
......@@ -4,7 +4,7 @@
<!-- 标题区域-->
<div class="prescribing-head">
<div class="prescribing-title">
{{ name }}处方单
{{ registerForm.hospitalName }}处方单
</div>
<!-- 处方单号-->
<div class="prescribing-no">
......@@ -18,7 +18,7 @@
<el-input
v-model="registerForm.petNickname"
disabled
placeholder="请输入宠物昵称"
placeholder="暂无数据"
/>
</el-form-item>
</el-col>
......@@ -28,7 +28,7 @@
v-model="registerForm.petSex"
:disabled="true"
clearable
placeholder="请选择宠物性别"
placeholder="暂无数据"
style="width: 100%"
>
<el-option
......@@ -42,33 +42,33 @@
</el-col>
<el-col :span="8">
<el-form-item label="宠物年龄" prop="petAge">
<el-input v-model="registerForm.petAge" :disabled="true" maxlength="20" />
<el-input v-model="registerForm.petAge" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物品种" prop="petBreed" class="petBreed">
<el-input v-model="registerForm.petBreed" disabled />
<el-input v-model="registerForm.petChildBreed" class="petChildBreed" disabled />
<el-input v-model="registerForm.petBreed" placeholder="暂无数据" disabled />
<el-input v-model="registerForm.petChildBreed" placeholder="暂无数据" class="petChildBreed" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="体重" prop="petWeight">
<el-input v-model="registerForm.petWeight" :disabled="true" maxlength="20" />
<el-input v-model="registerForm.petWeight" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="诊断时间" prop="visitDate">
<el-input v-model="defaultValue.date" :disabled="true" maxlength="20">-</el-input>
<el-input v-model="registerForm.reportTime" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠主姓名" prop="nickName">
<el-input v-model="registerForm.petOwnerBo.nickName" :disabled="true" maxlength="20" />
<el-input v-model="registerForm.petOwnerBo.nickName" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="phoneNumber">
<el-input v-model="registerForm.petOwnerBo.phoneNumber" :disabled="true" maxlength="20" />
<el-input v-model="registerForm.petOwnerBo.phoneNumber" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -78,7 +78,7 @@
"
:disabled="true"
clearable
placeholder="请选择宠物保险情况"
placeholder="暂无数据"
style="width: 100%"
>
<el-option
......@@ -101,12 +101,12 @@
<el-col :span="8">
<el-form-item label="科室" prop="hospitalDepartmentName">
<el-input v-model="registerForm.hospitalDepartmentName" :disabled="true" maxlength="20" />
<el-input v-model="registerForm.hospitalDepartmentName" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="诊位" prop="visitLocation">
<el-input v-model="registerForm.visitLocation" :disabled="true" maxlength="20" />
<el-input v-model="registerForm.visitLocation" placeholder="暂无数据" :disabled="true" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -115,7 +115,7 @@
v-model="visitForm.mainSuit"
disabled
maxlength="400"
placeholder="请输入患者主诉"
placeholder="暂无数据"
type="textarea"
/>
</el-form-item>
......@@ -126,14 +126,14 @@
v-model="visitForm.doctorAdvice"
disabled
maxlength="200"
placeholder="请输入医嘱"
placeholder="暂无数据"
type="textarea"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="诊断结果">
<el-input v-model="visitForm.diagnosisResult" disabled maxlength="30" placeholder="请输入诊断结果" />
<el-input v-model="visitForm.diagnosisResult" disabled maxlength="30" placeholder="暂无数据" />
</el-form-item>
</el-col>
<!-- 开药模块--后续开发 -->
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ e788dc4e
......@@ -34,7 +34,7 @@
ref="table"
:data="petsList"
:header-cell-class-name="cellClass"
:header-cell-style="{background:'#e5e5e5'}"
:header-cell-style="{background:'#F4F4F4'}"
border
row-key="id"
@selection-change="handleSelectionChange"
......
src/views/service-management/registration-queue/registration-add.vue
View file @ e788dc4e
......@@ -46,12 +46,12 @@
</el-col>
<el-col :span="8">
<el-form-item class="petBreed" label="宠物品种:" prop="petBreed">
<el-form-item prop="petBreed">
<el-form-item>
<el-select
v-model="form.petBreedId"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请输入主品种' : '暂无数据'"
:placeholder="isEdit? '请选择主品种' : '暂无数据'"
style="width: 100%"
@change="changePetBreedId"
>
......@@ -66,7 +66,7 @@
v-model="form.petChildBreedId"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请输入子品种' : '暂无数据'"
:placeholder="isEdit? '请选择子品种' : '暂无数据'"
style="width: 100%"
class="petChildBreed"
@change="changePetChildBreedId"
......@@ -159,7 +159,7 @@
v-model="form.vaccineSituation"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请选择疫苗情况' : '暂无数据'"
:placeholder="isEdit? '请选择宠物疫苗情况' : '暂无数据'"
style="width: 100%"
>
<el-option
......@@ -177,7 +177,7 @@
v-model="form.insure"
:disabled="!isEdit"
clearable
:placeholder="isEdit? '请选择宠物保险' : '暂无数据'"
:placeholder="isEdit? '请选择宠物是否已购保险' : '暂无数据'"
style="width: 100%"
>
<el-option
......@@ -370,12 +370,16 @@ export default {
rules: {
// 宠物昵称非空校验
petNickname: [
{ required: true, message: '请选择宠物昵称', trigger: 'change' }
{ required: true, message: '请输入宠物昵称', trigger: 'change' }
],
// 宠物性别非空校验
petSex: [
{ required: true, message: '请选择宠物性别', trigger: 'change' }
],
// 宠物父级品种非空校验
petBreed: [
{ required: true, message: '请选择宠物品种', trigger: 'change' }
],
// 宠物生日非空校验
petBirthday: [
{ required: true, message: '请选择宠物生日', trigger: 'change' }
......@@ -387,15 +391,15 @@ export default {
],
// 绝育情况非空校验
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: [
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ e788dc4e
......@@ -205,7 +205,7 @@ color: #333333;"
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建时间">
<el-form-item label="创建日期">
<span class="content-style">
<el-date-picker
v-model="detailInfo.petOwnerBo.createTime"
......@@ -214,6 +214,7 @@ color: #333333;"
placeholder="暂无数据"
type="date"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd"
/>
</span>
</el-form-item>
......@@ -305,6 +306,7 @@ color: #333333;"
disabled
type="date"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd HH:mm:ss"
/>
</el-form-item>
</el-col>
......@@ -333,6 +335,7 @@ color: #333333;"
placeholder="暂无数据"
type="date"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd"
/>
</el-form-item>
</el-col>
......@@ -377,6 +380,7 @@ color: #333333;"
type="date"
placeholder="暂无数据"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd HH:mm:ss"
/>
</el-form-item>
</el-col>
......@@ -415,6 +419,7 @@ color: #333333;"
placeholder="暂无数据"
type="date"
value-format="yyyy-MM-dd"
format="yyyy/MM/dd HH:mm:ss"
/>
</el-form-item>
</el-col>
......@@ -440,6 +445,7 @@ color: #333333;"
<el-input
v-model="visitForm.mainSuit"
maxlength="400"
show-word-limit
placeholder="请输入患者主诉"
type="textarea"
/>
......@@ -459,6 +465,7 @@ color: #333333;"
>
<el-input
v-model.trim="visitForm.doctorAdvice"
show-word-limit
maxlength="200"
placeholder="请输入医嘱"
type="textarea"
......@@ -479,6 +486,7 @@ color: #333333;"
>
<el-input
v-model.trim="visitForm.diagnosisResult"
show-word-limit
maxlength="30"
placeholder="请输入诊断结果"
style="width: 90% !important"
......@@ -634,15 +642,15 @@ export default {
// 品种数据字典
options: [{
value: '0',
label: '猫',
label: '宠物猫',
children: []
}, {
value: '1',
label: '狗',
label: '宠物狗',
children: []
}, {
value: '2',
label: '其它',
label: '异宠类',
children: []
}],
// 图片访问
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ e788dc4e
......@@ -78,16 +78,14 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
class="fourWordsBtn"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增挂号
</el-button>
</el-col>
<el-row class="mb8">
<el-button
class="fourWordsBtn"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增挂号
</el-button>
<!--选择全部-->
<el-button
class="fourWordsBtn"
......@@ -119,7 +117,7 @@
<el-table
ref="table"
v-loading="loading"
:header-cell-style="{background:'#e5e5e5'}"
:header-cell-style="{background:'#F4F4F4'}"
:data="registerList"
@select="selectChange"
@selection-change="handleSelectionChange"
......@@ -196,7 +194,6 @@
plain
size="mini"
style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
:disabled="scope.row.isAdd === '1'"
type="warning"
@click="handleDetail(scope.row, 'enter')"
>录入诊断
......
src/views/tool/gen/index.vue
View file @ e788dc4e
......@@ -17,11 +17,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="创建日期">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
value-format="yyyy/MM/dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
......
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