Skip to content

P
pet-business-web
Commit fcb6ca6d authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 5c7fea2f 134eddde
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 81 deletions
src/components/ImageUpload/index.vue
View file @ fcb6ca6d
...@@ -215,6 +215,12 @@ export default { ...@@ -215,6 +215,12 @@ export default {
::v-deep.hide .el-upload--picture-card { ::v-deep.hide .el-upload--picture-card {
display: none; 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-enter-active,
::v-deep .el-list-leave-active { ::v-deep .el-list-leave-active {
......
src/views/banner_management/banner_edit.vue
View file @ fcb6ca6d
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
{ validator: titleTest, trigger: 'blur' } { validator: titleTest, trigger: 'blur' }
], ],
img: [ img: [
{ required: false, message: '请选择轮播图', trigger: 'change' } { required: false, message: '请选择轮播图', trigger: 'blur' }
], ],
url: [ url: [
{ required: false, message: '请输入跳转地址', trigger: 'blur' } { required: false, message: '请输入跳转地址', trigger: 'blur' }
...@@ -143,6 +143,9 @@ export default { ...@@ -143,6 +143,9 @@ export default {
}, },
'form.img'(newVal) { 'form.img'(newVal) {
this.$refs['form'].validateField('img') this.$refs['form'].validateField('img')
if (newVal !== undefined && newVal !== null && newVal !== '') {
this.$refs['form'].clearValidate('img')
}
} }
}, },
created() { created() {
...@@ -163,6 +166,9 @@ export default { ...@@ -163,6 +166,9 @@ export default {
} else { } else {
this.rules.img[0].required = false this.rules.img[0].required = false
} }
if (this.form.img) {
this.$refs['form'].clearValidate()
}
} }
}) })
}, },
......
src/views/document-management/entry-contract/entry-contract.vue
View file @ fcb6ca6d
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span class="title-text" style="font-size: 16px;font-weight: bold;">授权合同</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">授权合同</span>
</div> </div>
<!-- 授权合同表 --> <!-- 授权合同表 -->
<el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;overflow: auto;"> <el-table v-loading="loading" :data="authorizationHistory" style="height: 520px;width: 90%;margin: 0 0 0 60px;overflow: auto;">
<el-table-column prop="createTime" label="授权日期"> <el-table-column prop="createTime" label="授权日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
style="margin: 0 50px 0 0" style="margin: 0 80px 0 0"
@pagination="getContract" @pagination="getContract"
/> />
</div> </div>
......
src/views/equipment-management/use-management/use-details.vue
View file @ fcb6ca6d
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </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> <el-button icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
</div> </div>
</div> </div>
......
src/views/service-management/medical-record-management/check-detail.vue
View file @ fcb6ca6d
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
>详情</span> >详情</span>
<span style="font-size: 16px;position: absolute;right: 160px;padding-top: 5px;">{{ checkDetail.medicalRecordNo }}</span> <span style="font-size: 16px;position: absolute;right: 160px;padding-top: 5px;">{{ checkDetail.medicalRecordNo }}</span>
</div> </div>
<el-form ref="form" :model="checkDetail" label-width="81px"> <el-form ref="form" :model="checkDetail" label-width="96px">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物昵称" label-width="67px"> <el-form-item label="宠物昵称" label-width="84px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<!-- 2 --> <!-- 2 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物性别" label-width="67px"> <el-form-item label="宠物性别" label-width="84px">
<el-select class="input-detail" v-model="checkDetail.petSex" disabled placeholder="暂无数据"> <el-select class="input-detail" v-model="checkDetail.petSex" disabled placeholder="暂无数据">
<el-option <el-option
v-for="item in dict.type.pet_sex" v-for="item in dict.type.pet_sex"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<!-- 3 --> <!-- 3 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物毛色" label-width="67px"> <el-form-item label="宠物毛色" label-width="84px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<!-- 4 --> <!-- 4 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物保险" label-width="67px"> <el-form-item label="宠物保险" label-width="84px">
<el-select class="input-detail" v-model="checkDetail.insure" disabled placeholder="暂无数据"> <el-select class="input-detail" v-model="checkDetail.insure" disabled placeholder="暂无数据">
<el-option <el-option
v-for="item in insureOptions" v-for="item in insureOptions"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠主姓名" label-width="67px"> <el-form-item label="宠主姓名" label-width="84px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<!-- 缴费信息 --> <!-- 缴费信息 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额" label-width="67px"> <el-form-item label="缴费金额" label-width="84px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -216,8 +216,8 @@ ...@@ -216,8 +216,8 @@
</el-col> </el-col>
</el-row> </el-row>
<div style="display: flex;align-items: center;margin-bottom: 10px;"> <div style="display: flex;align-items: center;margin-bottom: 10px;">
<div style="height: 16px;border-left: 3px solid #5bb647;" /> <div style="height: 20px;border-left: 5px solid #5FB54B;" />
<div style="padding-left: 8px;font-size: 16px;font-weight: bold;">预约信息</div> <div style="padding-left: 10px;font-size: 16px;font-weight: bold;">预约信息</div>
<div style="margin-left: auto;padding-right: 50px;"> <div style="margin-left: auto;padding-right: 50px;">
<el-button v-show="checkDetail.deviceId === null" class="fourWordsBtn" @click="bookNow">立即预约</el-button> <el-button v-show="checkDetail.deviceId === null" class="fourWordsBtn" @click="bookNow">立即预约</el-button>
</div> </div>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<!-- 预约信息 --> <!-- 预约信息 -->
<el-row v-show="checkDetail.checkSchedule >= 2"> <el-row v-show="checkDetail.checkSchedule >= 2">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检查类型" label-width="67px"> <el-form-item label="检查类型" label-width="84px">
<el-select class="input-detail" v-model="checkDetail.checkType" disabled placeholder="暂无数据"> <el-select class="input-detail" v-model="checkDetail.checkType" disabled placeholder="暂无数据">
<el-option <el-option
v-for="item in dict.type.check_type" v-for="item in dict.type.check_type"
...@@ -254,15 +254,15 @@ ...@@ -254,15 +254,15 @@
</el-row> </el-row>
<el-row v-show="checkDetail.checkSchedule < 2"> <el-row v-show="checkDetail.checkSchedule < 2">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="暂未预约" label-width="67px"> <el-form-item label="暂未预约" label-width="84px">
<span></span> <span></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div v-show="checkDetail.checkSchedule >= 2"> <div v-show="checkDetail.checkSchedule >= 2">
<div style="display: flex;align-items: center;margin-bottom: 10px;"> <div style="display: flex;align-items: center;margin-bottom: 10px;">
<div style="height: 16px;border-left: 3px solid #5bb647;" /> <div style="height: 20px;border-left: 5px solid #5bb647;" />
<div style="padding-left: 8px;font-size: 16px;font-weight: bold;">检查信息</div> <div style="padding-left: 10px;font-size: 16px;font-weight: bold;">检查信息</div>
<div style="margin-left: auto;padding-right: 50px;"> <div style="margin-left: auto;padding-right: 50px;">
<el-button v-show="checkDetail.checkSchedule >=2 && (checkDetail.shadowReport === null || checkDetail.shadowReport === '')" class="fourWordsBtn" @click="uploadReport">上传报告</el-button> <el-button v-show="checkDetail.checkSchedule >=2 && (checkDetail.shadowReport === null || checkDetail.shadowReport === '')" class="fourWordsBtn" @click="uploadReport">上传报告</el-button>
</div> </div>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
<!-- 检查信息 --> <!-- 检查信息 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检查项目" label-width="67px"> <el-form-item label="检查项目" label-width="84px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
<!-- 2 --> <!-- 2 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检查日期" label-width="67px"> <el-form-item label="检查日期" label-width="84px">
<span>{{ parseTime(checkDetail.checkStartTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(checkDetail.checkStartTime, '{y}/{m}/{d}') }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
<!-- 3 --> <!-- 3 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="影像报告" label-width="67px"> <el-form-item label="影像报告" label-width="84px">
<!-- <span>{{ checkDetail.shadowReport || '暂未上传' }}</span>--> <!-- <span>{{ checkDetail.shadowReport || '暂未上传' }}</span>-->
<el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button> <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>
<span v-show="checkDetail.shadowReport === null || checkDetail.shadowReport === ''">{{ '暂未上传' }}</span> <span v-show="checkDetail.shadowReport === null || checkDetail.shadowReport === ''">{{ '暂未上传' }}</span>
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
@close="closeDialog" @close="closeDialog"
> >
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<el-form ref="file" label-width="120px"> <el-form ref="file">
<el-form-item label="影像报告"> <el-form-item label="影像报告">
<FileUpload v-model="videoReport" :limit="1" :file-size="4" :file-type="['pdf']" :is-show-tip="false" /> <FileUpload v-model="videoReport" :limit="1" :file-size="4" :file-type="['pdf']" :is-show-tip="false" />
</el-form-item> </el-form-item>
......
src/views/service-management/medical-record-management/check-subscribe.vue
View file @ fcb6ca6d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
color: #333333;" color: #333333;"
>立即预约</span>· >立即预约</span>·
</div> </div>
<el-form ref="form" :model="checkDetail" label-width="70px"> <el-form ref="form" :model="checkDetail" label-width="83px">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
</div> </div>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物品种" label-width="81px"> <el-form-item label="宠物品种" label-width="96px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物体重" label-width="81px"> <el-form-item label="宠物体重" label-width="96px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="疫苗情况" label-width="81px"> <el-form-item label="疫苗情况" label-width="96px">
<el-select class="input-detail" v-model="subscribeMessage.vaccineSituation" disabled placeholder="暂无数据"> <el-select class="input-detail" v-model="subscribeMessage.vaccineSituation" disabled placeholder="暂无数据">
<el-option <el-option
v-for="item in dict.type.vaccine_situation" v-for="item in dict.type.vaccine_situation"
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额" label-width="81px"> <el-form-item label="缴费金额" label-width="96px">
<el-input <el-input
class="input-detail" class="input-detail"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
<el-form ref="formDevice" :model="queryParams" label-width="70px"> <el-form ref="formDevice" :model="queryParams" label-width="70px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="设备"> <el-form-item label="设备" label-width="82px">
<el-select v-model="queryParams.device" clearable multiple collapse-tags placeholder="请选择设备" @change="deviceChange"> <el-select v-model="queryParams.device" class="input-detail" clearable multiple collapse-tags placeholder="请选择设备" @change="deviceChange">
<el-option <el-option
v-for="item in selectableDevice" v-for="item in selectableDevice"
:key="item.id" :key="item.id"
...@@ -192,8 +192,9 @@ ...@@ -192,8 +192,9 @@
</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="检查日期" label-width="82px">
<el-date-picker <el-date-picker
class="input-detail"
v-model="queryParams.checkDate" v-model="queryParams.checkDate"
type="date" type="date"
placeholder="请选择检查日期" placeholder="请选择检查日期"
...@@ -204,7 +205,7 @@ ...@@ -204,7 +205,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-show="subscribeMessage.checkType === '2'" :span="8"> <el-col v-show="subscribeMessage.checkType === '2'" :span="8">
<el-form-item label="支出账户余额" label-width="81px"> <el-form-item label="支出账户余额" label-width="96px">
11800.00 11800.00
</el-form-item> </el-form-item>
</el-col> </el-col>
......
src/views/service-management/medical-record-management/medical-record-management.vue
View file @ fcb6ca6d
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
> >
<el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" /> <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="left" /> <el-table-column label="序号" type="index" align="left" />
<el-table-column label="检查类型" align="left" prop="checkType" width="100"> <el-table-column label="检查类型" align="left" prop="checkType" min-width="105">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.check_type" :options="dict.type.check_type"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<span>{{ scope.row.nickname || '-' }}</span> <span>{{ scope.row.nickname || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="联系方式" align="left" :show-overflow-tooltip="true" prop="phonenumber" width="90" /> <el-table-column label="联系方式" align="left" :show-overflow-tooltip="true" prop="phonenumber" min-width="100" />
<el-table-column label="预约兽医" align="left" :show-overflow-tooltip="true" prop="doctorName" /> <el-table-column label="预约兽医" align="left" :show-overflow-tooltip="true" prop="doctorName" />
<el-table-column label="所属科室" align="left" :show-overflow-tooltip="true" prop="doctorDeptName" /> <el-table-column label="所属科室" align="left" :show-overflow-tooltip="true" prop="doctorDeptName" />
<el-table-column label="缴费状态" align="left" :show-overflow-tooltip="true" prop="payType"> <el-table-column label="缴费状态" align="left" :show-overflow-tooltip="true" prop="payType">
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-table-column> </el-table-column>
<el-table-column label="预约状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule"> <el-table-column label="预约状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">未预约</span> <span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">待预约</span>
<span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span> <span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -225,11 +225,12 @@ ...@@ -225,11 +225,12 @@
:close-on-press-escape="false" :close-on-press-escape="false"
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="60px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="设备"> <el-form-item label="设备" label-width="38px">
<el-select <el-select
style="width: 175px"
v-model="form.equipmentIdList" v-model="form.equipmentIdList"
multiple multiple
collapse-tags collapse-tags
...@@ -246,9 +247,10 @@ ...@@ -246,9 +247,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9" label-width="100px">
<el-form-item label="检查日期" prop="checkItemsId"> <el-form-item label="检查日期" prop="checkItemsId">
<el-date-picker <el-date-picker
style="width: 175px"
v-model="form.checkDate" v-model="form.checkDate"
type="date" type="date"
placeholder="请选择检查日期" placeholder="请选择检查日期"
...@@ -258,13 +260,14 @@ ...@@ -258,13 +260,14 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-show="currentCheckType === '2'" :span="7"> <el-col v-show="currentCheckType === '2'" :span="6">
<el-form-item label="支出账户金额" prop="shadowReport" label-width="120"> <el-form-item label="支出账户余额" prop="shadowReport" label-width="120">
1200.00 ￥1200.00
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="dialog-class">
<el-table <el-table
:data="deviceList" :data="deviceList"
style="width: 100%" style="width: 100%"
...@@ -306,6 +309,7 @@ ...@@ -306,6 +309,7 @@
:limit.sync="deviceQueryParams.pageSize" :limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice" @pagination="getDevice"
/> />
</div>
<!-- <div slot="footer" class="dialog-footer">--> <!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>--> <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>--> <!-- <el-button @click="cancel">取 消</el-button>-->
...@@ -798,6 +802,10 @@ export default { ...@@ -798,6 +802,10 @@ export default {
} }
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 0vh !important; margin-top: 12vh !important;
}
.dialog-class {
height: 500px;
overflow-y: auto;
} }
</style> </style>
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