Skip to content

P
pica.cloud.web-education-admin
提交 de6e58c8 编写于 作者: yi.li's avatar yi.li
浏览文件
操作

Merge branch 'dev-scaleHype-20190428' of... 

Merge branch 'dev-scaleHype-20190428' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-scaleHype-20190428
上级 b27e76ba e5745636
隐藏空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 38 行删除
src/App.vue
浏览文件 @ de6e58c8
<template> <template>
<div v-if="$route.name!='loginPage'"> <div v-if="$route.name!='loginPage'">
<v-header :userName="userName" :portrait="portrait" :idType="idType"></v-header> <v-header :userName="userName" :portrait="portrait" :idType="idType"></v-header>
<v-slidebar :authList="authList" :tokenValue="token"></v-slidebar> <v-slidebar :authList="authList" :tokenValue="token" :storageIdType="storageIdType"></v-slidebar>
<el-container> <el-container>
<div class="content" id="body-content"> <div class="content" id="body-content">
<transition name="router-fade" mode="out-in"> <transition name="router-fade" mode="out-in">
...@@ -40,6 +40,7 @@ export default { ...@@ -40,6 +40,7 @@ export default {
data() { data() {
return { return {
idType: 0, idType: 0,
storageIdType: 0,
token: '', token: '',
userName: '', userName: '',
portrait: '', portrait: '',
...@@ -131,6 +132,7 @@ export default { ...@@ -131,6 +132,7 @@ export default {
localStorage.setItem('storageIdType', res.data.idType) localStorage.setItem('storageIdType', res.data.idType)
localStorage.setItem('storageMaster', res.data.masterAdministratorFlag) localStorage.setItem('storageMaster', res.data.masterAdministratorFlag)
vm.idType = res.data.idType vm.idType = res.data.idType
vm.storageIdType = res.data.idType
vm.userName = res.data.name vm.userName = res.data.name
vm.portrait = res.data.imageUrl vm.portrait = res.data.imageUrl
vm.authList = res.data.auth vm.authList = res.data.auth
...@@ -146,7 +148,7 @@ export default { ...@@ -146,7 +148,7 @@ export default {
if(val!=undefined&&val!=null) { if(val!=undefined&&val!=null) {
vm.getUserAuth(val) vm.getUserAuth(val)
} }
} },
} }
} }
</script> </script>
......
src/views/followup/record-manage/models/hypertension/hypeDataSourceLifeMode.js
浏览文件 @ de6e58c8
...@@ -16,7 +16,7 @@ export default ($this) => { ...@@ -16,7 +16,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '支/日', type: 'append'}], slots: [{name: '支/日', type: 'append'}],
rules: [{ required: true, message: '请输入日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
{ {
formType: 'input', formType: 'input',
...@@ -31,7 +31,7 @@ export default ($this) => { ...@@ -31,7 +31,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '支/日', type: 'append'}], slots: [{name: '支/日', type: 'append'}],
rules: [{ required: true, message: '请输入下次随访日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入下次随访日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
...@@ -48,7 +48,7 @@ export default ($this) => { ...@@ -48,7 +48,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '两/日', type: 'append'}], slots: [{name: '两/日', type: 'append'}],
rules: [{ required: true, message: '请输入本次日饮酒量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入本次日饮酒量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
{ {
formType: 'input', formType: 'input',
...@@ -63,7 +63,7 @@ export default ($this) => { ...@@ -63,7 +63,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '两/日', type: 'append'}], slots: [{name: '两/日', type: 'append'}],
rules: [{ required: true, message: '请输入下次随访日饮酒量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入下次随访日饮酒量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
{ {
...@@ -79,7 +79,7 @@ export default ($this) => { ...@@ -79,7 +79,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '次/周', type: 'append'}], slots: [{name: '次/周', type: 'append'}],
rules: [{ required: true, message: '请输入本次运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入本次运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
{ {
formType: 'input', formType: 'input',
...@@ -93,7 +93,7 @@ export default ($this) => { ...@@ -93,7 +93,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '分钟/次', type: 'append'}], slots: [{name: '分钟/次', type: 'append'}],
rules: [{ required: true, message: '请输入本次运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入本次运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
{ {
...@@ -109,7 +109,7 @@ export default ($this) => { ...@@ -109,7 +109,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '次/周', type: 'append'}], slots: [{name: '次/周', type: 'append'}],
rules: [{ required: true, message: '请输入下次随访运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入下次随访运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
{ {
formType: 'input', formType: 'input',
...@@ -123,7 +123,7 @@ export default ($this) => { ...@@ -123,7 +123,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '分钟/次', type: 'append'}], slots: [{name: '分钟/次', type: 'append'}],
rules: [{ required: true, message: '请输入下次随访运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },] rules: [{ required: true, message: '请输入下次随访运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
}, },
......
src/views/layout/slidebar.vue
浏览文件 @ de6e58c8
...@@ -27,6 +27,10 @@ import { isNotEmptyUtils } from '../../utils/utils' ...@@ -27,6 +27,10 @@ import { isNotEmptyUtils } from '../../utils/utils'
let vm = null let vm = null
export default { export default {
props: { props: {
storageIdType: {
type: Number,
default: 0
},
tokenValue: { tokenValue: {
type: String type: String
}, },
...@@ -36,31 +40,6 @@ export default { ...@@ -36,31 +40,6 @@ export default {
} }
}, },
data() { data() {
// storageIdType=2才展示随访管理模块
const storageIdType = localStorage.getItem('storageIdType');
const followSider = (storageIdType=='2') ? {
title: '随访管理',
icon: 'el-icon-edit-outline',
index: 'followup',
subs: [
{
title: '计划管理',
icon: 'el-icon-setting',
index: 'followup/plan-manage/plan-list'
},
{
title: '预约管理',
icon: 'el-icon-setting',
index: 'followup/reservation-manage/reservation-list'
},
{
title: '录入管理',
icon: 'el-icon-setting',
index: 'followup/record-manage/record-list'
}
]
} : {};
return { return {
items: [ items: [
{ {
...@@ -95,7 +74,7 @@ export default { ...@@ -95,7 +74,7 @@ export default {
index: 'role' index: 'role'
} }
] ]
}, followSider }
] ]
} }
}, },
...@@ -105,7 +84,12 @@ export default { ...@@ -105,7 +84,12 @@ export default {
} }
}, },
created() { created() {
vm = this vm = this;
},
mounted(){
if(vm.storageIdType==2){
vm.setFollowSide()
}
}, },
watch: { watch: {
authList(newVal, oldVal){ authList(newVal, oldVal){
...@@ -118,10 +102,39 @@ export default { ...@@ -118,10 +102,39 @@ export default {
if(!newVal.P003) { // 角色管理 if(!newVal.P003) { // 角色管理
vm.items[2].subs[0].index = 'blank' vm.items[2].subs[0].index = 'blank'
} }
},
storageIdType(val,ov){
if(val==2){
vm.setFollowSide()
} }
}
}, },
methods: { methods: {
setFollowSide(){
const followSider = {
title: '随访管理',
icon: 'el-icon-edit-outline',
index: 'followup',
subs: [
{
title: '计划管理',
icon: 'el-icon-setting',
index: 'followup/plan-manage/plan-list'
},
{
title: '预约管理',
icon: 'el-icon-setting',
index: 'followup/reservation-manage/reservation-list'
},
{
title: '录入管理',
icon: 'el-icon-setting',
index: 'followup/record-manage/record-list'
}
]
}
vm.items.push(followSider);
}
} }
} }
</script> </script>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或