提交 cae5f198 编写于 作者: tao.wu's avatar tao.wu

no message

上级 83eadc0c
......@@ -47,6 +47,23 @@ const router = new VueRouter({
}
})
import utils from '@/utils/followup/followupUtils';
router.beforeEach((to, from, next) => {
if(to.meta.checkAuth){
utils.checkAuthFunc().then(res=>{
localStorage.setItem('checkAuth',res)
if(res==3){
next()
}else{
next(false)
return
}
})
return
}
next()
});
// 加入混合
Vue.mixin({
...mixins
......
......@@ -88,6 +88,7 @@ const followRouters = {
],
meta: {
title: '计划管理',
checkAuth: true
},
},
{
......@@ -108,6 +109,7 @@ const followRouters = {
],
meta: {
title: '预约管理',
checkAuth: true
},
},
{
......@@ -137,6 +139,7 @@ const followRouters = {
],
meta: {
title: '录入管理',
checkAuth: true
},
},
......
......@@ -36,7 +36,8 @@ const patientsRouters = {
name: 'patientsList',
meta: {
title: '我的居民列表',
keepAlive: false //页面不需要缓存
keepAlive: false, //页面不需要缓存
checkAuth: true
},
},
{
......@@ -74,7 +75,8 @@ const patientsRouters = {
name: 'newPatient',
meta: {
title: '新增居民',
keepAlive: false
keepAlive: false,
checkAuth: true
},
},
],
......@@ -94,7 +96,8 @@ const patientsRouters = {
name: 'labelsList',
meta: {
title: '分组管理',
keepAlive: false
keepAlive: false,
checkAuth: true
},
},
{
......@@ -123,7 +126,8 @@ const patientsRouters = {
name: 'notCompleteList',
meta: {
title: '资料不全居民',
keepAlive: false
keepAlive: false,
checkAuth: true
},
},
],
......
......@@ -47,41 +47,55 @@ const alertMessage = (msg, confirmButtonText, cancelButtonText, callback) => {
export default {
DC: dataConverter,
checkAuth: (callback) => {
return new Promise((resolve, reject) => {
// 1、未加入 2、审核中 3、加入成功
const checkAuth = localStorage.getItem('checkAuth')
if(checkAuth==1){
alertMessage('您当前暂无机构,无法使用居民管理、随访管理和群发消息等功能,请在加入机构后重试。','去加入','暂不加入', ()=>{
location.href = getSaasHost() + '/pica-base/pica_join.html'
})
}else if(checkAuth==2){
alertMessage('您创建的机构正在审核中,暂无法使用居民管理、随访管理和群发消息等功能,请在审核通过后重试。','查看审核','取消', ()=>{
location.href = getWsHost() + '/outside/status?tk=' + localStorage.getItem('storageToken')
})
}else if(checkAuth==3){
if(callback){
resolve(callback())
}
}
})
},
checkAuthFunc: (callback)=>{
return new Promise((resolve, reject) => {
resolve(fetch({
headers: {
token: localStorage.getItem('storageToken')
},
url: getBaseUrl(`/healths/doctor/hospitalAuth`),
url: getBaseUrl(`healths/doctor/hospitalAuth`),
method: 'get',
description: '检查用户的机构权限',
}).then(res => {
// 1、未加入 2、审核中 3、加入成功
// res.data = 2
if (res.code == '000000') {
if (res.data == 1) {
// 点击 去加入,进入加入机构流程
alertMessage('您当前暂无机构,无法使用居民管理、随访管理和群发消息等功能,请在加入机构后重试。','去加入','暂不加入', ()=>{
location.href = getSaasHost() + '/pica-base/pica_join.html'
})
return new Promise((resolve, reject) => {
})
} else if (res.data == 2) {
alertMessage('您创建的机构正在审核中,暂无法使用居民管理、随访管理和群发消息等功能,请在审核通过后重试。','查看审核','取消', ()=>{
location.href = getWsHost() + '/outside/status?tk=' + localStorage.getItem('storageToken')
})
// return new Promise((resolve, reject) => {
// })
} else if (res.data == 3) {
return callback()
// return new Promise((resolve, reject) => {
// resolve(callback())
// })
if(callback){
resolve(callback())
}
}
return new Promise((resolve, reject) => {
resolve(res.data)
})
}
}))
})
}
};
......@@ -3,54 +3,54 @@
<bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
<div class="message-content">
<el-row>
<el-col class="visitor screenSet" :span="24">
<div class="visitor-title">
<div class="title">今日随访:
<span style="color:#449284;margin-right: 10px">{{todayPlansList.length}}</span>
<span class="type-button" :style="{background:(planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(0)">未完成</span>
<span class="type-button" :style="{background:(!planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(1)">已过期</span>
</div>
<span class="visitor-more" @click="lookMore(1)">查看更多</span>
</div>
<div class="visitor-info">
<el-table
:data="todayPlansList"
style="width: 100%">
<el-table-column prop="patientName" label="姓名" align="center"></el-table-column>
<el-table-column prop="appointTime" label="预约时间" align="center"></el-table-column>
<el-table-column prop="fuTypeStr" label="随访方式" align="center"></el-table-column>
<el-table-column prop="content" label="操作" align="center">
<template slot-scope="scope">
<span class="text-btn" @click="goToScale(scope.row)">随访录入</span> | <span class="text-btn" @click="changeFollowStatus(scope.row)">变更随访状态</span>
</template>
</el-table-column>
</el-table>
</div>
</el-col>
<el-col class="visitor screenSet" :span="24" style="margin-top: 0;margin-bottom: 0;">
<div class="visitor-title">
<div class="title">今日预约
<span class="type-button" :style="{background:(appointBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayAppointsList(0)" style="margin-left: 10px;">未完成</span>
<span class="type-button" :style="{background:(!appointBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayAppointsList(1)" >已过期</span>
</div>
<span class="visitor-more" @click="lookMore(2)">查看更多</span>
</div>
<div class="visitor-info">
<el-table
:data="todayAppointsList"
style="width: 100%">
<el-table-column prop="planName" label="随访计划名称" align="center"></el-table-column>
<el-table-column prop="appointTime" label="随访计划时间" align="center"></el-table-column>
<el-table-column prop="appointedCount" label="已经预约" align="center"></el-table-column>
<el-table-column prop="notAppointedCount" label="未预约" align="center"></el-table-column>
<el-table-column prop="content" label="操作" align="center">
<template slot-scope="scope">
<span class="text-btn" @click="goToReservation(scope.row.planName, scope.row.appointTime)">去预约</span>
</template>
</el-table-column>
</el-table>
</div>
</el-col>
<!--<el-col class="visitor screenSet" :span="24">-->
<!--<div class="visitor-title">-->
<!--<div class="title">今日随访:-->
<!--<span style="color:#449284;margin-right: 10px">{{todayPlansList.length}}</span>-->
<!--<span class="type-button" :style="{background:(planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(0)">未完成</span>-->
<!--<span class="type-button" :style="{background:(!planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(1)">已过期</span>-->
<!--</div>-->
<!--<span class="visitor-more" @click="lookMore(1)">查看更多</span>-->
<!--</div>-->
<!--<div class="visitor-info">-->
<!--<el-table-->
<!--:data="todayPlansList"-->
<!--style="width: 100%">-->
<!--<el-table-column prop="patientName" label="姓名" align="center"></el-table-column>-->
<!--<el-table-column prop="appointTime" label="预约时间" align="center"></el-table-column>-->
<!--<el-table-column prop="fuTypeStr" label="随访方式" align="center"></el-table-column>-->
<!--<el-table-column prop="content" label="操作" align="center">-->
<!--<template slot-scope="scope">-->
<!--<span class="text-btn" @click="goToScale(scope.row)">随访录入</span> | <span class="text-btn" @click="changeFollowStatus(scope.row)">变更随访状态</span>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</div>-->
<!--</el-col>-->
<!--<el-col class="visitor screenSet" :span="24" style="margin-top: 0;margin-bottom: 0;">-->
<!--<div class="visitor-title">-->
<!--<div class="title">今日预约-->
<!--<span class="type-button" :style="{background:(appointBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayAppointsList(0)" style="margin-left: 10px;">未完成</span>-->
<!--<span class="type-button" :style="{background:(!appointBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayAppointsList(1)" >已过期</span>-->
<!--</div>-->
<!--<span class="visitor-more" @click="lookMore(2)">查看更多</span>-->
<!--</div>-->
<!--<div class="visitor-info">-->
<!--<el-table-->
<!--:data="todayAppointsList"-->
<!--style="width: 100%">-->
<!--<el-table-column prop="planName" label="随访计划名称" align="center"></el-table-column>-->
<!--<el-table-column prop="appointTime" label="随访计划时间" align="center"></el-table-column>-->
<!--<el-table-column prop="appointedCount" label="已经预约" align="center"></el-table-column>-->
<!--<el-table-column prop="notAppointedCount" label="未预约" align="center"></el-table-column>-->
<!--<el-table-column prop="content" label="操作" align="center">-->
<!--<template slot-scope="scope">-->
<!--<span class="text-btn" @click="goToReservation(scope.row.planName, scope.row.appointTime)">去预约</span>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</div>-->
<!--</el-col>-->
<el-col class="message screenSet" :span="24" id="screenSet">
<div class="message-title">系统消息 <span>今日消息:{{count}}条</span></div>
<div class="message-info" v-if="messageList.length > 0">
......@@ -303,7 +303,8 @@ export default {
}
.message {
padding: 0 25px 30px;
margin-top: 20px;
/*margin-top: 20px;*/
margin-top: 90px;
background: #fff;
@media screen and (min-width:1240px) and (max-width:1900px) {
width: 95%;
......
......@@ -153,7 +153,7 @@ export default {
},
storageIdType(val,ov){
if(val==2){
vm.setFollowSide()
// vm.setFollowSide()
}
}
},
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册