Commit 93e0c3bb authored by 陈明豪's avatar 陈明豪

Merge remote-tracking branch 'origin/master'

parents 073f1f94 2818104a
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13.001" viewBox="0 0 13 13.001"><defs><style>.a{fill:#2aada2;}</style></defs><path class="a" d="M94.467,82.237l-5.029-5.029a1.472,1.472,0,0,0-2.082,0l-5.029,5.029a1.473,1.473,0,0,0,0,2.081l5.029,5.029a1.472,1.472,0,0,0,2.082,0l5.029-5.029a1.473,1.473,0,0,0,0-2.081Zm-4.266,1.6H88.951v1.249a.515.515,0,1,1-1.031,0V83.832H86.672a.515.515,0,1,1,0-1.031H87.92V81.553a.515.515,0,0,1,1.031,0V82.8H90.2a.515.515,0,1,1,0,1.031Z" transform="translate(-81.897 -76.777)"/></svg>
\ No newline at end of file
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
|| $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit || $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit
|| number >= limit}" || number >= limit}"
> >
<i slot="default" class="el-icon-plus"/> <i slot="default" class="el-icon-plus" />
<div slot="file" slot-scope="{file}" class="customer-upload-area"> <div slot="file" slot-scope="{file}" class="customer-upload-area">
<el-image <el-image
v-show="fileList.length > 0" v-show="fileList.length > 0"
...@@ -49,26 +49,26 @@ ...@@ -49,26 +49,26 @@
class="inner_style" class="inner_style"
:src="baseURL+'/tmt-pic/business/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'" :src="baseURL+'/tmt-pic/business/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'"
alt="加载失败" alt="加载失败"
/> >
<div>加载失败</div> <div>加载失败</div>
</div> </div>
</div> </div>
</el-image> </el-image>
<label class="el-upload-list__item-status-label"> <label class="el-upload-list__item-status-label">
<i class="el-icon-upload-success el-icon-check"/> <i class="el-icon-upload-success el-icon-check" />
</label> </label>
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
<span <span
class="el-upload-list__item-preview" class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)" @click="handlePictureCardPreview(file)"
> >
<i class="el-icon-zoom-in"/> <i class="el-icon-zoom-in" />
</span> </span>
<span <span
class="el-upload-list__item-delete" class="el-upload-list__item-delete"
@click="handleDelete(file)" @click="handleDelete(file)"
> >
<i class="el-icon-delete"/> <i class="el-icon-delete" />
</span> </span>
</span> </span>
</div> </div>
......
...@@ -876,8 +876,7 @@ color: #333333;" ...@@ -876,8 +876,7 @@ color: #333333;"
<el-table <el-table
:data="treatManageBo" :data="treatManageBo"
:header-cell-style="{ background:'#F4F4F4'}" :header-cell-style="{ background:'#F4F4F4'}"
>
>
<el-table-column align="left" label="治疗类型" prop="treatItemsType"> <el-table-column align="left" label="治疗类型" prop="treatItemsType">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -1064,8 +1063,7 @@ color: #333333;" ...@@ -1064,8 +1063,7 @@ color: #333333;"
ref="inHospitalForm" ref="inHospitalForm"
:data="petInHospitalList" :data="petInHospitalList"
:header-cell-style="{ background:'#F4F4F4'}" :header-cell-style="{ background:'#F4F4F4'}"
>
>
<el-table-column align="left" label="病情等级" prop="diseaseLevel"> <el-table-column align="left" label="病情等级" prop="diseaseLevel">
<template slot-scope="scope"> <template slot-scope="scope">
<sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn> <sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn>
......
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
class="el-button--primary--solid" class="el-button--primary--solid"
type="primary" type="primary"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;"/>编辑 ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif; font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
font-weight: bold; font-weight: bold;
color: #333333;" color: #333333;"
>立即预约</span>· >立即预约</span>
</div> </div>
<el-form ref="form" :model="checkDetail" label-width="5.3rem"> <el-form ref="form" :model="checkDetail" label-width="5.3rem">
<div class="title-paragraph"> <div class="title-paragraph">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div v-if="docList.length>0" class="doctor-card"> <div v-if="docList.length>0" class="doctor-card">
<!--标签--> <!--标签-->
<div class="progress-tip"> <div class="progress-tip">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-content" class="tip-content"
>挂号信息 >挂号信息
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</div> </div>
</div> </div>
<!--分割线--> <!--分割线-->
<div class="divider"/> <div class="divider" />
<!--卡片中间部分--> <!--卡片中间部分-->
<div class="mid-bottom-framework"> <div class="mid-bottom-framework">
<div <div
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
> >
<div class="detail" @click="doctorDetail(item.id)"> <div class="detail" @click="doctorDetail(item.id)">
<div class="detail-img"> <div class="detail-img">
<el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')" />
</div> </div>
<el-button <el-button
type="text" type="text"
...@@ -142,14 +142,14 @@ ...@@ -142,14 +142,14 @@
<!--给它传一个userId,一个类型--> <!--给它传一个userId,一个类型-->
<div class="register" @click="registration(item.userId,'0',item,0)"> <div class="register" @click="registration(item.userId,'0',item,0)">
<div class="register-img"> <div class="register-img">
<el-image :src="item.registered === '0' ? require('@/assets/register/xinzengguahao_guahaohui@2x.png') : require('@/assets/register/xinzengguahao_guahaolan@2x.png')"/> <el-image :src="item.plusSign === '0' ? require('@/assets/register/xinzengguahao_guahaohui.png') : require('@/assets/register/xinzengguahao_guahaolan@2x.png')" />
</div> </div>
<el-button type="text" :disabled="item.registered === '0'">挂号</el-button> <el-button type="text" :class="item.plusSign === '0'?'add_show':'add_hidden'">挂号</el-button>
</div> </div>
<!--给它传一个userId,一个类型和一个默认页数--> <!--给它传一个userId,一个类型和一个默认页数-->
<div class="add"> <div class="add">
<div class="add-img"> <div class="add-img">
<el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
</div> </div>
<el-button v-if="item.plusSign === '0'" type="text" :disabled="item.plusSign === '1'" @click="registration(item.userId, '1',item,0)"> <el-button v-if="item.plusSign === '0'" type="text" :disabled="item.plusSign === '1'" @click="registration(item.userId, '1',item,0)">
加号 加号
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<div v-else class="doctor-card"> <div v-else class="doctor-card">
<!--标签--> <!--标签-->
<div class="progress-tip"> <div class="progress-tip">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-content" class="tip-content"
>挂号信息 >挂号信息
...@@ -185,7 +185,7 @@ border: 1px solid #E5E5E5; ...@@ -185,7 +185,7 @@ border: 1px solid #E5E5E5;
flex-direction: column;margin-top: 9%;" flex-direction: column;margin-top: 9%;"
> >
<div style=" width:115px;height: 74px;"> <div style=" width:115px;height: 74px;">
<el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')"/> <el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')" />
</div> </div>
<div <div
style="font-size: 14px; style="font-size: 14px;
...@@ -505,16 +505,6 @@ export default { ...@@ -505,16 +505,6 @@ export default {
height: 13px; height: 13px;
margin-top: 11px; margin-top: 11px;
} }
::v-deep .el-button--text {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #3490CE;
}
::v-deep .is-disabled {
color: #C9C9C9;
}
} }
//加号 //加号
...@@ -545,4 +535,18 @@ export default { ...@@ -545,4 +535,18 @@ export default {
padding: unset !important; padding: unset !important;
} }
/*加号的样式-加号显示*/
.add_show{
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #2AADA2;
}
/*加号的样式-加号隐藏*/
.add_hidden{
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #3490CE;
}
</style> </style>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-tooltip class="item" effect="dark" :content="getSallNum(singleItem)" placement="top"> <el-tooltip class="item" effect="dark" :content="getSallNum(singleItem)" placement="top">
<img :src="questIcon" /> <img :src="questIcon" >
</el-tooltip> </el-tooltip>
</div> </div>
<div> <div>
......
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