Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 63f8efad 5aed2a10
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 152 deletions
src/views/equipment-management/use-management/use-details.vue
View file @ d5a2e595
...@@ -84,8 +84,7 @@ ...@@ -84,8 +84,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item > <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="下午开始时间">
......
src/views/equipment-management/use-management/use-management.vue
View file @ d5a2e595
...@@ -82,37 +82,39 @@ ...@@ -82,37 +82,39 @@
</el-row> </el-row>
<el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" @select-all="selectAll($event, false)"> <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" @select-all="selectAll($event, false)">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" width="50" /> <el-table-column type="index" label="序号" width="50" />
<el-table-column label="设备ID" align="left" prop="deviceId" /> <el-table-column label="设备ID" align="left" prop="deviceId" />
<el-table-column label="检查项目" align="left" prop="checkItemsName" :show-overflow-tooltip="true"/> <el-table-column label="检查项目" align="left" prop="checkItemsName" :show-overflow-tooltip="true" />
<el-table-column label="宠物昵称" align="left" prop="petNickname" :show-overflow-tooltip="true"/> <el-table-column label="宠物昵称" align="left" prop="petNickname" :show-overflow-tooltip="true" />
<el-table-column label="宠物保险" align="left" prop="insure" :show-overflow-tooltip="true"> <el-table-column label="宠物保险" align="left" prop="insure" :show-overflow-tooltip="true">
<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 label="宠主姓名" align="left" prop="ownerNikename"/> <el-table-column label="宠主姓名" align="left" prop="ownerNikename" />
<el-table-column label="宠主手机号" align="left" prop="phoneNumber"/> <el-table-column label="宠主手机号" align="left" prop="phoneNumber" />
<el-table-column label="检查日期" align="left" prop="checkStartTime" > <el-table-column label="检查日期" align="left" prop="checkStartTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查时间" align="left" prop="deviceName" > <el-table-column label="检查时间" align="left" prop="deviceName" />
</el-table-column>
<el-table-column label="缴费金额" align="left" prop="payAmount" /> <el-table-column label="缴费金额" align="left" prop="payAmount" />
<el-table-column label="设备当前状态" align="left" prop="status" > <el-table-column label="设备当前状态" align="left" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.status === '1'" v-if="scope.row.status === '1'"
style="color: #5FB54B;">{{ showStatus(scope.row.status) || '-' }}</span> style="color: #5FB54B;"
<span >{{ showStatus(scope.row.status) || '-' }}</span>
v-else-if="scope.row.status === '2'" <span
style="color: #FF9D4E;">{{ showStatus(scope.row.status) || '-' }}</span> v-else-if="scope.row.status === '2'"
<span style="color: #FF9D4E;"
v-else >{{ showStatus(scope.row.status) || '-' }}</span>
style="color: #DB4747;">{{ showStatus(scope.row.status) || '-' }}</span> <span
v-else
style="color: #DB4747;"
>{{ showStatus(scope.row.status) || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="left" class-name="small-padding fixed-width"> <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
......
src/views/service-management/registration-queue/components/doctor-card.vue
View file @ d5a2e595
...@@ -52,19 +52,18 @@ ...@@ -52,19 +52,18 @@
<!--分割线--> <!--分割线-->
<div class="divider" /> <div class="divider" />
<!--卡片中间部分--> <!--卡片中间部分-->
<div> <div class="mid-bottom-framework">
<el-image <div
v-for=" progressi in 2" v-for=" progressi in 2"
:key="progressi" :key="progressi"
fit="cover" class="mid-bottom"
src="http://114.67.241.140:8090/profile/upload/2023/05/10/dog1_20230510063813A013.png" >
style="width: 32px; <el-image
height: 32px; class="mid-bottom-inner"
background: #EEEEEE; fit="cover"
margin-right: 12px; src="http://114.67.241.140:8090/profile/upload/2023/05/10/dog1_20230510063813A013.png"
margin-bottom: 15px; />
border-radius: 2px 2px 2px 2px;" </div>
/>
</div> </div>
<!--卡片下半部分--> <!--卡片下半部分-->
<div class="bottom"> <div class="bottom">
...@@ -107,19 +106,27 @@ border-radius: 2px 2px 2px 2px;" ...@@ -107,19 +106,27 @@ border-radius: 2px 2px 2px 2px;"
<div <div
class="content-bottom" class="content-bottom"
> >
<div class="detail"> <div class="detail" @click="doctorDetail(1)">
<div class="detail-img">
<el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')" />
</div>
<el-button <el-button
icon="el-icon-document-copy"
type="text" type="text"
@click="doctorDetail(1)"
>详情 >详情
</el-button> </el-button>
</div> </div>
<div class="register">
<el-button icon="el-icon-phone-outline" type="text" @click="registration(1)">挂号</el-button> <div class="register" @click="registration(1)">
<div class="register-img">
<el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')" />
</div>
<el-button type="text">挂号</el-button>
</div> </div>
<div class="add"> <div class="add" @click="registration(1)">
<el-button icon="el-icon-date" type="text" @click="registration(1)">加号</el-button> <div class="add-img">
<el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
</div>
<el-button type="text">加号</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -249,6 +256,25 @@ export default { ...@@ -249,6 +256,25 @@ export default {
margin: 17px 0 20px 0; margin: 17px 0 20px 0;
} }
//卡片中间头像部分--框架
.mid-bottom-framework {
display: flex;
//卡片中间头像部分
.mid-bottom {
width: 32px;
height: 32px;
background: #EEEEEE;
margin-right: 12px;
margin-bottom: 15px;
border-radius: 2px 2px 2px 2px;
.mid-bottom-inner {
width: 100%;
height: 100%;
}
}
}
//卡片下半部分 //卡片下半部分
.bottom { .bottom {
height: fit-content; height: fit-content;
...@@ -329,26 +355,57 @@ export default { ...@@ -329,26 +355,57 @@ export default {
border-radius: 0px 0px 3px 3px; border-radius: 0px 0px 3px 3px;
//详情 //详情
.detail { .detail {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; display: flex;
font-weight: 400;
color: #5FB54B; .detail-img {
width: 13px;
height: 13px;
margin-top: 11px;
}
::v-deep .el-button--text {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #5FB54B;
}
} }
//挂号 //挂号
.register { .register {
font-size: 12px; display: flex;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400; .register-img {
color: #5FB54B; width: 13px;
height: 13px;
margin-top: 11px;
}
::v-deep .el-button--text {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #C9C9C9;
}
} }
//加号 //加号
.add { .add {
font-size: 12px; display: flex;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400; .add-img {
color: #5FB54B; width: 13px;
height: 13px;
margin-top: 11px;
}
::v-deep .el-button--text {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #3490CE;
}
} }
} }
...@@ -360,4 +417,5 @@ export default { ...@@ -360,4 +417,5 @@ export default {
::v-deep .el-card__body { ::v-deep .el-card__body {
padding: unset !important; padding: unset !important;
} }
</style> </style>
src/views/service-management/registration-queue/components/schedule-info.vue
View file @ d5a2e595
<template> <template>
<!--进度信息模块封装--> <!--进度信息模块封装-->
<div class="schedule-info"> <div class="schedule-info">
<!-- 1--tip样式-->
<div class="progress-tip"> <div class="progress-tip">
<div class="tip-green" /> <div class="tip-green" />
<div <div
...@@ -8,179 +9,107 @@ ...@@ -8,179 +9,107 @@
>进度信息 >进度信息
</div> </div>
</div> </div>
<!-- 2--内容样式-->
<div class="progress-base"> <div class="progress-base">
<!-- 原型--样式1--> <div class="display-base">
<!-- <el-steps :active="2" align-center>--> <!-- 1--单个的背景,,后面按状态位切换样式-->
<!-- <el-step description="2023-05-05 13:05" title="现场挂号" />--> <div class="bkg-on">
<!-- <el-step description="暂未诊断" title="录入诊断信息" />-->
<!-- <el-step description="暂未生成" title="生成病历" />-->
<!-- <el-step description="暂未开具" title="开具处方单" />-->
<!-- </el-steps>-->
<!-- 蓝湖==样式2-->
<div style="display: flex;">
<!-- 单个的背景,,后面按状态位切换样式-->
<div
style="width: 260px;
height: 143px;
background: #F1F9EF;
border-radius: 4px 4px 4px 4px;
opacity: 1;
"
>
<!--1.预约/现场挂号--> <!--1.预约/现场挂号-->
<div <div
style="display: flex; class="content-inner"
align-items: center;
flex-direction: column;
padding-top: 18px;"
> >
<div <div
style="width: 44px; class="avatar"
height: 44px;margin-bottom:14px; "
> >
<el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')" />
</div> </div>
<div <div
style="font-size: 14px; class="title"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;margin-bottom:14px;"
>1.预约/现场挂号 >1.预约/现场挂号
</div> </div>
<div <div
style="font-size: 12px; class="status-on"
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #5FB54B;"
>进行中 >进行中
</div> </div>
</div> </div>
</div> </div>
<!-- 箭头指示--> <!-- 箭头指示-->
<div style="height: 13px;width: 104px;margin: 65px 22px 65px 22px ;"> <div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div> </div>
<!-- 单个的背景,,后面按状态位切换样式--> <!-- 2--单个的背景,,后面按状态位切换样式-->
<div <div
style="width: 260px; class="bkg-off"
height: 143px;
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
opacity: 1;
border: 1px solid #5FB54B;
"
> >
<!--2.录入诊断信息--> <!--2.录入诊断信息-->
<div <div
style="display: flex; class="content-inner"
align-items: center;
flex-direction: column;
padding-top: 18px;"
> >
<div <div
style="width: 44px; class="avatar"
height: 44px;margin-bottom:14px; "
> >
<el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')" />
</div> </div>
<div <div
style="font-size: 14px; class="title"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;margin-bottom:14px;"
>2.录入诊断信息 >2.录入诊断信息
</div> </div>
<div <div
style="font-size: 12px; class="status-off"
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #AFAFAF;"
>暂未录入 >暂未录入
</div> </div>
</div> </div>
</div> </div>
<!-- 箭头指示--> <!-- 箭头指示-->
<div style="height: 13px;width: 104px;margin: 65px 22px 65px 22px ;"> <div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div> </div>
<!-- 单个的背景,,后面按状态位切换样式--> <!-- 3--单个的背景,,后面按状态位切换样式-->
<div <div
style="width: 260px; class="bkg-off"
height: 143px;
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
opacity: 1;
border: 1px solid #5FB54B;
"
> >
<!--3.开具处方单--> <!--3.开具处方单-->
<div <div
style="display: flex; class="content-inner"
align-items: center;
flex-direction: column;
padding-top: 18px;"
> >
<div <div
style="width: 44px; class="avatar"
height: 44px;margin-bottom:14px; "
> >
<el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')" />
</div> </div>
<div <div
style="font-size: 14px; class="title"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;margin-bottom:14px;"
>3.开具处方单 >3.开具处方单
</div> </div>
<div <div
style="font-size: 12px; class="status-off"
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #AFAFAF;"
>暂未开具 >暂未开具
</div> </div>
</div> </div>
</div> </div>
<!-- 箭头指示--> <!-- 箭头指示-->
<div style="height: 13px;width: 104px;margin: 65px 22px 65px 22px ;"> <div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div> </div>
<!-- 单个的背景,,后面按状态位切换样式--> <!-- 4--单个的背景,,后面按状态位切换样式-->
<div <div
style="width: 260px; class="bkg-off"
height: 143px;
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
opacity: 1;
border: 1px solid #5FB54B;
"
> >
<!--4.生成病例报告--> <!--4.生成病例报告-->
<div <div
style="display: flex; class="content-inner"
align-items: center;
flex-direction: column;
padding-top: 18px;"
> >
<div <div
style="width: 44px; class="avatar"
height: 44px;margin-bottom:14px; "
> >
<el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')" /> <el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')" />
</div> </div>
<div <div
style="font-size: 14px; class="title"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;margin-bottom:14px;"
>4.生成病例报告 >4.生成病例报告
</div> </div>
<div <div
style="font-size: 12px; class="status-off"
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #AFAFAF;"
>暂未生成 >暂未生成
</div> </div>
</div> </div>
...@@ -222,10 +151,76 @@ export default { ...@@ -222,10 +151,76 @@ export default {
} }
} }
/*进度条内容主题样式*/ //进度条整体框架边距
.progress-base { .progress-base {
padding-top: 50px; padding-top: 50px;
padding-bottom: 50px; padding-bottom: 50px;
//进度条排列方向及顺序布局
.display-base {
display: flex;
//当前触发的背景样式
.bkg-on {
width: 260px;
height: 143px;
background: #F1F9EF;
border-radius: 4px 4px 4px 4px;
opacity: 1;
}
//当前未触发的背景样式
.bkg-off {
width: 260px;
height: 143px;
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
opacity: 1;
border: 1px solid #5FB54B;
}
//箭头样式
.arrow {
height: 13px;
width: 104px;
margin: 65px 22px 65px 22px;
}
//状态触发状态
.status-on {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #5FB54B;
}
//状态未触发状态
.status-off {
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #AFAFAF;
}
//头像
.avatar {
width: 44px;
height: 44px;
margin-bottom: 14px;
}
//标题
.title {
font-size: 14px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
margin-bottom: 14px;
}
//预约/挂号
.content-inner {
display: flex;
align-items: center;
flex-direction: column;
padding-top: 18px;
}
}
} }
} }
......
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