Skip to content

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

Merge remote-tracking branch 'origin/master'

parents dfb06467 02ac6743
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 749 additions and 328 deletions
src/router/index.js
View file @ f3b44ec2
...@@ -186,78 +186,6 @@ export const constantRoutes = [ ...@@ -186,78 +186,6 @@ export const constantRoutes = [
} }
] ]
}, },
//
// // 病历路由
// {
// path: '',
// hidden: true,
// component: Layout,
// redirect: 'index',
// children: [
// // 病历详情页
// {
// path: '/medical-detail/:id',
// props: true,
// permissions: ['*:*:*'],
// component: () => import('@/views/medical-record-management/medical-detail'),
// name: 'MedicalDetail',
// meta: {
// title: '病历详情',
// icon: 'dashboard',
// activeMenu: '/medical-record-management'
// }
// },
// // 预约设备页面
// {
// path: '/reservation-equipment/:id:pet',
// props: true,
// permissions: ['*:*:*'],
// component: () => import('@/views/medical-record-management/reservation-equipment'),
// name: 'ReservationEquipment',
// meta: {
// title: '预约设备',
// icom: 'dashboard',
// activeMenu: '/medical-record-management/medical-detail'
// }
// },
// // 检查详情
// {
// path: '/check-detail',
// props: true,
// hidden: true,
// component: () => import('@/views/service-management/medical-record-management/check-detail.vue'),
// name: 'CheckDetail',
// meta: {
// title: '检查详情',
// icon: 'component'
// }
// },
// // 检查管理-立即预约
// {
// path: '/check-subscribe',
// props: true,
// hidden: true,
// component: () => import('@/views/service-management/medical-record-management/check-subscribe.vue'),
// name: 'CheckSubscribe',
// meta: {
// title: '立即预约',
// icon: 'component'
// }
// },
// // 检查管理-检查影像
// {
// path: '/check-item',
// props: true,
// hidden: true,
// component: () => import('@/views/service-management/medical-record-management/check-item.vue'),
// name: 'CheckItem',
// meta: {
// title: '检查项目',
// icon: 'component'
// }
// }
// ]
// },
// 个人中心 // 个人中心
{ {
path: '/user', path: '/user',
...@@ -355,6 +283,16 @@ export const constantRoutes = [ ...@@ -355,6 +283,16 @@ export const constantRoutes = [
title: '挂号新增', icon: 'component' title: '挂号新增', icon: 'component'
} }
}, },
// 治疗管理
{
path: 'treatment-management',
component: () => import('@/views/service-management/treatment-management/treatment-management'),
name: 'TreatmentManagement',
props: true,
meta: {
title: '治疗管理', icon: 'component'
}
},
// 检查管理 // 检查管理
{ {
path: 'medical-record-management', path: 'medical-record-management',
...@@ -400,6 +338,42 @@ export const constantRoutes = [ ...@@ -400,6 +338,42 @@ export const constantRoutes = [
title: '检查项目', title: '检查项目',
icon: 'component' icon: 'component'
} }
},
// 治疗详情
{
path: 'treatment-detail',
props: true,
hidden: true,
component: () => import('@/views/service-management/treatment-management/treatment-detail'),
name: 'TreatmentDetail',
meta: {
title: '治疗详情',
icon: 'component'
}
},
// 治疗管理-立即预约
{
path: 'treatment-subscribe',
props: true,
hidden: true,
component: () => import('@/views/service-management/treatment-management/treatment-subscribe'),
name: 'TreatmentSubscribe',
meta: {
title: '立即预约',
icon: 'component'
}
},
// 治疗管理-治疗項目
{
path: 'treatment-item',
props: true,
hidden: true,
component: () => import('@/views/service-management/treatment-management/treatment-item'),
name: 'TreatmentItem',
meta: {
title: '治疗项目',
icon: 'component'
}
} }
] ]
} }
......
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ f3b44ec2
...@@ -319,63 +319,63 @@ export default { ...@@ -319,63 +319,63 @@ export default {
area: '' area: ''
}, },
// 表单校验 // 表单校验
// rules: { rules: {
// deviceName: [ deviceName: [
// { required: true, message: '请输入设备名称', trigger: 'blur' }, { required: true, message: '请输入设备名称', trigger: 'blur' },
// { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' } { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
// ], ],
//
// head: [ head: [
// { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' } { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
// ], ],
// phone: [ phone: [
// { {
// pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
// message: '请输入正确的手机号码', message: '请输入正确的手机号码',
// trigger: 'blur' trigger: 'blur'
// } }
// ], ],
// deviceType: [ deviceType: [
// { required: true, message: '请选择设备类型', trigger: 'change' } { required: true, message: '请选择设备类型', trigger: 'change' }
// ], ],
// addressCode: [ addressCode: [
// { required: true, message: '请选择服务地点', trigger: 'change,blur' } { required: true, message: '请选择服务地点', trigger: 'change,blur' }
// ], ],
// address: [ address: [
// { required: true, message: '请输入详细地址', trigger: 'blur' } { required: true, message: '请输入详细地址', trigger: 'blur' }
// ], ],
// ams: [ ams: [
// { validator: this.validateMorningStart, trigger: 'blur' } { validator: this.validateMorningStart, trigger: 'blur' }
// ], ],
// ame: [ ame: [
// { validator: this.validateMorningEnd, trigger: 'blur' } { validator: this.validateMorningEnd, trigger: 'blur' }
// ], ],
// pms: [ pms: [
// { validator: this.validateAfternoonStart, trigger: 'blur' } { validator: this.validateAfternoonStart, trigger: 'blur' }
// ], ],
// pme: [ pme: [
// { validator: this.validateAfternoonEnd, trigger: 'blur' } { validator: this.validateAfternoonEnd, trigger: 'blur' }
// ], ],
// sort: [ sort: [
// { required: true, message: '请输入权重', trigger: 'change' }, { required: true, message: '请输入权重', trigger: 'change' },
// { pattern: /^([1-9]\d{0,3})$/, message: '权重范围为1-9999', trigger: 'blur' } { pattern: /^([1-9]\d{0,3})$/, message: '权重范围为1-9999', trigger: 'blur' }
// ], ],
// status: [ status: [
// { required: true, message: '请选择设备状态', trigger: 'change' } { required: true, message: '请选择设备状态', trigger: 'change' }
// ], ],
// reservationMethod: [ reservationMethod: [
// { required: true, message: '请选择预约方式', trigger: 'change' } { required: true, message: '请选择预约方式', trigger: 'change' }
// ], ],
// remark: [ remark: [
// { min: 2, max: 200, message: '输入内容长度应为2~20个字符', trigger: 'blur' } { min: 2, max: 200, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
// ], ],
// serviceArea: [ serviceArea: [
// { required: true, message: '请选择支持服务地区', trigger: 'blur' } { required: true, message: '请选择支持服务地区', trigger: 'blur' }
// ], ],
// checkType: [ checkType: [
// { required: true, message: '请选择支持检查类型', trigger: 'blur' } { required: true, message: '请选择支持检查类型', trigger: 'blur' }
// ] ]
// }, },
// 是否医院自有设备 // 是否医院自有设备
optionss: [{ optionss: [{
value: '0', value: '0',
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ f3b44ec2
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border @selection-change="handleSelectionChange"> <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" /> <el-table-column type="index" label="序号" width="50" />
<el-table-column label="设备名称" align="center" prop="deviceName" show-overflow-tooltip /> <el-table-column label="设备名称" align="center" prop="deviceName" show-overflow-tooltip />
...@@ -352,44 +352,44 @@ export default { ...@@ -352,44 +352,44 @@ export default {
status: '', status: '',
remark: '' remark: ''
},
// 表单校验
rules: {
userTime: [
{ required: true, message: '请输入预约时间段', trigger: 'change' }
],
useNum: [
{ required: true, message: '请输入预约数量', trigger: 'blur' }
],
orderPrice: [
{ required: true, message: '请输入下单价格', trigger: 'blur' }
],
servicePrice: [
{ required: true, message: '请输入服务价格', trigger: 'blur' }
],
reservationMethod: [
{ required: true, message: '请选择预约方式', trigger: 'change' }
],
serviceArea: [
{ required: true, message: '请选择服务地区', trigger: 'change' }
],
checkType: [
{ required: true, message: '请选择支持检查类型', trigger: 'blur,change' }
],
head: [
{ min: 2, max: 20, message: '输入内容长度应为2到20个字符', trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5A-Za-z]+$/, message: '请输入中英文字符', trigger: 'blur' }
],
deviceName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' },
{ min: 2, max: 20, message: '输入内容长度应为2到20个字符', trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5A-Za-z0-9]+$/, message: '请输入中英文数字', trigger: 'blur' }
],
phone: [
{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }
]
} }
// // 表单校验
// rules: {
// userTime: [
// { required: true, message: '请输入预约时间段', trigger: 'change' }
// ],
// useNum: [
// { required: true, message: '请输入预约数量', trigger: 'blur' }
// ],
// orderPrice: [
// { required: true, message: '请输入下单价格', trigger: 'blur' }
// ],
// servicePrice: [
// { required: true, message: '请输入服务价格', trigger: 'blur' }
// ],
// reservationMethod: [
// { required: true, message: '请选择预约方式', trigger: 'change' }
// ],
// serviceArea: [
// { required: true, message: '请选择服务地区', trigger: 'change' }
// ],
// checkType: [
// { required: true, message: '请选择支持检查类型', trigger: 'blur,change' }
// ],
// head: [
// { min: 2, max: 20, message: '输入内容长度应为2到20个字符', trigger: 'blur' },
// { pattern: /^[\u4E00-\u9FA5A-Za-z]+$/, message: '请输入中英文字符', trigger: 'blur' }
// ],
// deviceName: [
// { required: true, message: '请输入设备名称', trigger: 'blur' },
// { min: 2, max: 20, message: '输入内容长度应为2到20个字符', trigger: 'blur' },
// { pattern: /^[\u4E00-\u9FA5A-Za-z0-9]+$/, message: '请输入中英文数字', trigger: 'blur' }
// ],
// phone: [
// { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }
// ]
//
// }
} }
}, },
watch: { watch: {
...@@ -525,7 +525,7 @@ export default { ...@@ -525,7 +525,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.daterangeCreateTime = '' this.daterangeCreateTime = ''
this.sortedColumn = '' this.sortedColumn = ''
this.queryParams = { this.queryParams = {
searchText: '', searchText: '',
...@@ -574,67 +574,54 @@ export default { ...@@ -574,67 +574,54 @@ export default {
name: 'EquipmentAdd' name: 'EquipmentAdd'
}) })
}, },
// /** 修改按钮操作 */
// handleUpdate(row) { // 全部选择
// this.reset() selectAll() {
// const id = row.id || this.ids this.$refs.table.toggleAllSelection()
// getDevice(id).then(response => { },
// this.form = response.data // 反向选择
// this.open = true reverseSelect(rows) {
// this.title = '修改设备' rows.forEach(row => {
// this.serviceAreaS = this.form.serviceArea.split(';') this.$refs.table.toggleRowSelection(row)
// this.serviceArea = [] })
// for (let i = 0; i < this.serviceAreaS.length; i++) { },
// this.serviceAreaS[i] = this.serviceAreaS[i].split(',')
// this.serviceArea.push(this.serviceAreaS[i]) // /**
// } // * 全部选择
// }) // * @param selection 已选择内容
// * @param all 是否永远进行全选操作
// */
// async selectAll(selection = [], all = true) {
// if (this.deviceList.length !== selection.length && !all) {
// this.effectTableSelect([])
// } else {
// await this.changeTableSelect()
// }
// },
// /**
// * 控制table的选择项
// * @param data
// */
// effectTableSelect(data = []) {
// this.$refs.table.store.states.selection = data
// this.$refs.table.store.updateSelectionByRowKey()
// this.$refs.table.store.updateAllSelected()
// this.$refs.table.$emit('selection-change', data)
// }, // },
// // 全部选择 // /**
// selectAll() { // * 改变table选择项
// this.$refs.table.toggleAllSelection() // * @param notIncludeIds 需要排除的id列表
// */
// async changeTableSelect(notIncludeIds = []) {
// // 获取反选的数据
// const { data } = await listDeviceAll({ notIncludeIds })
// console.log("data",data)
// this.effectTableSelect(data)
// }, // },
// // 反向选择 // // 反向选择
// reverseSelect(rows) { // reverseSelect() {
// rows.forEach(row => { // this.changeTableSelect(this.ids)
// this.$refs.table.toggleRowSelection(row)
// })
// }, // },
/**
* 全部选择
* @param selection 已选择内容
* @param all 是否永远进行全选操作
*/
async selectAll(selection = [], all = true) {
if (this.deviceList.length !== selection.length && !all) {
this.effectTableSelect([])
} else {
await this.changeTableSelect()
}
},
/**
* 控制table的选择项
* @param data
*/
effectTableSelect(data = []) {
this.$refs.table.store.states.selection = data
this.$refs.table.store.updateSelectionByRowKey()
this.$refs.table.store.updateAllSelected()
this.$refs.table.$emit('selection-change', data)
},
/**
* 改变table选择项
* @param notIncludeIds 需要排除的id列表
*/
async changeTableSelect(notIncludeIds = []) {
// 获取反选的数据
const { data } = await listDeviceAll({ notIncludeIds })
this.effectTableSelect(data)
},
// 反向选择
reverseSelect() {
this.changeTableSelect(this.ids)
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row) console.log(row)
...@@ -650,9 +637,19 @@ export default { ...@@ -650,9 +637,19 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('business/device/export', { // this.download('business/device/export', {
...this.queryParams // ...this.queryParams
}, `device_${new Date().getTime()}.xlsx`) // }, `device_${new Date().getTime()}.xlsx`)
if (this.ids.length !== 0) {
const exportTable = {}
// exportTable. = this.ids
this.download('business/device/export', exportTable, `use_${new Date().getTime()}.xlsx`).then(res => {
this.$refs.table.clearSelection()
})
} else {
this.$modal.msgError('请选择至少一条数据导出')
return
}
} }
} }
} }
......
src/views/service-management/treatment-management/treatment-detail.vue 0 → 100644
View file @ f3b44ec2
<template>
<div>33</div>
</template>
<script>
export default {
name: 'TreatmentDetail'
}
</script>
<style scoped>
</style>
src/views/service-management/treatment-management/treatment-item.vue 0 → 100644
View file @ f3b44ec2
<template>
<div>22</div>
</template>
<script>
export default {
name: 'TreatmentItem'
}
</script>
<style scoped>
</style>
src/views/service-management/treatment-management/treatment-subscribe.vue 0 → 100644
View file @ f3b44ec2
<template>
<div>11</div>
</template>
<script>
export default {
name: 'TreatmentSubscribe'
}
</script>
<style scoped>
</style>
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