Skip to content

P
pet-business-web
Commit 4d2439a9 authored by 刘怀志's avatar 刘怀志
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c9676280 b615c740
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 938 additions and 303 deletions
.husky/pre-commit
View file @ 4d2439a9
#!/usr/bin/env sh #!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh" . "$(dirname -- "$0")/_/husky.sh"
npm run lint
src/api/business/banner.js 0 → 100644
View file @ 4d2439a9
import request from '@/utils/request'
// 查询轮播图管理列表
export function listBanner(query) {
return request({
url: '/business/banner/list',
method: 'get',
params: query
})
}
// 查询轮播图管理详细
export function getBanner(id) {
return request({
url: '/business/banner/' + id,
method: 'get'
})
}
// 新增轮播图管理
export function addBanner(data) {
return request({
url: '/business/banner',
method: 'post',
data: data
})
}
// 修改轮播图管理
export function updateBanner(data) {
return request({
url: '/business/banner',
method: 'put',
data: data
})
}
// 删除轮播图管理
export function delBanner(id) {
return request({
url: '/business/banner/' + id,
method: 'delete'
})
}
src/layout/components/AppMain.vue
View file @ 4d2439a9
...@@ -30,6 +30,7 @@ export default { ...@@ -30,6 +30,7 @@ export default {
.app-main { .app-main {
/* 50= navbar 50 */ /* 50= navbar 50 */
min-height: calc(100vh - 50px); min-height: calc(100vh - 50px);
background-color: #F4F4F4 !important;
width: 100%; width: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
...@@ -43,10 +44,12 @@ export default { ...@@ -43,10 +44,12 @@ export default {
.app-main { .app-main {
/* 84 = navbar + tags-view = 50 + 34 */ /* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px); min-height: calc(100vh - 84px);
background-color: #F4F4F4 !important;
} }
.fixed-header + .app-main { .fixed-header + .app-main {
padding-top: 84px; padding-top: 84px;
background-color: #F4F4F4 !important;
} }
} }
</style> </style>
src/router/index.js
View file @ 4d2439a9
...@@ -253,6 +253,22 @@ export const constantRoutes = [ ...@@ -253,6 +253,22 @@ export const constantRoutes = [
} }
] ]
}, },
// 轮播
{
path: '/banner/management',
component: Layout,
hidden: true,
permissions: ['*:*:*'],
children: [
{
path: 'index',
props: true,
component: () => import('@/views/banner_management/banner_management.vue'),
name: 'banner_management',
meta: { title: '轮播管理', icon: 'component' }
}
]
},
// 业务管理 // 业务管理
{ {
path: '/service-management', path: '/service-management',
...@@ -304,7 +320,7 @@ export const constantRoutes = [ ...@@ -304,7 +320,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: 'CheckManagement',
props: true, props: true,
meta: { meta: {
title: '检查管理', icon: 'component' title: '检查管理', icon: 'component'
......
src/views/article-management/article-detail.vue
View file @ 4d2439a9
...@@ -29,13 +29,14 @@ ...@@ -29,13 +29,14 @@
style="padding-left: 13px" style="padding-left: 13px"
> >
<el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px"> <el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px">
<el-input v-model="form.articleTitle" disabled placeholder="请输入文章标题" /> <el-input v-model="form.articleTitle" disabled placeholder="暂无数据" />
</el-form-item> </el-form-item>
<el-form-item label="权重" prop="articleWeight"> <el-form-item label="权重" prop="articleWeight">
<el-input-number <el-input-number
v-model="form.articleWeight" v-model="form.articleWeight"
:max="9999" :max="9999"
:min="1" :min="1"
placeholder="暂无数据"
controls-position="right" controls-position="right"
disabled disabled
/> />
...@@ -51,7 +52,7 @@ ...@@ -51,7 +52,7 @@
<el-form-item label="状态" prop="articleStatus"> <el-form-item label="状态" prop="articleStatus">
<div style="display: flex; "> <div style="display: flex; ">
<div style="padding-right: 15px;"> <div style="padding-right: 15px;">
<el-select v-model="form.articleStatus" disabled> <el-select v-model="form.articleStatus" placeholder="暂无数据" disabled>
<el-option <el-option
v-for="({value, label}, index) in statusList" v-for="({value, label}, index) in statusList"
:key="index" :key="index"
......
src/views/article-management/article-insert.vue
View file @ 4d2439a9
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
:max="9999" :max="9999"
:min="0" :min="0"
controls-position="right" controls-position="right"
style=""
/> />
</el-form-item> </el-form-item>
<el-form-item label="文章封面" prop="articleCover"> <el-form-item label="文章封面" prop="articleCover">
...@@ -39,15 +40,13 @@ ...@@ -39,15 +40,13 @@
<div style="padding-right: 15px;"> <div style="padding-right: 15px;">
<el-select v-model="form.articleStatus"> <el-select v-model="form.articleStatus">
<el-option <el-option
v-for="({value, label}, index) in statusList" v-for="item in statusList"
:key="index" :key="item.value"
:label="label" :label="item.label"
:value="value" :value="item.value"
/> />
</el-select> </el-select>
</div> </div>
<!-- <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>-->
<!-- <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>-->
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="文章内容" prop="articleContent"> <el-form-item label="文章内容" prop="articleContent">
......
src/views/article-management/article-management.vue
View file @ 4d2439a9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 10px;" prop="articleStatus"> <el-form-item style="margin-left: 10px;" prop="articleStatus">
<el-select v-model.trim="queryParams.articleStatus" clearable placeholder="状态"> <el-select v-model.trim="queryParams.articleStatus" clearable placeholder="状态">
<el-option label="全部" :value="null" /> <!-- <el-option label="全部" :value="null" />-->
<el-option <el-option
v-for="item in dict.type.article_status" v-for="item in dict.type.article_status"
:key="item.value" :key="item.value"
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-button <el-button
v-hasPermi="['business:article:add']" v-hasPermi="['business:article:add']"
class="fourWordsBtn" class="fourWordsBtn"
icon="el-icon-circle-plus-outline" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增文章 >新增文章
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<el-button <el-button
v-hasPermi="['system:manage:export']" v-hasPermi="['system:manage:export']"
class="fourWordsBtn" class="fourWordsBtn"
icon="el-icon-right" icon="el-icon-finished"
size="mini" size="mini"
@click="selectAll" @click="selectAll"
>选择全部 >选择全部
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
v-loading="loading" v-loading="loading"
:data="articleList" :data="articleList"
:header-cell-style="{background:'#E8E9E8'}" :header-cell-style="{background:'#E8E9E8'}"
border
row-key="id" row-key="id"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
...@@ -256,7 +255,6 @@ ...@@ -256,7 +255,6 @@
<script> <script>
import { listArticle, delArticle, addArticle, updateArticle, listAllArticle } from '@/api/business/article' import { listArticle, delArticle, addArticle, updateArticle, listAllArticle } from '@/api/business/article'
import { parseTime } from '../../utils/ruoyi' import { parseTime } from '../../utils/ruoyi'
import fa from 'element-ui/src/locale/lang/fa'
import moment from 'moment' import moment from 'moment'
export default { export default {
......
src/views/banner_management/banner_management.vue 0 → 100644
View file @ 4d2439a9
This diff is collapsed.
src/views/document-management/about-us/about-us.vue
View file @ 4d2439a9
<template> <template>
<div class="policy-container"> <div class="policy-container">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text" style="font-size: 16px;">编辑内容</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">编辑内容</span>
</div> </div>
<el-row> <el-row>
<el-col :span="1.5" style="margin: 8px 10px 0 75px"> <el-col :span="1.5" style="margin: 8px 10px 0 75px">
......
src/views/document-management/entry-contract/entry-contract.vue
View file @ 4d2439a9
<template> <template>
<div class="contract-container"> <div class="contract-container">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text" style="font-size: 16px;">入驻合同</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">入驻合同</span>
</div> </div>
<!-- 入驻合同表 --> <!-- 入驻合同表 -->
<el-table v-loading="entryLoading" :data="entryContract" style="width: 90%;margin: 0 0 0 60px;"> <el-table v-loading="entryLoading" :data="entryContract" style="width: 90%;margin: 0 0 0 60px;">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="title-paragraph" style="margin-top: 30px"> <div class="title-paragraph" style="margin-top: 30px">
<span class="title-text" style="font-size: 16px;">授权合同</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">授权合同</span>
</div> </div>
<!-- 授权合同表 --> <!-- 授权合同表 -->
<el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;overflow: auto;"> <el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;overflow: auto;">
......
src/views/document-management/privacy-policy/privacy-policy.vue
View file @ 4d2439a9
<template> <template>
<div class="policy-container"> <div class="policy-container">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text" style="font-size: 16px;">编辑内容</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">编辑内容</span>
</div> </div>
<el-row> <el-row>
<el-col :span="1.5" style="margin: 8px 10px 0 75px"> <el-col :span="1.5" style="margin: 8px 10px 0 75px">
......
src/views/document-management/user-protocol/user-protocol.vue
View file @ 4d2439a9
<template> <template>
<div class="protocol-container"> <div class="protocol-container">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text" style="font-size: 16px;">编辑内容</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">编辑内容</span>
</div> </div>
<el-row> <el-row>
<el-col :span="1.5" style="margin: 8px 10px 0 75px"> <el-col :span="1.5" style="margin: 8px 10px 0 75px">
......
src/views/equipment-management/equipment-management/equipment-check.vue
View file @ 4d2439a9
...@@ -78,14 +78,17 @@ ...@@ -78,14 +78,17 @@
:prop="'settingList.'+index+'.price'" :prop="'settingList.'+index+'.price'"
:rules="[ :rules="[
{ required: true, message: '请输入项目单价', trigger: 'change' }, { required: true, message: '请输入项目单价', trigger: 'change' },
{ validator: validatePrice, trigger: 'change, blur' }
]" ]"
> >
<el-input-number <el-input-number
v-model="item.price" v-model="item.price"
:min="0" :min="0"
:max="9999.99"
controls-position="right" controls-position="right"
style="width: 240px" style="width: 240px"
placeholder="0.00"
:precision="2"
@keydown.native="keydown($event)" @keydown.native="keydown($event)"
/> />
元 元
...@@ -122,6 +125,10 @@ ...@@ -122,6 +125,10 @@
:ref="'settingList.'+index+'.sort'" :ref="'settingList.'+index+'.sort'"
label="权重" label="权重"
:prop="'settingList.'+index+'.sort'" :prop="'settingList.'+index+'.sort'"
:rules="[
{ required: true, message: '请输入权重', trigger: 'change' },
{ validator: validWeigh, trigger: 'change, blur' }
]"
> >
<el-input-number <el-input-number
v-model="item.sort" v-model="item.sort"
...@@ -256,6 +263,15 @@ export default { ...@@ -256,6 +263,15 @@ export default {
}) })
}, },
/** 项目单价校验 */
validatePrice: function(rule, value, callback) {
console.log('value', value)
if (value === 0) {
callback(new Error('项目单价不能为0.00'))
} else {
callback()
}
},
// 是权重不可以输入小数 // 是权重不可以输入小数
handleBlur() { handleBlur() {
const parsedValue = parseFloat(this.form.sort) const parsedValue = parseFloat(this.form.sort)
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 4d2439a9
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item v-if="isShow" label="平台自有设备"> <el-form-item v-if="isShow" label="平台自有设备">
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择平台自有设备" disabled> <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择平台自有设备">
<el-option <el-option
v-for="(item, index) in optionsp" v-for="(item, index) in optionsp"
:key="index" :key="index"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="hpshow" label="医院自有设备"> <el-form-item v-if="hpshow" label="医院自有设备">
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备" disabled> <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
<el-option <el-option
v-for="(item ,index) in optionsh" v-for="(item ,index) in optionsh"
:key="index" :key="index"
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<el-form-item prop="address"> <el-form-item prop="address">
<el-input <el-input
v-model.trim="form.address" v-model.trim="form.address"
placeholder="请输入详细地址地址(街道、楼牌号等)" placeholder="暂无数据"
maxlength="40" maxlength="40"
clearable clearable
style="width: 263%" style="width: 263%"
...@@ -101,20 +101,7 @@ ...@@ -101,20 +101,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item >-->
<!-- <el-input-->
<!-- v-model.trim="form.address"-->
<!-- placeholder="暂无数据"-->
<!-- maxlength="40"-->
<!-- clearable-->
<!-- disabled-->
<!-- style="width: 263%"-->
<!-- >-->
<!-- <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位时段服务数"> <el-form-item label="单位时段服务数">
<el-input-number <el-input-number
...@@ -278,14 +265,13 @@ ...@@ -278,14 +265,13 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持服务地区"> <el-form-item label="支持服务地区">
<el-select v-model="form.serviceArea" multiple placeholder="请选择支持服务地区" disabled style="width: 300px"> <el-input
<el-option v-model.trim="form.serviceAreaList"
v-for="dict in dict.type.service_area" type="textarea"
:key="dict.label" style="width:705%;;"
:label="dict.label" :row="4"
:value="dict.value" disabled
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -293,14 +279,13 @@ ...@@ -293,14 +279,13 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持检查类型"> <el-form-item label="支持检查类型">
<el-select v-model="form.checkType" multiple placeholder="请选择支持检查类型" style="width: 300px" disabled> <el-input
<el-option v-model.trim="form.checkTypeList"
v-for=" dict in dict.type.exam_type" type="textarea"
:key="dict.label" style="width:705%;;"
:label="dict.label" :row="4"
:value="dict.value" disabled
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -583,7 +568,7 @@ ...@@ -583,7 +568,7 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持服务地区" prop="serviceArea"> <el-form-item label="支持服务地区" prop="serviceArea">
<el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px"multiple collapse-tags clearable> <el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px" multiple collapse-tags clearable>
<el-option <el-option
v-for="dictServiceArea in dict.type.service_area" v-for="dictServiceArea in dict.type.service_area"
:key="dictServiceArea.label" :key="dictServiceArea.label"
...@@ -598,7 +583,7 @@ ...@@ -598,7 +583,7 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持检查项目" prop="checkType"> <el-form-item label="支持检查项目" prop="checkType">
<el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" multiple collapse-tags clearable> <el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" collapse-tags clearable>
<el-option <el-option
v-for="(item,index) in dict.type.exam_type" v-for="(item,index) in dict.type.exam_type"
:key="index.label" :key="index.label"
...@@ -628,7 +613,7 @@ import { getDevice, updateDevice } from '@/api/business/device' ...@@ -628,7 +613,7 @@ import { getDevice, updateDevice } from '@/api/business/device'
import { CodeToText, regionData } from 'element-china-area-data' import { CodeToText, regionData } from 'element-china-area-data'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import { listCheckManage } from '@/api/business/manage' import { listCheckManage } from '@/api/business/manage'
import { isEmpty, parseTime } from '@/utils/ruoyi' import { isEmpty, parseTime, selectDictLabels } from '@/utils/ruoyi'
import { deepClone } from '@/utils' import { deepClone } from '@/utils'
export default { export default {
name: 'EquipmentDetail', name: 'EquipmentDetail',
...@@ -645,7 +630,7 @@ export default { ...@@ -645,7 +630,7 @@ export default {
}, },
data() { data() {
return { return {
// 日期格式
replace(time) { replace(time) {
return parseTime(time, '{y}/{m}/{d}') return parseTime(time, '{y}/{m}/{d}')
}, },
...@@ -689,6 +674,8 @@ export default { ...@@ -689,6 +674,8 @@ export default {
deviceName: '', deviceName: '',
// appointmentMethod: '', // appointmentMethod: '',
serviceArea: '', serviceArea: '',
serviceAreaList: [],
checkTypeList: [],
head: '', head: '',
phone: '', phone: '',
deviceType: '', deviceType: '',
...@@ -1070,9 +1057,22 @@ export default { ...@@ -1070,9 +1057,22 @@ export default {
// //
// } // }
// if (this.form.serviceArea != null && this.form.serviceArea !== '') { // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
console.log('this.form.serviceArea', this.form.serviceArea)
this.form.serviceAreaList = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
console.log(' this.form.serviceAreaList', this.form.serviceAreaList)
this.form.serviceArea = response.data.serviceArea.split(',') this.form.serviceArea = response.data.serviceArea.split(',')
// this.getDicts('service_area').then(response => {
// this.form.serviceAreaList = response.data
// this.form.checkTypeList = this.form.serviceArea.map(dictValue => this.form.serviceAreaList)
// console.log(' this.form.serviceAreaList.', this.form.serviceAreaList)
// console.log("this.form.idlist.", this.form.checkTypeList)
// })
// } // }
if (this.form.checkType != null && this.form.checkType !== '') { if (this.form.checkType != null && this.form.checkType !== '') {
this.form.checkTypeList = selectDictLabels(this.dict.type.check_type, this.form.checkType)
console.log(' this.form.checkTypeList', this.form.checkTypeList)
this.form.checkType = response.data.checkType.split(',') this.form.checkType = response.data.checkType.split(',')
} }
...@@ -1080,9 +1080,9 @@ export default { ...@@ -1080,9 +1080,9 @@ export default {
this.form.useTime = JSON.parse(response.data.useTime) this.form.useTime = JSON.parse(response.data.useTime)
} }
// this.checkType = response.data.checkType.split(',') // this.checkType = response.data.checkType.split(',')
console.log(':fsdfsddddddddd???????', response.data.addressCode) // console.log(':fsdfsddddddddd???????', response.data.addressCode)
console.log('详细个bbbbb', this.selectedOptions) // console.log('详细个bbbbb', this.selectedOptions)
console.log('详细个ccccccccccc', this.form.selectedOptions) // console.log('详细个ccccccccccc', this.form.selectedOptions)
console.log('详情数据---', this.form) console.log('详情数据---', this.form)
// this.serviceAreaS = this.form.serviceArea.split(';') // this.serviceAreaS = this.form.serviceArea.split(';')
// this.serviceArea = [] // this.serviceArea = []
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 4d2439a9
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</el-row> </el-row>
<el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border :row-key="getRowKeys" @selection-change="handleSelectionChange"> <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> <el-table-column type="selection" width="47" 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="设备名称" align="left" prop="deviceName" show-overflow-tooltip /> <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
<el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip /> <el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />
...@@ -248,8 +248,8 @@ ...@@ -248,8 +248,8 @@
</template> </template>
<script> <script>
import { regionData, CodeToText } from 'element-china-area-data' import { regionData } from 'element-china-area-data'
import { listDevice, getDevice, delDevice, listDeviceAll } from '@/api/business/device' import { listDevice, delDevice, listDeviceAll } from '@/api/business/device'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
...@@ -282,13 +282,13 @@ export default { ...@@ -282,13 +282,13 @@ export default {
{ {
id: 1, id: 1,
collation: 'desc', collation: 'desc',
sortedColumn: '按创建时间倒序', sortedColumn: '按创建日期倒序',
nameColumn: 'e.create_time' nameColumn: 'e.create_time'
}, },
{ {
id: 2, id: 2,
collation: 'asc', collation: 'asc',
sortedColumn: '按创建时间正序', sortedColumn: '按创建日期正序',
nameColumn: 'e.create_time' nameColumn: 'e.create_time'
}, },
{ {
...@@ -675,7 +675,7 @@ export default { ...@@ -675,7 +675,7 @@ export default {
/** /**
* 如果当前没有选择任何table项 则反选不生效 * 如果当前没有选择任何table项 则反选不生效
*/ */
if (notIncludeIds != null && notIncludeIds != '') { if (notIncludeIds != null && notIncludeIds !== '') {
const { data } = await listDeviceAll({ notIncludeIds }) const { data } = await listDeviceAll({ notIncludeIds })
console.log('data', data) console.log('data', data)
this.effectTableSelect(data) this.effectTableSelect(data)
......
src/views/medical-record-management/medical-record-management.vue
View file @ 4d2439a9
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<el-button <el-button
v-hasPermi="['business:case:export']" v-hasPermi="['business:case:export']"
class="fourWordsBtn" class="fourWordsBtn"
icon="el-icon-right" icon="el-icon-finished"
size="mini" size="mini"
@click="checkAll" @click="checkAll"
>选择全部 >选择全部
...@@ -115,20 +115,51 @@ ...@@ -115,20 +115,51 @@
v-loading="loading" v-loading="loading"
:data="recordList" :data="recordList"
:header-cell-style="{background:'#E8E9E8'}" :header-cell-style="{background:'#E8E9E8'}"
border
@select="selectChange" @select="selectChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="55" /> <el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" /> <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip /> <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip>
<el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip /> <template slot-scope="scope">
<el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip /> <span>{{ scope.row.medicalRecordNo || '-' }}</span>
<el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip /> </template>
<el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip /> </el-table-column>
<el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip /> <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
<el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip /> <template slot-scope="scope">
<el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip /> <span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petsId || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petOwnerPhone || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.hospitalName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.doctorName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.hospitalDepartmentName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180"> <el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
...@@ -257,7 +288,7 @@ export default { ...@@ -257,7 +288,7 @@ export default {
// 排序方式下拉框字典写死 // 排序方式下拉框字典写死
sortList: [ sortList: [
{ {
label: '按挂就诊日期倒序', label: '按就诊日期倒序',
value: '1' value: '1'
}, },
{ {
......
src/views/service-management/medical-record-management/check-detail.vue
View file @ 4d2439a9
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
font-weight: bold; font-weight: bold;
color: #333333;" color: #333333;"
>详情</span> >详情</span>
<span style="font-size: 16px;position: absolute;right: 160px;padding-top: 5px;">{{ checkDetail.medicalRecordNo }}</span>
</div> </div>
<el-form ref="form" :model="checkDetail" label-width="100px"> <el-form ref="form" :model="checkDetail" label-width="100px">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">宠物信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物性别"> <el-form-item label="宠物性别">
<span>{{ checkDetail.petSex === '0' ? '公' : (checkDetail.petSex === '1' ? '母' : '未知') }}</span> <span>{{ checkDetail.petSex === '0' ? '雄性' : (checkDetail.petSex === '1' ? '雌性' : '其他') }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">宠主信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠主信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
...@@ -97,25 +98,25 @@ ...@@ -97,25 +98,25 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">检查进度</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">检查进度</span>
</div> </div>
<!-- 步骤条 --> <!-- 步骤条 -->
<div> <div>
<el-steps :active="schedule" align-center> <el-steps :active="schedule" align-center>
<el-step title="开具处方单" :description="checkDetail.createTime" /> <el-step title="开具处方单" :description="parseTime(checkDetail.createTime, '{y}-{m}-{d} {h}:{i}')" />
<el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" /> <el-step title="缴费开票" :description="parseTime(checkDetail.payTime, '{y}-{m}-{d} {h}:{i}') || '暂未缴费'" />
<el-step title="预约检查" :description="checkDetail.checkStartTime || '暂未预约'" /> <el-step title="预约检查" :description="parseTime(checkDetail.checkStartTime, '{y}-{m}-{d} {h}:{i}') || '暂未预约'" />
<el-step title="检查获取报告" :description="checkDetail.reportTime || '暂未检查'" /> <el-step title="检查获取报告" :description="parseTime(checkDetail.reportTime, '{y}-{m}-{d} {h}:{i}') || '暂未检查'" />
</el-steps> </el-steps>
</div> </div>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">缴费信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">缴费信息</span>
</div> </div>
<!-- 缴费信息 --> <!-- 缴费信息 -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额"> <el-form-item label="缴费金额">
<span>{{ checkDetail.payAmount }}</span> <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
</el-row> </el-row>
<div style="display: flex;align-items: center;margin-bottom: 10px;"> <div style="display: flex;align-items: center;margin-bottom: 10px;">
<div style="height: 16px;border-left: 3px solid #5bb647;" /> <div style="height: 16px;border-left: 3px solid #5bb647;" />
<div style="padding-left: 10px;">预约信息</div> <div style="padding-left: 10px;font-size: 16px;font-weight: bold;">预约信息</div>
<div style="margin-left: auto;padding-right: 50px;"> <div style="margin-left: auto;padding-right: 50px;">
<el-button v-show="checkDetail.deviceId === null" class="fourWordsBtn" @click="bookNow">立即预约</el-button> <el-button v-show="checkDetail.deviceId === null" class="fourWordsBtn" @click="bookNow">立即预约</el-button>
</div> </div>
...@@ -145,7 +146,7 @@ ...@@ -145,7 +146,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="设备服务费用"> <el-form-item label="设备服务费用">
<span>{{ checkDetail.devicePrice }}</span> <span>{{ keepTwoDecimals(checkDetail.devicePrice) }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -154,15 +155,15 @@ ...@@ -154,15 +155,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="checkDetail.checkSchedule < 2" style="position: relative;left: 42px;"> <el-row v-show="checkDetail.checkSchedule < 2">
<el-col :span="8"> <el-col :span="8">
暂未预约 <el-form-item label="暂未预约" />
</el-col> </el-col>
</el-row> </el-row>
<div v-show="checkDetail.checkSchedule >= 2"> <div v-show="checkDetail.checkSchedule >= 2">
<div style="display: flex;align-items: center;margin-bottom: 10px;"> <div style="display: flex;align-items: center;margin-bottom: 10px;">
<div style="height: 16px;border-left: 3px solid #5bb647;" /> <div style="height: 16px;border-left: 3px solid #5bb647;" />
<div style="padding-left: 10px;">检查信息</div> <div style="padding-left: 10px;font-size: 16px;font-weight: bold;">检查信息</div>
<div style="margin-left: auto;padding-right: 50px;"> <div style="margin-left: auto;padding-right: 50px;">
<el-button v-show="checkDetail.checkSchedule >=2 && (checkDetail.shadowReport === null || checkDetail.shadowReport === '')" class="fourWordsBtn" @click="uploadReport">上传报告</el-button> <el-button v-show="checkDetail.checkSchedule >=2 && (checkDetail.shadowReport === null || checkDetail.shadowReport === '')" class="fourWordsBtn" @click="uploadReport">上传报告</el-button>
</div> </div>
...@@ -218,7 +219,7 @@ ...@@ -218,7 +219,7 @@
</div> </div>
</el-form> </el-form>
<div style="display: flex; justify-content: left; margin-top: 20px"> <div style="display: flex; justify-content: left; margin-top: 20px">
<el-button class="queryBtn" @click="goBack">返 回</el-button> <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
</div> </div>
<!-- 上传报告对话框 --> <!-- 上传报告对话框 -->
<el-dialog <el-dialog
...@@ -276,6 +277,14 @@ export default { ...@@ -276,6 +277,14 @@ export default {
this.schedule = parseInt(this.checkDetail.checkSchedule) + 1 this.schedule = parseInt(this.checkDetail.checkSchedule) + 1
}) })
}, },
// 金额保留两位小数
keepTwoDecimals(price) {
if (price === null) {
return '-'
} else {
return '￥' + price.toFixed(2)
}
},
// 点击 预约信息-立即预约 // 点击 预约信息-立即预约
bookNow() { bookNow() {
this.$router.push({ this.$router.push({
......
src/views/service-management/medical-record-management/check-item.vue
View file @ 4d2439a9
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
<el-input-number <el-input-number
v-model="item.sort" v-model="item.sort"
:min="0" :min="0"
:max="9999"
controls-position="right" controls-position="right"
style="width: 256px" style="width: 256px"
/> />
...@@ -373,6 +374,10 @@ export default { ...@@ -373,6 +374,10 @@ export default {
// 解开遮罩层 // 解开遮罩层
this.$message.success('操作成功') this.$message.success('操作成功')
// this.fullscreenLoading = false // this.fullscreenLoading = false
// 提交成功后返回表格
this.$router.push({
name: 'CheckManagement'
})
} }
}) })
} }
......
src/views/service-management/medical-record-management/check-subscribe.vue
View file @ 4d2439a9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<el-form ref="form" :model="checkDetail" label-width="100px"> <el-form ref="form" :model="checkDetail" label-width="100px">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">宠物信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物性别"> <el-form-item label="宠物性别">
<span>{{ subscribeMessage.petSex === '0' ? '公' : (subscribeMessage.petSex === '1' ? '母' : '未知') }}</span> <span>{{ subscribeMessage.petSex === '0' ? '雄性' : (subscribeMessage.petSex === '1' ? '雌性' : '其他') }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">参考信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">参考信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
...@@ -92,13 +92,13 @@ ...@@ -92,13 +92,13 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额"> <el-form-item label="缴费金额">
<span>{{ subscribeMessage.payAmount }}</span> <span>{{ keepTwoDecimals(subscribeMessage.payAmount) }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">设备预约</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">设备预约</span>
</div> </div>
<el-form ref="formDevice" :model="queryParams" label-width="100px"> <el-form ref="formDevice" :model="queryParams" label-width="100px">
<el-row> <el-row>
...@@ -134,10 +134,21 @@ ...@@ -134,10 +134,21 @@
</el-row> </el-row>
</el-form> </el-form>
<!-- 设备表格 --> <!-- 设备表格 -->
<el-table :data="deviceList"> <el-table
:data="deviceList"
:header-cell-style="{background:'#E8E9E8'}"
>
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="检查日期" align="center" prop="checkDate" /> <el-table-column label="检查日期" align="center" prop="checkDate">
<el-table-column label="检查时段" align="center" prop="checkTime" /> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkDate, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="检查时段" align="center" prop="checkTime">
<template slot-scope="scope">
<span>{{ scope.row.checkTime.replace('-', '~') }}</span>
</template>
</el-table-column>
<el-table-column label="剩余可预约" align="center" prop="num" /> <el-table-column label="剩余可预约" align="center" prop="num" />
<el-table-column v-if="subscribeMessage.checkType === '2'" label="设备服务费" align="center" prop="price" /> <el-table-column v-if="subscribeMessage.checkType === '2'" label="设备服务费" align="center" prop="price" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
...@@ -157,6 +168,9 @@ ...@@ -157,6 +168,9 @@
:limit.sync="deviceQueryParams.pageSize" :limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice" @pagination="getDevice"
/> />
<div style="display: flex; justify-content: left; margin-top: 20px">
<el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
</div>
</div> </div>
</template> </template>
...@@ -214,6 +228,7 @@ export default { ...@@ -214,6 +228,7 @@ export default {
}) })
}, },
methods: { methods: {
parseTime,
// 点击立即预约 // 点击立即预约
handleBookNow(row) { handleBookNow(row) {
this.$confirm('立即预约此设备,是否确定?', '提示', { this.$confirm('立即预约此设备,是否确定?', '提示', {
...@@ -249,7 +264,21 @@ export default { ...@@ -249,7 +264,21 @@ export default {
}) })
}) })
}, },
// 金额保留两位小数
keepTwoDecimals(price) {
if (price === null) {
return '-'
} else {
return '￥' + price.toFixed(2)
}
},
getList() {}, getList() {},
// 返回上一页
goBack() {
this.$router.push({
name: 'CheckDetail'
})
},
// 获取设备列表 // 获取设备列表
getDevice() { getDevice() {
listReservationDevice(this.deviceQueryParams).then(res => { listReservationDevice(this.deviceQueryParams).then(res => {
......
src/views/service-management/medical-record-management/medical-record-management.vue
View file @ 4d2439a9
...@@ -115,11 +115,12 @@ ...@@ -115,11 +115,12 @@
v-loading="loading" v-loading="loading"
:data="manageList" :data="manageList"
:row-key="getRowKeys" :row-key="getRowKeys"
:header-cell-style="{background:'#E8E9E8'}"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="center" /> <el-table-column label="序号" type="index" align="left" />
<el-table-column label="检查类型" align="center" prop="checkType" width="100"> <el-table-column label="检查类型" align="left" prop="checkType" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.check_type" :options="dict.type.check_type"
...@@ -127,9 +128,13 @@ ...@@ -127,9 +128,13 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查项目" align="center" :show-overflow-tooltip="true" prop="checkItemsName" /> <el-table-column label="检查项目" align="left" :show-overflow-tooltip="true" prop="checkItemsName">
<el-table-column label="宠物昵称" align="center" :show-overflow-tooltip="true" prop="petNickname" /> <template slot-scope="scope">
<el-table-column label="宠物保险" align="center" :show-overflow-tooltip="true" prop="insure"> <span>{{ scope.row.checkItemsName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="宠物昵称" align="left" :show-overflow-tooltip="true" prop="petNickname" />
<el-table-column label="宠物保险" align="left" :show-overflow-tooltip="true" prop="insure">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.pet_insure" :options="dict.type.pet_insure"
...@@ -137,11 +142,15 @@ ...@@ -137,11 +142,15 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="宠主姓名" align="center" :show-overflow-tooltip="true" prop="nickname" /> <el-table-column label="宠主姓名" align="left" :show-overflow-tooltip="true" prop="nickname">
<el-table-column label="联系方式" align="center" :show-overflow-tooltip="true" prop="phonenumber" width="90" /> <template slot-scope="scope">
<el-table-column label="预约兽医" align="center" :show-overflow-tooltip="true" prop="doctorName" /> <span>{{ scope.row.nickname || '-' }}</span>
<el-table-column label="所属科室" align="center" :show-overflow-tooltip="true" prop="doctorDeptName" /> </template>
<el-table-column label="缴费状态" align="center" :show-overflow-tooltip="true" prop="payType"> </el-table-column>
<el-table-column label="联系方式" align="left" :show-overflow-tooltip="true" prop="phonenumber" width="90" />
<el-table-column label="预约兽医" align="left" :show-overflow-tooltip="true" prop="doctorName" />
<el-table-column label="所属科室" align="left" :show-overflow-tooltip="true" prop="doctorDeptName" />
<el-table-column label="缴费状态" align="left" :show-overflow-tooltip="true" prop="payType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.payment_status" :options="dict.type.payment_status"
...@@ -149,43 +158,47 @@ ...@@ -149,43 +158,47 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预约状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule"> <el-table-column label="预约状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">未预约</span> <span v-show="scope.row.checkSchedule < 2" style="color: #F56C6C">未预约</span>
<span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span> <span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule"> <el-table-column label="检查状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.checkSchedule === '0' || scope.row.checkSchedule === '1'">-</span> <span v-show="scope.row.checkSchedule === '0' || scope.row.checkSchedule === '1'">-</span>
<span v-show="scope.row.checkSchedule === '2'">未检查</span> <span v-show="scope.row.checkSchedule === '2'">未检查</span>
<span v-show="scope.row.checkSchedule === '3'">已检查</span> <span v-show="scope.row.checkSchedule === '3'">已检查</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查日期" align="center" :show-overflow-tooltip="true" prop="reportTime"> <el-table-column label="检查日期" align="left" :show-overflow-tooltip="true" prop="reportTime">
<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="center" :show-overflow-tooltip="true" prop="checkStartTime" width="80"> <el-table-column label="检查时段" align="left" :show-overflow-tooltip="true" prop="checkStartTime" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.checkStartTime === null && scope.row.checkEndTime === null">{{ '-' }}</span> <span v-if="scope.row.checkStartTime === null && scope.row.checkEndTime === null">{{ '-' }}</span>
<span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span> <span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="details" style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95, 181, 75);color: #5FB54B;background: rgba(91,182,71,0.08);"
type="success"
size="mini" size="mini"
icon="el-icon-document" icon="el-icon-document"
plain
@click="handleDetails(scope.row)" @click="handleDetails(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button <el-button
class="bookNow" style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255, 157, 78);color: #FF9D4E;background: rgba(255,157,78,0.08);"
size="mini" size="mini"
type="success"
icon="el-icon-check" icon="el-icon-check"
plain
:disabled="scope.row.deviceId !== null" :disabled="scope.row.deviceId !== null"
@click="handleSubscribe(scope.row)" @click="handleSubscribe(scope.row)"
>立即预约 >立即预约
...@@ -254,10 +267,19 @@ ...@@ -254,10 +267,19 @@
<el-table <el-table
:data="deviceList" :data="deviceList"
style="width: 100%" style="width: 100%"
:header-cell-style="{background:'#E8E9E8'}"
> >
<el-table-column prop="deviceName" align="left" label="设备名称" /> <el-table-column prop="deviceName" align="left" label="设备名称" />
<el-table-column prop="checkDate" align="left" label="检查日期" /> <el-table-column prop="checkDate" align="left" label="检查日期">
<el-table-column prop="checkTime" align="left" label="检查时段" /> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkDate, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column prop="checkTime" align="left" label="检查时段">
<template slot-scope="scope">
<span>{{ scope.row.checkTime.replace('-', '~') }}</span>
</template>
</el-table-column>
<el-table-column prop="num" align="left" label="剩余可预约" /> <el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column prop="date" align="left" label="设备服务费" /> <el-table-column prop="date" align="left" label="设备服务费" />
<el-table-column align="left" label="操作"> <el-table-column align="left" label="操作">
...@@ -684,7 +706,7 @@ export default { ...@@ -684,7 +706,7 @@ export default {
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
}) })
} else { } else {
this.$modal.msgError('请选择至少一条数据导出') this.$modal.msgWarning('请选择至少一条数据导出')
return return
} }
}, },
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ 4d2439a9
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
clearable clearable
placeholder="手机号" placeholder="请输入宠主手机号"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@blur="handleQuery" @blur="handleQuery"
/> />
...@@ -48,11 +48,31 @@ ...@@ -48,11 +48,31 @@
> >
<el-table-column align="center" min-width="30" reserve-selection type="selection" /> <el-table-column align="center" min-width="30" reserve-selection type="selection" />
<el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" /> <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column align="center" label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip /> <el-table-column align="center" label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
<el-table-column align="center" label="手机号" min-width="80" prop="phone" show-overflow-tooltip /> <template slot-scope="scope">
<el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip /> <span>{{ scope.row.ownerName || '-' }}</span>
<el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip /> </template>
<el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip /> </el-table-column>
<el-table-column align="center" label="手机号" min-width="80" prop="phone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.phone || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.membershipLevel || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.balance || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- align="center"--> <!-- align="center"-->
<!-- label="宠物品种"--> <!-- label="宠物品种"-->
...@@ -66,7 +86,7 @@ ...@@ -66,7 +86,7 @@
prop="petBreed" prop="petBreed"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.petBreed}}/{{scope.row.petChildBreed}} {{ scope.row.petBreed }}/{{ scope.row.petChildBreed }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip> <el-table-column align="center" label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
......
src/views/service-management/registration-queue/components/prescribing-modle.vue
View file @ 4d2439a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物品种" prop="petBreed" class="petBreed"> <el-form-item label="宠物品种" prop="petBreed" class="petBreed">
<el-input v-model="registerForm.petBreed" disabled /> <el-input v-model="registerForm.petBreed" disabled />
<el-input v-model="registerForm.petChildBreed" class="petChildBreed" disabled /> <el-input v-model="registerForm.petChildBreed" class="petChildBreed" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -149,10 +149,10 @@ ...@@ -149,10 +149,10 @@
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="(item, index) in dict.type.pet_sex" v-for="items in dict.type.pet_sex"
:key="index" :key="items.value"
:label="item.label" :label="items.label"
:value="item.value" :value="items.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -195,8 +195,8 @@ ...@@ -195,8 +195,8 @@
@change="getCheckItemOptions" @change="getCheckItemOptions"
> >
<el-option <el-option
v-for="(item, index) in dict.type.check_type" v-for="item in dict.type.check_type"
:key="index" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,8 @@
@change="setCheckItemsName(singleItem,checkItemOptions)" @change="setCheckItemsName(singleItem,checkItemOptions)"
> >
<el-option <el-option
v-for="(item, index) in checkItemOptions" v-for="item in checkItemOptions"
:key="index" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
...@@ -241,8 +241,8 @@ ...@@ -241,8 +241,8 @@
@change="setTreatItemsName(singleItem,treatItemOptions)" @change="setTreatItemsName(singleItem,treatItemOptions)"
> >
<el-option <el-option
v-for="(item, index) in treatItemOptions" v-for="item in treatItemOptions"
:key="index" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
...@@ -388,6 +388,10 @@ export default { ...@@ -388,6 +388,10 @@ export default {
} }
} }
}, },
computed: {
...mapGetters(['deptId', 'name'])
},
watch: { watch: {
registerForm(val) { registerForm(val) {
if (val.checkManageBos.length > 0) { if (val.checkManageBos.length > 0) {
...@@ -398,9 +402,6 @@ export default { ...@@ -398,9 +402,6 @@ export default {
} }
} }
}, },
computed: {
...mapGetters(['deptId', 'name'])
},
created() { created() {
}, },
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 4d2439a9
...@@ -146,11 +146,11 @@ export default { ...@@ -146,11 +146,11 @@ export default {
fristVisitOptions: [ fristVisitOptions: [
{ {
label: '是', label: '是',
value: '1' value: '0'
}, },
{ {
label: '否', label: '否',
value: '0' value: '1'
} }
] ]
} }
......
src/views/service-management/registration-queue/registration-add.vue
View file @ 4d2439a9
...@@ -26,12 +26,22 @@ ...@@ -26,12 +26,22 @@
<el-row :gutter="41"> <el-row :gutter="41">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物ID:" prop="petsId"> <el-form-item label="宠物ID:" prop="petsId">
<el-input v-model="form.petsId" :disabled="true" maxlength="20" /> <el-input
v-model="form.petsId"
:placeholder="isEdit? '请输入宠物ID' : '暂无数据'"
:disabled="true"
maxlength="20"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物昵称:" prop="petNickname"> <el-form-item label="宠物昵称:" prop="petNickname">
<el-input v-model="form.petNickname" :disabled="!isEdit" maxlength="10" placeholder="请输入宠物昵称" /> <el-input
v-model.trim="form.petNickname"
:disabled="!isEdit"
maxlength="10"
:placeholder="isEdit? '请输入宠物昵称' : '暂无数据'"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -41,7 +51,7 @@ ...@@ -41,7 +51,7 @@
v-model="form.petBreedId" v-model="form.petBreedId"
:disabled="!isEdit" :disabled="!isEdit"
clearable clearable
placeholder="请选择宠物品种" :placeholder="isEdit? '请输入主品种' : '暂无数据'"
style="width: 100%" style="width: 100%"
@change="changePetBreedId" @change="changePetBreedId"
> >
...@@ -56,10 +66,10 @@ ...@@ -56,10 +66,10 @@
v-model="form.petChildBreedId" v-model="form.petChildBreedId"
:disabled="!isEdit" :disabled="!isEdit"
clearable clearable
placeholder="请选择宠物品种" :placeholder="isEdit? '请输入子品种' : '暂无数据'"
style="width: 100%" style="width: 100%"
@change="changePetChildBreedId"
class="petChildBreed" class="petChildBreed"
@change="changePetChildBreedId"
> >
<el-option <el-option
v-for="(item, index) in petOptions[form.petBreedId]" v-for="(item, index) in petOptions[form.petBreedId]"
...@@ -77,7 +87,7 @@ ...@@ -77,7 +87,7 @@
v-model="form.petSex" v-model="form.petSex"
:disabled="!isEdit" :disabled="!isEdit"
clearable clearable
placeholder="请选择宠物性别" :placeholder="isEdit? '请选择宠物性别' : '暂无数据'"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
...@@ -96,7 +106,7 @@ ...@@ -96,7 +106,7 @@
:disabled="!isEdit" :disabled="!isEdit"
:picker-options="pickerOptions" :picker-options="pickerOptions"
clearable clearable
placeholder="请选择宠物生日" :placeholder="isEdit? '请选择宠物生日' : '暂无数据'"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
/> />
...@@ -105,14 +115,24 @@ ...@@ -105,14 +115,24 @@
<el-col :span="8"> <el-col :span="8">
<!--宠物体重--> <!--宠物体重-->
<el-form-item label="宠物体重" prop="petWeight"> <el-form-item label="宠物体重" prop="petWeight">
<el-input v-model="form.petWeight" maxlength="10" :disabled="!isEdit"> <el-input
v-model.trim="form.petWeight"
:placeholder="isEdit? '请输入宠物体重' : '暂无数据'"
maxlength="10"
:disabled="!isEdit"
>
<template #suffix>kg</template> <template #suffix>kg</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物毛色:" prop="petColor"> <el-form-item label="宠物毛色:" prop="petColor">
<el-input v-model="form.petColor" :disabled="!isEdit" maxlength="10" placeholder="请输入宠物毛色" /> <el-input
v-model.trim="form.petColor"
:disabled="!isEdit"
maxlength="10"
:placeholder="isEdit? '请输入宠物毛色' : '暂无数据'"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -121,7 +141,7 @@ ...@@ -121,7 +141,7 @@
v-model="form.sterilizationStatus" v-model="form.sterilizationStatus"
:disabled="!isEdit" :disabled="!isEdit"
clearable clearable
placeholder="请选择宠物绝育情况" :placeholder="isEdit? '请选择宠物绝育情况' : '暂无数据'"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
...@@ -139,7 +159,7 @@ ...@@ -139,7 +159,7 @@
v-model="form.vaccineSituation" v-model="form.vaccineSituation"
:disabled="!isEdit" :disabled="!isEdit"
clearable clearable
placeholder="请选择宠物疫苗情况" :placeholder="isEdit? '请选择疫苗情况' : '暂无数据'"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
...@@ -157,7 +177,7 @@ ...@@ -157,7 +177,7 @@
v-model="form.insure" v-model="form.insure"
:disabled="!isEdit" :disabled="!isEdit"
clearable clearable
placeholder="请选择宠物保险情况" :placeholder="isEdit? '请选择宠物保险' : '暂无数据'"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
...@@ -178,7 +198,13 @@ ...@@ -178,7 +198,13 @@
<el-row v-if="isEdit && !showPetInfo" :gutter="41"> <el-row v-if="isEdit && !showPetInfo" :gutter="41">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠主手机号:" prop="masterPhone"> <el-form-item label="宠主手机号:" prop="masterPhone">
<el-input v-model="form.masterPhone" :disabled="!isEdit" maxlength="11" @blur="checkOwner" /> <el-input
v-model.trim="form.masterPhone"
:placeholder="isEdit? '请输入宠主手机号' : '暂无数据'"
:disabled="!isEdit"
maxlength="11"
@blur="checkOwner"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -547,6 +573,7 @@ export default { ...@@ -547,6 +573,7 @@ export default {
this.doctorIdNd = params.data.userId this.doctorIdNd = params.data.userId
console.log('超级超级超级超级重要！！！', this.doctorIdNd) console.log('超级超级超级超级重要！！！', this.doctorIdNd)
this.registrationType = params.type this.registrationType = params.type
console.log('这是我从新增挂号页面赋值的挂号类型!!!!', this.registrationType)
this.singleDoctor = params.data this.singleDoctor = params.data
this.currentPage = params.cur this.currentPage = params.cur
this.test = { ...this.form } this.test = { ...this.form }
...@@ -654,12 +681,13 @@ export default { ...@@ -654,12 +681,13 @@ export default {
.registration-add-module { .registration-add-module {
.el-form-item.petBreed { .el-form-item.petBreed {
.el-form-item.el-form-item--small { .el-form-item.el-form-item--small {
margin-right: 0!important; margin-right: 0 !important;
margin-bottom: 0!important; margin-bottom: 0 !important;
.el-form-item__content { .el-form-item__content {
display: flex; display: flex;
.petChildBreed{
.petChildBreed {
margin-left: 5px; margin-left: 5px;
} }
} }
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ 4d2439a9
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
class="fourWordsBtn" class="fourWordsBtn"
icon="el-icon-circle-plus-outline" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增挂号 >新增挂号
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!--选择全部--> <!--选择全部-->
<el-button <el-button
class="fourWordsBtn" class="fourWordsBtn"
icon="el-icon-right" icon="el-icon-finished"
size="mini" size="mini"
@click="checkAll" @click="checkAll"
>选择全部 >选择全部
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
<el-table <el-table
ref="table" ref="table"
v-loading="loading" v-loading="loading"
:header-cell-style="{background:'#E8E9E8'}"
:data="registerList" :data="registerList"
@select="selectChange" @select="selectChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -130,14 +131,26 @@ ...@@ -130,14 +131,26 @@
<span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span> <span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip /> <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip> <el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
<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 align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip /> <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip>
<el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip /> <template slot-scope="scope">
<span>{{ scope.row.petOwnersName || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.petOwnersPhone || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip> <el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
...@@ -156,7 +169,11 @@ ...@@ -156,7 +169,11 @@
<span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span> <span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip /> <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.firstVisit || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip> <el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
......
src/views/service-management/treatment-management/treatment-detail.vue
View file @ 4d2439a9
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
font-weight: bold; font-weight: bold;
color: #333333;" color: #333333;"
>详情</span> >详情</span>
<span style="font-size: 16px;position: absolute;right: 160px;padding-top: 5px;">{{ checkDetail.medicalRecordNo }}</span>
</div> </div>
<el-form ref="form" :model="checkDetail" label-width="100px"> <el-form ref="form" :model="checkDetail" label-width="100px">
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">宠物信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物性别"> <el-form-item label="宠物性别">
<span>{{ checkDetail.petSex === '0' ? '公' : (checkDetail.petSex === '1' ? '母' : '未知') }}</span> <span>{{ checkDetail.petSex === '0' ? '雄性' : (checkDetail.petSex === '1' ? '雌性' : '其他') }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">宠主信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">宠主信息</span>
</div> </div>
<!-- 1 --> <!-- 1 -->
<el-row> <el-row>
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">治疗进度</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">治疗进度</span>
</div> </div>
<!-- 步骤条 --> <!-- 步骤条 -->
<div> <div>
...@@ -109,22 +110,20 @@ ...@@ -109,22 +110,20 @@
</el-steps> </el-steps>
</div> </div>
<div class="title-paragraph"> <div class="title-paragraph">
<span class="title-text">缴费信息</span> <span class="title-text" style="font-size: 16px;font-weight: bold;">缴费信息</span>
</div> </div>
<!-- 缴费信息 --> <!-- 缴费信息 -->
<el-row v-show="treatSchedule<=1"> <el-row v-show="treatSchedule<=1">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="代缴费金额"> <el-form-item label="代缴费金额">
<span v-show="checkDetail.payAmount!==null&&checkDetail.payAmount!==''">￥</span> <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
<span>{{ checkDetail.payAmount || '-' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="treatSchedule>1"> <el-row v-show="treatSchedule>1">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额"> <el-form-item label="缴费金额">
<span v-show="checkDetail.payAmount!==null&&checkDetail.payAmount!==''">￥</span> <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
<span>{{ checkDetail.payAmount || '-' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -140,7 +139,7 @@ ...@@ -140,7 +139,7 @@
</el-row> </el-row>
<div v-show="treatSchedule >= 2" style="display: flex;align-items: center;"> <div v-show="treatSchedule >= 2" style="display: flex;align-items: center;">
<div class="tip1" /> <div class="tip1" />
<div class="title-text">分配信息</div> <div class="title-text" style="font-size: 16px;font-weight: bold;">分配信息</div>
<div v-show="treatSchedule === 2" style="margin-left: auto;padding-right: 50px"> <div v-show="treatSchedule === 2" style="margin-left: auto;padding-right: 50px">
<el-button class="fourWordsBtn" @click="handleSubscribe">分配诊室</el-button> <el-button class="fourWordsBtn" @click="handleSubscribe">分配诊室</el-button>
</div> </div>
...@@ -171,7 +170,7 @@ ...@@ -171,7 +170,7 @@
<div> <div>
<div v-show="treatSchedule>=3" style="display: flex;align-items: center;"> <div v-show="treatSchedule>=3" style="display: flex;align-items: center;">
<div class="tip1" /> <div class="tip1" />
<div class="title-text">治疗信息</div> <div class="title-text" style="font-size: 16px;font-weight: bold;">治疗信息</div>
<div v-show="treatSchedule===3" style="margin-left: auto;padding-right: 50px"> <div v-show="treatSchedule===3" style="margin-left: auto;padding-right: 50px">
<el-button class="fourWordsBtn" @click="uploadReport">上传日志</el-button> <el-button class="fourWordsBtn" @click="uploadReport">上传日志</el-button>
</div> </div>
...@@ -222,13 +221,13 @@ ...@@ -222,13 +221,13 @@
<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 style="display: flex;padding-bottom: 20px;">
<div class="tip1" /> <div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">预约记录</div> <div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">预约记录</div>
</div> </div>
<el-form :model="allocationForm" label-width="80px"> <el-form :model="allocationForm" label-width="auto">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="诊室"> <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="请选择诊室" style="width: 200px" @change="allocationFormChangeName">
<el-option <el-option
v-for="item in consultingName" v-for="item in consultingName"
:key="item.id" :key="item.id"
...@@ -238,10 +237,11 @@ ...@@ -238,10 +237,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="治疗日期"> <el-form-item label="治疗日期">
<el-date-picker <el-date-picker
v-model="treatStartTime" v-model="treatStartTime"
style="width: 200px"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -279,11 +279,11 @@ ...@@ -279,11 +279,11 @@
</el-table> </el-table>
<div style="display: flex;padding-top: 20px;padding-bottom: 20px;"> <div style="display: flex;padding-top: 20px;padding-bottom: 20px;">
<div class="tip1" /> <div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">添加预约</div> <div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">添加预约</div>
</div> </div>
<el-form ref="treatTimeForm" :model="appointmentRoom" :rules="treatTimerules" label-width="80px"> <el-form ref="treatTimeForm" :model="appointmentRoom" :rules="treatTimerules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="诊室" prop="consultRoomId"> <el-form-item label="诊室" prop="consultRoomId">
<el-select v-model="reservationForm.consultRoomName" clearable placeholder="请选择诊室" value-key="id" @change="getconsultingName"> <el-select v-model="reservationForm.consultRoomName" clearable placeholder="请选择诊室" value-key="id" @change="getconsultingName">
<el-option <el-option
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="治疗日期" prop="treatDate"> <el-form-item label="治疗日期" prop="treatDate">
<el-date-picker <el-date-picker
v-model="appointmentRoom.treatDate" v-model="appointmentRoom.treatDate"
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="开始时间" prop="sTime"> <el-form-item label="开始时间" prop="sTime">
<el-time-select <el-time-select
v-model="appointmentRoom.sTime" v-model="appointmentRoom.sTime"
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="结束时间" prop="eTime"> <el-form-item label="结束时间" prop="eTime">
<el-time-select <el-time-select
v-model="appointmentRoom.eTime" v-model="appointmentRoom.eTime"
...@@ -472,6 +472,14 @@ export default { ...@@ -472,6 +472,14 @@ export default {
this.$message.error('请上传日志') this.$message.error('请上传日志')
} }
}, },
// 金额保留两位小数
keepTwoDecimals(price) {
if (price === null) {
return '-'
} else {
return '￥' + price.toFixed(2)
}
},
/** 上传报告对话框取消 */ /** 上传报告对话框取消 */
cancelVideo() { cancelVideo() {
this.videoReport = null this.videoReport = null
......
src/views/service-management/treatment-management/treatment-item.vue
View file @ 4d2439a9
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
<el-input-number <el-input-number
v-model="item.sort" v-model="item.sort"
:min="0" :min="0"
:max="9999"
controls-position="right" controls-position="right"
style="width: 256px" style="width: 256px"
/> />
...@@ -381,6 +382,10 @@ export default { ...@@ -381,6 +382,10 @@ export default {
// 解开遮罩层 // 解开遮罩层
this.$message.success('操作成功') this.$message.success('操作成功')
// this.fullscreenLoading = false // this.fullscreenLoading = false
// 提交成功后返回表格
this.$router.push({
name: 'TreatmentManagement'
})
} }
}) })
} }
......
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