Skip to content

P
pet-business-web
Commit 6ddc0602 authored by 陈明豪's avatar 陈明豪
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 19e9d479 f6b44ae6
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 77 deletions
src/assets/styles/element-ui.scss
View file @ 6ddc0602
......@@ -371,8 +371,21 @@ input::-webkit-input-placeholder {
// 分頁
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #5FB54B;
color: #FFFFFF;
background: #F2F9F0;
opacity: 1;
border: 1px solid #5FB54B;
color: #5FB54B;
}
.el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li{
font-size: 13px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #666666;
background: #F4F4F4;
border-radius: 4px 4px 4px 4px;
}
.el-pagination.is-background .btn-prev:hover, .el-pagination.is-background .btn-next:hover, .el-pagination.is-background .el-pager li:not(.disabled):hover{
color: #5FB54B;
}
.el-pagination__sizes .el-input .el-input__inner:hover {
border-color: #5FB54B;
......@@ -455,3 +468,23 @@ input::-webkit-input-placeholder {
.el-table .disabledCheck .cell .el-checkbox__inner {
margin-right: 3px;
}
// 弹出框x按钮大小修改
.el-message-box .el-message-box__close {
font-size: 16px;
}
.el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close {
color: #fff;
}
// 超时退出
.el-button--primary:hover, .el-button--primary:focus {
background: #5FB54B;
border-color: #5FB54B;
color: #FFFFFF;
}
// 超时退出
.el-button--primary {
background: #5FB54B;
border-color: #5FB54B;
color: #FFFFFF;
}
src/components/Pagination/index.vue
View file @ 6ddc0602
......@@ -36,7 +36,7 @@ export default {
pageSizes: {
type: Array,
default() {
return [10, 20, 30, 50]
return [20, 50, 100]
}
},
// 移动端页码按钮的数量端默认值5
......
src/layout/components/AppMain.vue
View file @ 6ddc0602
......@@ -30,6 +30,7 @@ export default {
.app-main {
/* 50= navbar 50 */
min-height: calc(100vh - 50px);
background-color: #F4F4F4 !important;
width: 100%;
position: relative;
overflow: hidden;
......@@ -43,11 +44,12 @@ export default {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
background-color: #F4F4F4;
background-color: #F4F4F4 !important;
}
.fixed-header + .app-main {
padding-top: 84px;
background-color: #F4F4F4 !important;
}
}
</style>
src/router/index.js
View file @ 6ddc0602
......@@ -153,7 +153,7 @@ export const constantRoutes = [
props: true,
component: () => import('@/views/equipment-management/use-management/use-details'),
name: 'UseDetails',
meta: { title: '详情', icon: 'table', activeMenu: '/use-details' }
meta: { title: '详情', icon: 'table' }
}
]
},
......
src/views/equipment-management/use-management/use-details.vue
View file @ 6ddc0602
<template>
<div>
<div style="background-color: #fff;height: 100%;margin-top: 20px;">
<div style=" text-align: center;padding-top: 40px;height: 100px;">
<div style=" text-align: center;padding-top: 30px;height: 100px;">
<span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span>
</div>
<div style="display: flex; padding-left: 20px;padding-top: 20px;padding-bottom: 20px;">
<div style="display: flex; padding-left: 20px;padding-top: 10px;padding-bottom: 10px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备信息</div>
</div>
......@@ -317,14 +317,10 @@ import { CodeToText } from 'element-china-area-data'
export default {
name: 'UseDetails',
dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure'],
props: {
id: {
type: Number,
required: true
}
},
data() {
return {
useId: '',
createTime: '',
// 检查时间
checkTime: '',
// 检查日期
......@@ -353,6 +349,7 @@ export default {
}
},
created() {
this.useId = localStorage.getItem('useId')
this.getUseDetail()
this.getCheckList()
},
......@@ -382,7 +379,7 @@ export default {
},
// 查询详情
getUseDetail() {
useManagementDetail(this.id).then(res => {
useManagementDetail(this.useId).then(res => {
this.form = res.data
console.log('xiangq', res)
if (res.data.useTime !== '' && res.data.useTime !== null) {
......
src/views/equipment-management/use-management/use-management.vue
View file @ 6ddc0602
......@@ -44,7 +44,7 @@
v-model="daterangeCreateTime"
type="date"
style="width: 240px"
placeholder="选择创建日期"
placeholder="选择检查日期"
value-format="yyyy-MM-dd"
/>
</el-form-item>
......@@ -88,7 +88,7 @@
</el-col>
</el-row>
<el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
<el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys" :header-cell-style="{background:'#E8E9E8'}" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" min-width="60" />
<el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
......@@ -128,12 +128,12 @@
</el-table-column>
<el-table-column label="检查日期" align="left" prop="checkStartTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-' }}</span>
<span>{{ parseTime(scope.row.reportTime, '{y}/{m}/{d}') || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="检查时间" align="left" prop="checkStartTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') || '-' }}</span>
<span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="缴费金额" align="left" prop="payAmount">
......@@ -215,29 +215,29 @@ export default {
sortedColumn: '',
// 排序规则
sortedList: [
{
id: '1',
collation: 'asc',
sortedColumn: '按检查时间升序',
nameColumn: 'checkItemsName'
},
{
id: '2',
collation: 'desc',
sortedColumn: '按检查时间降序',
nameColumn: 'checkItemsName'
sortedColumn: '按检查时间倒序',
nameColumn: 'c.report_time'
},
{
id: '3',
id: '1',
collation: 'asc',
sortedColumn: '按预约时间升序',
nameColumn: 'appointTime'
sortedColumn: '按检查时间正序',
nameColumn: 'c.report_time'
},
{
id: '4',
collation: 'desc',
sortedColumn: '按预约时间降序',
nameColumn: 'appointTime'
sortedColumn: '按预约时间倒序',
nameColumn: 'c.appoint_time'
},
{
id: '3',
collation: 'asc',
sortedColumn: '按预约时间正序',
nameColumn: 'c.appoint_time'
}
],
total: 0,
......@@ -385,11 +385,9 @@ export default {
},
// 去详情页
detailsUse(row) {
localStorage.setItem('useId', row.id)
this.$router.push({
name: 'UseDetails',
params: {
id: row.id
}
name: 'UseDetails'
})
},
// 设备状态 value 和label 的转换
......
src/views/medical-record-management/medical-record-management.vue
View file @ 6ddc0602
......@@ -264,7 +264,7 @@ export default {
sort: null
},
pageNum: 1,
pageSize: 10,
pageSize: 20,
petNickname: null,
nickname: null,
petOwnerNumber: null,
......
src/views/service-management/medical-record-management/check-detail.vue
View file @ 6ddc0602
......@@ -157,7 +157,9 @@
</el-row>
<el-row v-show="checkDetail.checkSchedule < 2">
<el-col :span="8">
<el-form-item label="暂未预约" />
<el-form-item label="暂未预约">
<span></span>
</el-form-item>
</el-col>
</el-row>
<div v-show="checkDetail.checkSchedule >= 2">
......
src/views/service-management/medical-record-management/check-subscribe.vue
View file @ 6ddc0602
......@@ -154,7 +154,8 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope">
<el-button
class="fourWordsBtn"
style="color: #5FB54B"
type="text"
@click="handleBookNow(scope.row)"
>立即预约</el-button>
</template>
......@@ -286,7 +287,7 @@ export default {
this.total = res.total
if (this.subscribeMessage.checkType === '2' && this.deviceList.length > 0) {
this.deviceList.forEach(item => {
item['price'] = this.subscribeMessage.devicePrice
item['price'] = this.subscribeMessage.payAmount
})
}
console.log('列表', this.deviceList)
......
src/views/service-management/medical-record-management/medical-record-management.vue
View file @ 6ddc0602
......@@ -66,28 +66,28 @@
<el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
<el-button
class="fourWordsBtn"
icon="el-icon-plus"
icon="el-icon-finished"
size="mini"
@click="selectAll()"
>选择全部
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-edit"
icon="el-icon-back"
size="mini"
@click="reverseSelect()"
>反向选择
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-delete"
icon="el-icon-upload2"
size="mini"
@click="handleExport()"
>批量导出
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-download"
icon="el-icon-setting"
size="mini"
@click="checkItem()"
>检查项目
......@@ -257,7 +257,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="7" v-show="currentCheckType === '2'">
<el-form-item label="支出账户金额" prop="shadowReport" label-width="120">
1200.00
</el-form-item>
......@@ -281,7 +281,7 @@
</template>
</el-table-column>
<el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column prop="date" align="left" label="设备服务费" />
<el-table-column v-if="currentCheckType === '2'" prop="date" align="left" label="设备服务费" />
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<el-button
......@@ -420,7 +420,9 @@ export default {
// 当前的检查ID
currentCheckId: null,
// 当前的设备服务费
currentPayAmount: null
currentPayAmount: null,
// 检查类型(0-自有、2-外部)
currentCheckType: null
}
},
created() {
......@@ -568,6 +570,7 @@ export default {
this.deviceQueryParams.reservationTime = this.getCurrentTime()
this.currentCheckId = row.id
this.currentPayAmount = row.payAmount
this.currentCheckType = row.checkType
console.log('点击立即预约后的状态', this.deviceQueryParams)
// 设置检查项目id
this.getDevice()
......@@ -620,6 +623,11 @@ export default {
console.log('设备', res)
this.deviceList = res.rows.table
this.deviceTotal = res.total
if (this.currentCheckType === '2' && this.deviceList.length > 0) {
this.deviceList.forEach(item => {
item['price'] = this.currentPayAmount
})
}
})
},
/** 重置按钮操作 */
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 6ddc0602
......@@ -243,7 +243,7 @@ export default {
const temp = {
// 给接口所需的宠物赋值
petOwnerBo: this.petForm,
type: this.registrationType,
type: '1', // 这个字段区分的是现场还是预约 1为现场
// 宠物宠主本身的信息
petsId: this.doctorForm.petsId || null,
petType: this.doctorForm.petStatus,
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ 6ddc0602
......@@ -181,7 +181,7 @@
</el-table-column>
<el-table-column align="center" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" />
<span :style="scope.row.payStatus === '0' ? 'color: #F56C6C' : 'color: #67C23A'"><dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" /></span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="180">
......@@ -295,7 +295,7 @@ export default {
// 排序方式声明
sort: '',
pageNum: 1,
pageSize: 10,
pageSize: 20,
type: null,
petId: null,
petNickname: null,
......
src/views/service-management/treatment-management/treatment-detail.vue
View file @ 6ddc0602
......@@ -503,7 +503,7 @@ export default {
return treatRange
},
// 预约诊室搜索
allocationFormChangeName(value) {
allocationFormChangeName() {
this.getAppointmentRecord()
},
// 分配诊室治疗时间查询
......
src/views/service-management/treatment-management/treatment-management.vue
View file @ 6ddc0602
......@@ -51,29 +51,47 @@
<el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
<el-button
class="fourWordsBtn"
icon="el-icon-top-left"
icon="el-icon-finished"
@click="selectAll()"
>选择全部</el-button>
>选择全部
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-top-right"
icon="el-icon-back"
size="mini"
@click="reverseSelect(treatmentList)"
>反向选择</el-button>
>反向选择
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-bottom-right"
icon="el-icon-upload2"
size="mini"
@click="handleExport"
>批量导出</el-button>
>批量导出
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-setting"
size="mini"
@click="checkItem()"
>治疗项目</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;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
>治疗项目
</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;"
class="queryBtn"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询
</el-button>
</el-row>
<el-table
......@@ -82,8 +100,8 @@
:data="treatmentList"
:row-key="getRowKeys"
:header-cell-class-name="cellClass"
:header-cell-style="{background:'#E8E9E8'}"
@selection-change="handleSelectionChange"
:header-cell-style="{ background:'#E8E9E8' }"
>
<el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="left" />
......@@ -196,7 +214,15 @@
/>
<!-- 分配诊室对话框 -->
<el-dialog title="分配诊室" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false" @close="closeDialogRoom">
<el-dialog
title="分配诊室"
:visible.sync="open"
width="800px"
append-to-body
:close-on-press-escape="false"
:close-on-click-modal="false"
@close="closeDialogRoom"
>
<div style="display: flex;padding-bottom: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">预约记录</div>
......@@ -205,7 +231,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="诊室">
<el-select v-model="allocationForm.consultRoomIdList" clearable multiple collapse-tags placeholder="请选择诊室" @change="allocationFormChangeName">
<el-select
v-model="allocationForm.consultRoomIdList"
clearable
multiple
collapse-tags
placeholder="请选择诊室"
@change="allocationFormChangeName"
>
<el-option
v-for="item in consultingName"
:key="item.id"
......@@ -244,13 +277,15 @@
<template slot-scope="scope">
<span v-show="scope.row.treatStartTime!== null">{{ parseTime(scope.row.treatStartTime, '{h}:00') }}</span>
<span v-show="scope.row.treatEndTime!== null">~{{ parseTime(scope.row.treatEndTime, '{h}:00') }}</span>
<span v-show="scope.row.treatStartTime === null&& scope.row.treatEndTime=== null">-</span>
<span v-show="scope.row.treatStartTime === null && scope.row.treatEndTime === null">-</span>
</template>
</el-table-column>
<el-table-column align="left" label="治疗时长">
<template slot-scope="scope">
<span v-show="scope.row.treatStartTime!== null">{{ treatRange(scope.row.treatStartTime,scope.row.treatEndTime) }}h</span>
<span v-show="scope.row.treatStartTime === null&& scope.row.treatEndTime=== null">-</span>
<span
v-show="scope.row.treatStartTime!== null"
>{{ treatRange(scope.row.treatStartTime, scope.row.treatEndTime) }}h</span>
<span v-show="scope.row.treatStartTime === null && scope.row.treatEndTime === null">-</span>
</template>
</el-table-column>
<el-table-column prop="treatOperator" align="left" label="治疗负责人" />
......@@ -263,7 +298,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="诊室" prop="consultRoomId">
<el-select v-model="reservationForm.consultRoomName" clearable placeholder="请选择诊室" value-key="id" style="width: 200px" @change="getconsultingName">
<el-select
v-model="reservationForm.consultRoomName"
clearable
placeholder="请选择诊室"
value-key="id"
style="width: 200px"
@change="getconsultingName"
>
<el-option
v-for="item in consultingName"
:key="item.id"
......@@ -328,8 +370,11 @@
</el-row>
<el-row>
<div style="padding-top: 20px;">
<el-button style="width: 98px;height: 32px;" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
<el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
<el-button style="width: 98px;height: 32px;" class="queryBtn" icon="el-icon-check" @click="submitForm">
提交
</el-button>
<el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="cancel">返 回
</el-button>
</div>
</el-row>
</el-form>
......@@ -368,12 +413,18 @@ export default {
],
// 治疗状态下拉框
treatStatusList: [
{ value: null,
label: '全部' },
{ value: ['2'],
label: '待治疗' },
{ value: ['3'],
label: '已治疗' }
{
value: null,
label: '全部'
},
{
value: ['3'],
label: '已治疗'
},
{
value: ['2'],
label: '待治疗'
}
],
// 预约诊室集合
appointmentRoomList: [],
......@@ -449,7 +500,9 @@ export default {
methods: {
// 表单选择框对齐
cellClass(row) {
if (row.columnIndex === 0) { return 'disabledCheck' }
if (row.columnIndex === 0) {
return 'disabledCheck'
}
},
// 表格
getRowKeys(row) {
......@@ -551,7 +604,7 @@ export default {
console.log(value)
},
// 预约诊室搜索
allocationFormChangeName(value) {
allocationFormChangeName() {
console.log(typeof this.allocationForm.consultRoomIdList[0])
this.getAppointmentRecord()
},
......@@ -686,8 +739,9 @@ export default {
border-radius: 6px 6px 6px 6px;
border: 1px solid rgb(95, 181, 75);
color: #5FB54B;
background: rgba(91,182,71,0.08);
background: rgba(91, 182, 71, 0.08);
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
&:hover {
background: rgba(95, 181, 75, 0.08);
opacity: 1;
......@@ -695,6 +749,7 @@ export default {
color: #5FB54B !important;
}
}
/** 立即预约 */
.bookNow {
width: 80px;
......@@ -703,6 +758,7 @@ export default {
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;
......@@ -710,6 +766,7 @@ export default {
color: #FF9D4E !important;
}
}
.bookNowNo {
width: 80px;
border-radius: 6px 6px 6px 6px;
......@@ -717,6 +774,7 @@ export default {
color: #909399;
background: #ffffff;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
&:hover {
background: rgba(95, 181, 75, 0.08);
opacity: 1;
......@@ -724,6 +782,7 @@ export default {
color: #909399 !important;
}
}
.app-container {
background-color: #FFFFFF;
}
......
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