Commit 41781723 authored by 高滢's avatar 高滢

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/equipment-management/use-management/use-management.vue
parents 3ed695c3 f23f4e8b
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询设备列表 // 查询设备列表
export function listDevice(query) { export function listDevice(query) {
return request({ return request({
url: '/business/device/list', url: '/system/device/list',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -12,7 +12,7 @@ export function listDevice(query) { ...@@ -12,7 +12,7 @@ export function listDevice(query) {
// 查询设备详细 // 查询设备详细
export function getDevice(id) { export function getDevice(id) {
return request({ return request({
url: '/business/device/' + id, url: '/system/device/' + id,
method: 'get' method: 'get'
}) })
} }
...@@ -20,7 +20,7 @@ export function getDevice(id) { ...@@ -20,7 +20,7 @@ export function getDevice(id) {
// 新增设备 // 新增设备
export function addDevice(data) { export function addDevice(data) {
return request({ return request({
url: '/business/device', url: '/system/device',
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -29,7 +29,7 @@ export function addDevice(data) { ...@@ -29,7 +29,7 @@ export function addDevice(data) {
// 修改设备 // 修改设备
export function updateDevice(data) { export function updateDevice(data) {
return request({ return request({
url: '/business/device', url: '/system/device',
method: 'put', method: 'put',
data: data data: data
}) })
...@@ -38,8 +38,54 @@ export function updateDevice(data) { ...@@ -38,8 +38,54 @@ export function updateDevice(data) {
// 删除设备 // 删除设备
export function delDevice(data) { export function delDevice(data) {
return request({ return request({
url: '/business/device/del', url: '/system/device/del',
method: 'Put', method: 'Put',
data: data data: data
}) })
} }
// import request from '@/utils/request'
//
// // 查询设备列表
// export function listDevice(query) {
// return request({
// url: '/business/device/list',
// method: 'get',
// params: query
// })
// }
//
// // 查询设备详细
// export function getDevice(id) {
// return request({
// url: '/business/device/' + id,
// method: 'get'
// })
// }
//
// // 新增设备
// export function addDevice(data) {
// return request({
// url: '/business/device',
// method: 'post',
// data: data
// })
// }
//
// // 修改设备
// export function updateDevice(data) {
// return request({
// url: '/business/device',
// method: 'put',
// data: data
// })
// }
//
// // 删除设备
// export function delDevice(data) {
// return request({
// url: '/business/device/del',
// method: 'Put',
// data: data
// })
// }
...@@ -118,6 +118,13 @@ export const constantRoutes = [ ...@@ -118,6 +118,13 @@ export const constantRoutes = [
name: 'EquipmentManagement', name: 'EquipmentManagement',
meta: { title: '设备管理', icon: 'date' } meta: { title: '设备管理', icon: 'date' }
}, },
{
path: 'equipment-detail',
props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
name: 'EquipmentDetail',
meta: { title: '设备详情' }
},
{ {
path: 'use-management', path: 'use-management',
props: true, props: true,
...@@ -212,6 +219,42 @@ export const constantRoutes = [ ...@@ -212,6 +219,42 @@ export const constantRoutes = [
icom: 'dashboard', icom: 'dashboard',
activeMenu: '/medical-record-management/medical-detail' activeMenu: '/medical-record-management/medical-detail'
} }
},
// 检查详情
{
path: '/check-detail',
props: true,
hidden: true,
component: () => import('@/views/service-management/medical-record-management/check-detail.vue'),
name: 'CheckDetail',
meta: {
title: '检查详情',
icon: 'component'
}
},
// 检查管理-立即预约
{
path: '/check-subscribe',
props: true,
hidden: true,
component: () => import('@/views/service-management/medical-record-management/check-subscribe.vue'),
name: 'CheckSubscribe',
meta: {
title: '立即预约',
icon: 'component'
}
},
// 检查管理-检查影像
{
path: '/check-item',
props: true,
hidden: true,
component: () => import('@/views/service-management/medical-record-management/check-item.vue'),
name: 'CheckItem',
meta: {
title: '检查项目',
icon: 'component'
}
} }
] ]
}, },
...@@ -315,7 +358,7 @@ export const constantRoutes = [ ...@@ -315,7 +358,7 @@ export const constantRoutes = [
{ {
path: 'medical-record-management', path: 'medical-record-management',
component: () => import('@/views/service-management/medical-record-management/medical-record-management.vue'), component: () => import('@/views/service-management/medical-record-management/medical-record-management.vue'),
name: 'medicalRecordManagement', name: 'MedicalRecordManagement',
props: true, props: true,
meta: { meta: {
title: '检查管理', icon: 'component' title: '检查管理', icon: 'component'
......
...@@ -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="下午开始时间">
......
...@@ -82,27 +82,26 @@ ...@@ -82,27 +82,26 @@
</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'"
......
<template>
<div class="app-container">
<!-- 头部标题-->
<div style="padding-top:5px;text-align: center;">
<span
style="font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
font-weight: bold;
color: #333333;"
>详情</span>
</div>
<el-form ref="form" :model="checkDetail" label-width="100px">
<div class="title-paragraph">
<span class="title-text">宠物信息</span>
</div>
<!-- 1 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物ID">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物品种">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 2 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物性别">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物年龄">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物体重">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 3 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物毛色">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绝育情况">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="疫苗情况">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 4 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物保险">
<span>1</span>
</el-form-item>
</el-col>
</el-row>
<div class="title-paragraph">
<span class="title-text">宠主信息</span>
</div>
<!-- 1 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠主姓名">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户ID">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<div class="title-paragraph">
<span class="title-text">检查进度</span>
</div>
<!-- 步骤条 -->
<div>
<el-steps :active="2" align-center>
<el-step title="开具处方单" description="这是一段很长很长很长的描述性文字"></el-step>
<el-step title="缴费开票" description="这是一段很长很长很长的描述性文字"></el-step>
<el-step title="预约检查" description="这段就没那么长了"></el-step>
<el-step title="步骤 4" description="这段就没那么长了!!!"></el-step>
</el-steps>
</div>
<div class="title-paragraph">
<span class="title-text">缴费信息</span>
</div>
<!-- 缴费信息 -->
<el-row>
<el-col :span="8">
<el-form-item label="缴费金额">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费方式">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费时间">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<div class="title-paragraph">
<span class="title-text">预约信息</span>
</div>
<el-button @click="bookNow">立即预约</el-button>
<el-row>
<el-col :span="8">
<el-form-item label="检查类型">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备服务器">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="下单时间">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<div class="title-paragraph">
<span class="title-text">检查信息</span>
</div>
<!-- 1 -->
<el-row>
<el-col :span="8">
<el-form-item label="检查类型">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备服务器">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="下单时间">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 2 -->
<el-row>
<el-col :span="8">
<el-form-item label="检查日期">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查时段">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报告上传时间">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 3 -->
<el-row>
<el-col :span="8">
<el-form-item label="影像报告">
<span>1</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
export default {
name: 'CheckDetail',
data() {
return {
checkDetail: ''
}
},
methods: {
// 点击 预约信息-立即预约
bookNow() {
this.$router.push({
path: '/check-subscribe'
})
}
}
}
</script>
<style lang="scss">
.title-paragraph {
margin-bottom: 20px;
border-left: 5px solid #5FB54B;
.title-text {
margin-left: 10px;
}
}
</style>
<style scoped lang="scss">
.app-container {
background-color: #FFFFFF;
}
</style>
<template>
<div class="app-container">
检查项目
</div>
</template>
<script>
export default {
name: 'CheckItem'
}
</script>
<style scoped lang="scss">
.app-container {
background-color: #FFFFFF;
}
</style>
<template>
<div class="app-container">
<!-- 头部标题-->
<div style="padding-top:5px;text-align: center;">
<span
style="font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
font-weight: bold;
color: #333333;"
>立即预约</span>
</div>
<el-form ref="form" :model="checkDetail" label-width="100px">
<div class="title-paragraph">
<span class="title-text">宠物信息</span>
</div>
<!-- 1 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物ID">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物品种">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 2 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物性别">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物年龄">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物体重">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 3 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物毛色">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绝育情况">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="疫苗情况">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
<!-- 4 -->
<el-row>
<el-col :span="8">
<el-form-item label="宠物保险">
<span>1</span>
</el-form-item>
</el-col>
</el-row>
<div class="title-paragraph">
<span class="title-text">参考信息</span>
</div>
<!-- 1 -->
<el-row>
<el-col :span="8">
<el-form-item label="检查类型">
<span>1</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查项目">
<span>2</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费金额">
<span>3</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="title-paragraph">
<span class="title-text">设备预约</span>
</div>
<el-form ref="formDevice" :model="queryParams" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="设备">
<el-select v-model="queryParams.device" clearable multiple collapse-tags placeholder="请选择设备">
<el-option
v-for="item in dict.type.exam_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查日期">
<el-select v-model="queryParams.data" clearable multiple collapse-tags placeholder="请选择检查日期">
<el-option
v-for="item in dict.type.exam_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 设备表格 -->
<el-table >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备名称" align="center" prop="petNickname" />
<el-table-column label="检查日期" align="center" prop="petBreed" />
<el-table-column label="检查时段" align="center" prop="petSex" />
<el-table-column label="剩余可预约" align="center" prop="petAge" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope">
<el-button
class="bookNow"
size="mini"
icon="el-icon-check"
@click="handleDelete(scope.row)"
>立即预约</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
export default {
name: 'CheckSubscribe',
dicts: ['exam_type'],
data() {
return {
checkDetail: {},
queryParams: {},
total: 0
}
},
methods: {
handleDelete() {
},
getList() {}
}
}
</script>
<style lang="scss">
.title-paragraph {
margin-bottom: 20px;
border-left: 5px solid #5FB54B;
.title-text {
margin-left: 10px;
}
}
</style>
<style scoped lang="scss">
.app-container {
background-color: #FFFFFF;
}
</style>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-form-item prop="petWeight"> <el-form-item prop="petWeight">
<el-select v-model="queryParams.petNickname" clearable placeholder="检查类型"> <el-select v-model="queryParams.petNickname" clearable placeholder="检查类型">
<el-option <el-option
v-for="item in options" v-for="item in dict.type.exam_type"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<el-date-picker <el-date-picker
v-model="queryParams.petNickname" v-model="queryParams.petNickname"
type="date" type="date"
placeholder="请选择检查时间"> placeholder="请选择检查时间"
</el-date-picker> />
</el-form-item> </el-form-item>
<el-form-item prop="shadowReport"> <el-form-item prop="shadowReport">
<el-select v-model="queryParams.petNickname" clearable placeholder="请选择排序方式"> <el-select v-model="queryParams.petNickname" clearable placeholder="请选择排序方式">
...@@ -55,44 +55,31 @@ ...@@ -55,44 +55,31 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
<el-row :gutter="10" class="mb8">
<el-button <el-button
type="primary" class="fourWordsBtn"
plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd"
>选择全部</el-button> >选择全部</el-button>
<el-button <el-button
type="success" class="fourWordsBtn"
plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single"
@click="handleUpdate"
>反向选择</el-button> >反向选择</el-button>
<el-button <el-button
type="danger" class="fourWordsBtn"
plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple"
@click="handleDelete"
>批量导出</el-button> >批量导出</el-button>
<el-button <el-button
type="warning" class="fourWordsBtn"
plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="checkItem()"
>检查项目</el-button> >检查项目</el-button>
<el-button style="position: relative; float: right;" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button style="position: relative; float: right;" type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
</el-row> </el-row>
<el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
...@@ -115,20 +102,18 @@ ...@@ -115,20 +102,18 @@
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-hasPermi="['business:manage:edit']" class="details"
size="mini" size="mini"
type="text" icon="el-icon-document"
icon="el-icon-edit" @click="handleDetails(scope.row)"
@click="handleUpdate(scope.row)"
>详情</el-button> >详情</el-button>
<el-button <el-button
v-hasPermi="['business:manage:remove']" class="bookNow"
size="mini" size="mini"
type="text" icon="el-icon-check"
icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>立即预约</el-button> >立即预约</el-button>
</template> </template>
...@@ -169,6 +154,7 @@ import { listManage, getManage, delManage, addManage, updateManage } from '@/api ...@@ -169,6 +154,7 @@ import { listManage, getManage, delManage, addManage, updateManage } from '@/api
export default { export default {
name: 'MedicalRecordManagement', name: 'MedicalRecordManagement',
dicts: ['exam_type'],
data() { data() {
return { return {
options: [], options: [],
...@@ -185,7 +171,7 @@ export default { ...@@ -185,7 +171,7 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
// 业务管理-检查管理表格数据 // 业务管理-检查管理表格数据
manageList: [], manageList: [{}],
// 弹出层标题 // 弹出层标题
title: '', title: '',
// 是否显示弹出层 // 是否显示弹出层
...@@ -219,6 +205,7 @@ export default { ...@@ -219,6 +205,7 @@ export default {
this.manageList = response.rows this.manageList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
this.manageList.push({})
}) })
}, },
// 取消按钮 // 取消按钮
...@@ -226,6 +213,12 @@ export default { ...@@ -226,6 +213,12 @@ export default {
this.open = false this.open = false
this.reset() this.reset()
}, },
// 点击检查项目
checkItem() {
this.$router.push({
path: '/check-item'
})
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
...@@ -261,6 +254,13 @@ export default { ...@@ -261,6 +254,13 @@ export default {
this.open = true this.open = true
this.title = '添加业务管理-检查管理' this.title = '添加业务管理-检查管理'
}, },
/** 详情 */
handleDetails(row) {
console.log('点击详情后', row)
this.$router.push({
path: '/check-detail'
})
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset() this.reset()
...@@ -312,6 +312,36 @@ export default { ...@@ -312,6 +312,36 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
/** 详情 */
.details {
width: 50px;
border-radius: 6px 6px 6px 6px;
border: 1px solid rgb(95, 181, 75);
color: #5FB54B;
background: rgba(91,182,71,0.08);
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
&:hover {
background: rgba(95, 181, 75, 0.08);
opacity: 1;
border: 1px solid #5FB54B;
color: #5FB54B !important;
}
}
/** 立即预约 */
.bookNow {
width: 80px;
border-radius: 6px 6px 6px 6px;
border: 1px solid rgb(255, 157, 78);
color: #FF9D4E;
background: rgba(255,157,78,0.08);
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
&:hover {
background: rgba(95, 181, 75, 0.08);
opacity: 1;
border: 1px solid #FF9D4E;
color: #FF9D4E !important;
}
}
.app-container { .app-container {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
......
<template> <template>
<!--进度信息模块封装-->
<div class="schedule-info"> <div class="schedule-info">
<div style="display: flex"> <!-- 1--tip样式-->
<div class="progress-tip">
<div class="tip-green" /> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" class="tip-content"
>进度信息 >进度信息
</div> </div>
</div> </div>
<div style="padding-top: 50px;padding-bottom: 50px;"> <!-- 2--内容样式-->
<el-steps :active="2" align-center> <div class="progress-base">
<el-step description="2023-05-05 13:05" title="现场挂号" /> <div class="display-base">
<el-step description="暂未诊断" title="录入诊断信息" /> <!-- 1--单个的背景,,后面按状态位切换样式-->
<el-step description="暂未生成" title="生成病历" /> <div class="bkg-on">
<el-step description="暂未开具" title="开具处方单" /> <!--1.预约/现场挂号-->
</el-steps> <div
class="content-inner"
>
<div
class="avatar"
>
<el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')" />
</div>
<div
class="title"
>1.预约/现场挂号
</div>
<div
class="status-on"
>进行中
</div>
</div>
</div>
<!-- 箭头指示-->
<div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div>
<!-- 2--单个的背景,,后面按状态位切换样式-->
<div
class="bkg-off"
>
<!--2.录入诊断信息-->
<div
class="content-inner"
>
<div
class="avatar"
>
<el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')" />
</div>
<div
class="title"
>2.录入诊断信息
</div>
<div
class="status-off"
>暂未录入
</div>
</div>
</div>
<!-- 箭头指示-->
<div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div>
<!-- 3--单个的背景,,后面按状态位切换样式-->
<div
class="bkg-off"
>
<!--3.开具处方单-->
<div
class="content-inner"
>
<div
class="avatar"
>
<el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')" />
</div>
<div
class="title"
>3.开具处方单
</div>
<div
class="status-off"
>暂未开具
</div>
</div>
</div>
<!-- 箭头指示-->
<div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div>
<!-- 4--单个的背景,,后面按状态位切换样式-->
<div
class="bkg-off"
>
<!--4.生成病例报告-->
<div
class="content-inner"
>
<div
class="avatar"
>
<el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')" />
</div>
<div
class="title"
>4.生成病例报告
</div>
<div
class="status-off"
>暂未生成
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -24,6 +126,102 @@ export default { ...@@ -24,6 +126,102 @@ export default {
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.schedule-info {
/*模块tip布局*/
.progress-tip {
display: flex;
/*模块tip图形样式--左绿色*/
.tip-green {
width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
}
/*模块tip内容样式*/
.tip-content {
padding-left: 13px;
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei, serif;
font-weight: bold;
color: #333333;
}
}
//进度条整体框架边距
.progress-base {
padding-top: 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;
}
}
}
}
</style> </style>
...@@ -561,15 +561,6 @@ export default { ...@@ -561,15 +561,6 @@ export default {
color: #666666; color: #666666;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
//margin-left: 5%;
//margin-right: 5%;
//基础信息右边的信息样式
.base-inner {
//display: grid !important;
//grid-template-columns: repeat(3, auto);
//与头像左边距
//padding-left: 10%;
}
} }
//2--宠物保险--模块内信息整体样式 //2--宠物保险--模块内信息整体样式
...@@ -595,24 +586,6 @@ export default { ...@@ -595,24 +586,6 @@ export default {
border-radius: 10px 10px 10px 10px; border-radius: 10px 10px 10px 10px;
} }
//模块tip样式--橙色
.tip-orange {
height: 30px;
border-left: 5px solid #fc8135;
}
//模块tip样式--蓝色
.tip-blue {
height: 30px;
border-left: 5px solid #69bdff;
}
//模块tip样式--黄色
.tip-yellow {
height: 30px;
border-left: 5px solid #f3ff00;
}
//所有表格内容选中后的样式-all //所有表格内容选中后的样式-all
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
background-color: #F6FCF5 !important; background-color: #F6FCF5 !important;
......
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