Commit f6b44ae6 authored by 高滢's avatar 高滢

Merge remote-tracking branch 'origin/master'

parents 08015bbd ad696e49
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'
})
}
......@@ -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;
}
......@@ -36,7 +36,7 @@ export default {
pageSizes: {
type: Array,
default() {
return [10, 20, 30, 50]
return [20, 50, 100]
}
},
// 移动端页码按钮的数量端默认值5
......
......@@ -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,10 +44,12 @@ export default {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
background-color: #F4F4F4 !important;
}
.fixed-header + .app-main {
padding-top: 84px;
background-color: #F4F4F4 !important;
}
}
</style>
......@@ -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',
......
......@@ -29,6 +29,7 @@
:max="9999"
:min="0"
controls-position="right"
style=""
/>
</el-form-item>
<el-form-item label="文章封面" prop="articleCover">
......
......@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item style="margin-left: 10px;" prop="articleStatus">
<el-select v-model.trim="queryParams.articleStatus" clearable placeholder="状态">
<el-option label="全部" :value="null" />
<!-- <el-option label="全部" :value="null" />-->
<el-option
v-for="item in dict.type.article_status"
:key="item.value"
......
This diff is collapsed.
......@@ -78,14 +78,17 @@
:prop="'settingList.'+index+'.price'"
:rules="[
{ required: true, message: '请输入项目单价', trigger: 'change' },
{ validator: validatePrice, trigger: 'change, blur' }
]"
>
<el-input-number
v-model="item.price"
:min="0"
:max="9999.99"
controls-position="right"
style="width: 240px"
placeholder="0.00"
:precision="2"
@keydown.native="keydown($event)"
/>
......@@ -122,6 +125,10 @@
:ref="'settingList.'+index+'.sort'"
label="权重"
:prop="'settingList.'+index+'.sort'"
:rules="[
{ required: true, message: '请输入权重', trigger: 'change' },
{ validator: validWeigh, trigger: 'change, blur' }
]"
>
<el-input-number
v-model="item.sort"
......@@ -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() {
const parsedValue = parseFloat(this.form.sort)
......
......@@ -265,22 +265,13 @@
<el-row>
<el-col>
<el-form-item label="支持服务地区">
<!-- <el-input-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- placeholder="暂无数据"-->
<!-- maxlength="200"-->
<!-- style="width:705%;"-->
<!-- :rows="4"-->
<!-- />-->
<el-select v-model="form.serviceArea" multiple placeholder="请选择支持服务地区" disabled style="width: 300px">
<el-option
v-for="dict in dict.type.service_area"
:key="dict.label"
:label="dict.label"
:value="dict.value"
<el-input
v-model.trim="form.serviceAreaList"
type="textarea"
style="width:705%;;"
:row="4"
disabled
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -288,14 +279,13 @@
<el-row>
<el-col>
<el-form-item label="支持检查类型">
<el-select v-model="form.checkType" multiple placeholder="请选择支持检查类型" style="width: 300px" disabled>
<el-option
v-for=" dict in dict.type.exam_type"
:key="dict.label"
:label="dict.label"
:value="dict.value"
<el-input
v-model.trim="form.checkTypeList"
type="textarea"
style="width:705%;;"
:row="4"
disabled
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -1081,6 +1071,8 @@ export default {
// })
// }
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(',')
}
......
......@@ -127,7 +127,7 @@
</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-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 label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
<el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />
......
......@@ -264,7 +264,7 @@ export default {
sort: null
},
pageNum: 1,
pageSize: 10,
pageSize: 20,
petNickname: null,
nickname: null,
petOwnerNumber: null,
......
......@@ -158,6 +158,7 @@
<el-row v-show="checkDetail.checkSchedule < 2">
<el-col :span="8">
<el-form-item label="暂未预约">
<span></span>
</el-form-item>
</el-col>
</el-row>
......
......@@ -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)
......
......@@ -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()"
>检查项目
......@@ -115,8 +115,8 @@
v-loading="loading"
:data="manageList"
:row-key="getRowKeys"
@selection-change="handleSelectionChange"
:header-cell-style="{background:'#E8E9E8'}"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="left" />
......@@ -130,7 +130,7 @@
</el-table-column>
<el-table-column label="检查项目" align="left" :show-overflow-tooltip="true" prop="checkItemsName">
<template slot-scope="scope">
<span>{{scope.row.checkItemsName || '-'}}</span>
<span>{{ scope.row.checkItemsName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="宠物昵称" align="left" :show-overflow-tooltip="true" prop="petNickname" />
......@@ -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
})
}
})
},
/** 重置按钮操作 */
......
......@@ -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,
......
......@@ -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,
......
......@@ -227,7 +227,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="诊室">
<el-select v-model="allocationForm.consultRoomIdList" clearable multiple collapse-tags placeholder="请选择诊室" @change="allocationFormChangeName" style="width: 200px">
<el-select v-model="allocationForm.consultRoomIdList" clearable multiple collapse-tags placeholder="请选择诊室" style="width: 200px" @change="allocationFormChangeName">
<el-option
v-for="item in consultingName"
:key="item.id"
......@@ -240,8 +240,8 @@
<el-col :span="12">
<el-form-item label="治疗日期">
<el-date-picker
style="width: 200px"
v-model="treatStartTime"
style="width: 200px"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
......@@ -503,7 +503,7 @@ export default {
return treatRange
},
// 预约诊室搜索
allocationFormChangeName(value) {
allocationFormChangeName() {
this.getAppointmentRecord()
},
// 分配诊室治疗时间查询
......
......@@ -11,10 +11,10 @@
<el-form-item prop="petWeight">
<el-select v-model="queryParams.treatItemsIdList" clearable multiple collapse-tags placeholder="治疗类型">
<el-option
v-for="item in treatmentDropdown"
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in dict.type.treat_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
......@@ -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
......@@ -83,7 +101,7 @@
:row-key="getRowKeys"
:header-cell-class-name="cellClass"
@selection-change="handleSelectionChange"
:header-cell-style="{background:'#E8E9E8'}"
: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>
......@@ -344,7 +389,7 @@ import { parseTime } from '@/utils/ruoyi'
export default {
name: 'MedicalRecordManagement',
dicts: ['check_type', 'pet_insure', 'payment_status', 'payment_status'],
dicts: ['check_type', 'pet_insure', 'payment_status', 'payment_status', 'treat_type'],
data() {
return {
// 时间模糊查询
......@@ -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