Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web
This commit is contained in:
commit
0c2957ce04
|
|
@ -53,10 +53,11 @@
|
|||
<GoodsDetail v-model="formData.goodsDetail" :status="formData.status == 0"
|
||||
@totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1"></GoodsDetail>
|
||||
</div>
|
||||
<div class="bottom">
|
||||
<TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status ==0" @openSettlement="charge" @openCheckOut ="openCheckoutDetail(formData.goodsDetail,formData.patientRegistration.psnNo)"></TotalPrice>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
<div class="bottom">
|
||||
<TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status ==0" @openSettlement="charge"
|
||||
@openCheckOut="openCheckoutDetail(formData.goodsDetail,formData.patientRegistration.psnNo)"></TotalPrice>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right">
|
||||
<div class="top">
|
||||
|
|
|
|||
|
|
@ -9,13 +9,14 @@
|
|||
</div>
|
||||
<div class="left-bottom">
|
||||
<Panel title="医生列表">
|
||||
<div class="search" style="padding: 0 24px ;height: 42px">
|
||||
<div class="panel-content" style="display: flex;flex-direction: column;height: 100%">
|
||||
<div class="search">
|
||||
<el-input style="height: 100%" v-model="keyword" placeholder="搜索医生姓名"
|
||||
@keydown.enter="initDoctor" :prefix-icon="Search"></el-input>
|
||||
</div>
|
||||
<div class="content_list" style="padding: 0 24px">
|
||||
<div class="role_list">
|
||||
<ul>
|
||||
<ul class="role_list">
|
||||
<el-scrollbar style="height: 100%">
|
||||
<li v-for="(item, index) in roleList" :key="index"
|
||||
:class="{active:isShowNum==index}">
|
||||
<span class="name">{{ item.name }}</span>
|
||||
|
|
@ -23,17 +24,19 @@
|
|||
<span class="btn" @click="openDialog(item,index)"
|
||||
@mouseover="isShowNum = index"
|
||||
@mouseleave="isShowNum = -1">
|
||||
<img v-if="isShowNum==index" src="/static/images/registration/3-active.png" style="width: 15px;height: 14px;margin-right: 8px" alt="">
|
||||
<img v-else src="/static/images/registration/3.png" alt="" style="width: 15px;height: 14px;margin-right: 8px">
|
||||
<img v-if="isShowNum==index" src="/static/images/registration/3-active.png"
|
||||
style="width: 15px;height: 14px;margin-right: 8px" alt="">
|
||||
<img v-else src="/static/images/registration/3.png" alt=""
|
||||
style="width: 15px;height: 14px;margin-right: 8px">
|
||||
挂号
|
||||
</span>
|
||||
</li>
|
||||
</el-scrollbar>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</Panel>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="right">
|
||||
<Panel title="挂号列表">
|
||||
|
|
@ -183,8 +186,25 @@ const reset=() =>{
|
|||
flex: 1;
|
||||
min-height: 0;
|
||||
margin-top: 20px;
|
||||
|
||||
.panel-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.search {
|
||||
padding: 0 24px;
|
||||
height: 42px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.content_list {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
margin-top: 10px;
|
||||
|
||||
.role_list {
|
||||
height: 100%;
|
||||
|
||||
li {
|
||||
height: 50px;
|
||||
display: flex;
|
||||
|
|
@ -222,6 +242,7 @@ const reset=() =>{
|
|||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&:hover {
|
||||
background: #4D6DE4;
|
||||
color: #FFF;
|
||||
|
|
@ -231,14 +252,6 @@ const reset=() =>{
|
|||
|
||||
}
|
||||
|
||||
.search {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.content_list {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.active {
|
||||
background: #4D6DE4;
|
||||
|
||||
|
|
@ -255,6 +268,11 @@ const reset=() =>{
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.right {
|
||||
margin-left: 20px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue