Skip to content

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

Merge branch 'dev-followUp-20190312' of... 

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 5e060881 1fd8ec5c
隐藏空白字符变更
内嵌 并排
正在显示 包含 175 行增加 和 29 行删除
src/store/followup/planManage.js
浏览文件 @ cc2d2f27
...@@ -42,6 +42,7 @@ export default { ...@@ -42,6 +42,7 @@ export default {
} }
], ],
followStartTimeList: [], //随访时间 followStartTimeList: [], //随访时间
residentCrumb: [], //居民面包屑
}, },
mutations: { mutations: {
GET_RESIDENT_LIST(state, payload) { GET_RESIDENT_LIST(state, payload) {
...@@ -104,6 +105,10 @@ export default { ...@@ -104,6 +105,10 @@ export default {
} }
] ]
state.templateOptions = state.templateOptions.concat(payload) state.templateOptions = state.templateOptions.concat(payload)
},
SET_RESIDENT_CRUMB(state, payload){
state.residentCrumb = payload
sessionStorage.setItem('residentCrumb', JSON.stringify(state.residentCrumb));
} }
}, },
actions: { actions: {
...@@ -239,5 +244,8 @@ export default { ...@@ -239,5 +244,8 @@ export default {
context.commit('GET_PLAN_LIST', data); context.commit('GET_PLAN_LIST', data);
}); });
}, },
setResidentCrumb(context, payload) {
context.commit('SET_RESIDENT_CRUMB', payload);
},
}, },
} }
src/views/followup/plan-manage/plan-detail.vue
浏览文件 @ cc2d2f27
...@@ -124,11 +124,34 @@ ...@@ -124,11 +124,34 @@
}) })
}, },
methods: { methods: {
...mapActions('planManage', ['getResidentDetail', 'getPlanDetail', 'getNodeTimeList', 'getNodeTimeContent']), ...mapActions('planManage', ['getResidentDetail',
'getPlanDetail',
'getNodeTimeList',
'getNodeTimeContent',
'setResidentCrumb']),
goToFollowTime() { goToFollowTime() {
this.showFollowTime = true this.showFollowTime = true
}, },
goToResidentList() { goToResidentList() {
let residentCrumb = [
{
name: '随访管理',
href: null
},
{
name: '计划管理',
href: `#/followup/plan-manage/plan-list`
},
{
name: '计划详情',
href: `#/followup/plan-manage/plan-detail?planId=${this.$route.query.planId}`
},
{
name: '居民列表',
href: null
}
]
this.setResidentCrumb(residentCrumb);
this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId: this.$route.query.planId, planName: this.planDetail.name}}) this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId: this.$route.query.planId, planName: this.planDetail.name}})
}, },
changePlan() { changePlan() {
......
src/views/followup/plan-manage/plan-list.vue
浏览文件 @ cc2d2f27
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
this.search(1); this.search(1);
}, },
methods: { methods: {
...mapActions('planManage', ['getPlanList']), ...mapActions('planManage', ['getPlanList', 'setResidentCrumb']),
async search(currentPage){ async search(currentPage){
await this.getPlanList({ await this.getPlanList({
...this.searchData, ...this.searchData,
...@@ -167,6 +167,21 @@ ...@@ -167,6 +167,21 @@
this.$router.push({path: '/followup/plan-manage/plan-detail', query: {planId:row.id}}) this.$router.push({path: '/followup/plan-manage/plan-detail', query: {planId:row.id}})
}, },
visitRow(row){ visitRow(row){
let residentCrumb = [
{
name: '随访管理',
href: null
},
{
name: '计划管理',
href: `#/followup/plan-manage/plan-list`
},
{
name: '居民列表',
href: null
}
]
this.setResidentCrumb(residentCrumb);
this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId:row.id, planName: row.name}}) this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId:row.id, planName: row.name}})
}, },
changeRow(row){ changeRow(row){
......
src/views/followup/plan-manage/resident-detail.vue
浏览文件 @ cc2d2f27
<template> <template>
<div class="resident-detail"> <div class="resident-detail">
<bread-crumb <div class="bread-crumb">
:curmbFirst="curmbFirst" <el-breadcrumb separator-class="el-icon-arrow-right" >
:curmbSecond="curmbSecond" <el-breadcrumb-item v-for="item in residentCrumb">
:curmbThird="curmbThird" <a v-if="item.href" :href="item.href">{{item.name}}</a>
:jumPathThird="jumPathThird"> <span v-else >{{item.name}}</span>
</bread-crumb> </el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="f-detail-content screenSet"> <div class="f-detail-content screenSet">
<div class="header"> <div class="header">
<div class="title"><p>基本信息</p></div> <div class="title"><p>基本信息</p></div>
...@@ -103,7 +105,6 @@ ...@@ -103,7 +105,6 @@
</template> </template>
<script> <script>
import BreadCrumb from '@/components/breadcrumb';
//变更计划dialog //变更计划dialog
import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan'; import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan';
//结束随访dialog //结束随访dialog
...@@ -113,7 +114,6 @@ ...@@ -113,7 +114,6 @@
export default { export default {
name: "resident-detail", name: "resident-detail",
components: { components: {
BreadCrumb,
ChangePlan, ChangePlan,
FinishFollowup, FinishFollowup,
}, },
...@@ -131,11 +131,13 @@ ...@@ -131,11 +131,13 @@
planChangeData: {}, //变更信息 planChangeData: {}, //变更信息
finishData: {}, //结束信息 finishData: {}, //结束信息
planDetails: {}, //计划详情 planDetails: {}, //计划详情
status: null status: null,
residentCrumb: [], //面包屑
} }
}, },
created() { created() {
let residentCrumbList = sessionStorage.getItem('residentCrumb');
this.residentCrumb = JSON.parse(residentCrumbList);
}, },
computed: { computed: {
...mapState('planManage', { ...mapState('planManage', {
...@@ -210,6 +212,23 @@ ...@@ -210,6 +212,23 @@
@import '../../../style/followup/followup-common'; @import '../../../style/followup/followup-common';
@import '../../../style/followup/element-reset.css'; @import '../../../style/followup/element-reset.css';
.resident-detail { .resident-detail {
.bread-crumb {
position: fixed;
left: 255px;
top: 64px;
width: 100%;
background: #fff;
height: 61px;
padding: 20px 20px 30px;
z-index: 99;
border-top: 3px solid #F0F2F5;
.el-breadcrumb__inner {
font-size: 14px;
}
a:hover {
color: #449284;
}
}
.f-detail-content { .f-detail-content {
.header { .header {
.title { .title {
......
src/views/followup/plan-manage/resident-list.vue
浏览文件 @ cc2d2f27
<template> <template>
<div class="resident-list"> <div class="resident-list">
<bread-crumb <div class="bread-crumb">
:curmbFirst="curmbFirst" <el-breadcrumb separator-class="el-icon-arrow-right" >
:curmbSecond="curmbSecond" <el-breadcrumb-item v-for="item in residentCrumb">
:curmbThird="curmbThird" <a v-if="item.href" :href="item.href">{{item.name}}</a>
:jumPathThird="jumPathThird"> <span v-else >{{item.name}}</span>
</bread-crumb> </el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="resident-content f-main-content screenSet"> <div class="resident-content f-main-content screenSet">
<p class="page-title">{{planTitle}}</p> <p class="page-title">{{planTitle}}</p>
<div class="search-div"> <div class="search-div">
...@@ -47,7 +49,7 @@ ...@@ -47,7 +49,7 @@
<div class="resident-table table-content"> <div class="resident-table table-content">
<div class="btn-div"> <div class="btn-div">
<el-radio-group v-model="status" size="small"> <el-radio-group v-model="status" size="small">
<el-radio-button label="1">未完成({{residentList.notCount}})</el-radio-button> <el-radio-button label="1">未开始({{residentList.notCount}})</el-radio-button>
<el-radio-button label="2">进行中({{residentList.handCount}})</el-radio-button> <el-radio-button label="2">进行中({{residentList.handCount}})</el-radio-button>
<el-radio-button label="3">已结束({{residentList.yesCount}})</el-radio-button> <el-radio-button label="3">已结束({{residentList.yesCount}})</el-radio-button>
</el-radio-group> </el-radio-group>
...@@ -138,7 +140,6 @@ ...@@ -138,7 +140,6 @@
</template> </template>
<script> <script>
import BreadCrumb from '@/components/breadcrumb'
//变更计划dialog //变更计划dialog
import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan'; import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan';
//结束随访dialog //结束随访dialog
...@@ -152,7 +153,6 @@ ...@@ -152,7 +153,6 @@
export default { export default {
name: "residentList", name: "residentList",
components: { components: {
BreadCrumb,
ChangePlan, ChangePlan,
FinishFollowup, FinishFollowup,
SelectPatient, SelectPatient,
...@@ -160,12 +160,6 @@ ...@@ -160,12 +160,6 @@
}, },
data() { data() {
return { return {
/*面包屑配置*/
curmbFirst: '随访管理',
curmbSecond: '计划管理',
curmbThird: '查看居民',
jumPathThird: '/followUp/plan-manage',
/*面包屑配置*/
labelWidth: '110px', //标题长度 labelWidth: '110px', //标题长度
searchData: {}, //查询数据 searchData: {}, //查询数据
groupOption: [{ // 分组选项 groupOption: [{ // 分组选项
...@@ -185,6 +179,7 @@ ...@@ -185,6 +179,7 @@
addPatientData: {}, //选择时间数据 addPatientData: {}, //选择时间数据
statusTotal: null, //每种状态的总数 statusTotal: null, //每种状态的总数
planTitle: '', //随访计划名称 planTitle: '', //随访计划名称
residentCrumb: [], //面包屑
} }
}, },
created() { created() {
...@@ -198,6 +193,29 @@ ...@@ -198,6 +193,29 @@
this.getPlanStatusOption() this.getPlanStatusOption()
this.getGroupList(); //获取分组列表 this.getGroupList(); //获取分组列表
this.getFollowStartTimeList(this.$route.query.planId);// 获取随访时间列表 this.getFollowStartTimeList(this.$route.query.planId);// 获取随访时间列表
let residentCrumbList = sessionStorage.getItem('residentCrumb');
residentCrumbList = JSON.parse(residentCrumbList);
if(residentCrumbList.length==4&&residentCrumbList[residentCrumbList.length-1].name!='居民列表') {
this.residentCrumb = residentCrumbList.slice(0,2)
this.residentCrumb.push(
{
name: '居民列表',
href: null
}
)
} else if(residentCrumbList.length>4&&residentCrumbList[residentCrumbList.length-1].name!='居民列表') {
this.residentCrumb = residentCrumbList.slice(0,3)
this.residentCrumb.push(
{
name: '居民列表',
href: null
}
)
} else {
this.residentCrumb = residentCrumbList
}
this.setResidentCrumb(this.residentCrumb);
}, },
computed: { computed: {
...mapState('planManage',{ ...mapState('planManage',{
...@@ -208,7 +226,7 @@ ...@@ -208,7 +226,7 @@
}) })
}, },
methods: { methods: {
...mapActions('planManage', ['getResidentList', 'getGroupList', 'getPlanStatusOption', 'getFollowStartTimeList']), ...mapActions('planManage', ['getResidentList', 'getGroupList', 'getPlanStatusOption', 'getFollowStartTimeList', 'setResidentCrumb']),
handleSizeChangePre(pageSize) { handleSizeChangePre(pageSize) {
this.getResidentList({ this.getResidentList({
pageSize, pageSize,
...@@ -226,6 +244,52 @@ ...@@ -226,6 +244,52 @@
}) })
}, },
goPatientDetail(patientId) { //居民详情页 goPatientDetail(patientId) { //居民详情页
let residentCrumbs = []
if(this.residentCrumb.length === 3) {
residentCrumbs = [
{
name: '随访管理',
href: null
},
{
name: '计划管理',
href: `#/followup/plan-manage/plan-list`
},
{
name: '居民列表',
href: `#/followup/plan-manage/resident-list?planId=${this.$route.query.planId}`
},
{
name: '居民详情',
href: null
}
]
} else if(this.residentCrumb.length === 4) {
residentCrumbs = [
{
name: '随访管理',
href: null
},
{
name: '计划管理',
href: `#/followup/plan-manage/plan-list`
},
{
name: '计划详情',
href: `#/followup/plan-manage/plan-detail??planId=${this.$route.query.planId}`
},
{
name: '居民列表',
href: `#/followup/plan-manage/resident-list?planId=${this.$route.query.planId}`
},
{
name: '居民详情',
href: null
}
]
}
this.setResidentCrumb(residentCrumbs);
this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId: this.$route.query.planId}}) this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId: this.$route.query.planId}})
}, },
...@@ -378,6 +442,23 @@ ...@@ -378,6 +442,23 @@
@import '../../../style/followup/followup-common'; @import '../../../style/followup/followup-common';
@import '../../../style/followup/element-reset.css'; @import '../../../style/followup/element-reset.css';
.bread-crumb {
position: fixed;
left: 255px;
top: 64px;
width: 100%;
background: #fff;
height: 61px;
padding: 20px 20px 30px;
z-index: 99;
border-top: 3px solid #F0F2F5;
.el-breadcrumb__inner {
font-size: 14px;
}
a:hover {
color: #449284;
}
}
.btn-left { .btn-left {
float: right; float: right;
} }
......
src/views/followup/record-manage/dialog/followupDetail.vue
浏览文件 @ cc2d2f27
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</div> </div>
<div class="list-item" v-if="enteringInfo.eduData"> <div class="list-item" v-if="enteringInfo.eduData">
<p class="time">{{enteringInfo.eduData.timeNodeInfo}}</p> <p class="time">{{enteringInfo.eduData.timeNodeInfo}}</p>
<a class="link-p" :href="enteringInfo.eduData.shortUrl" target="_blank">{{enteringInfo.eduData.eduTitle}}</a> <a class="link-p" :href="enteringInfo.eduData.highDefinitionShortUrl" target="_blank">{{enteringInfo.eduData.headerName}}</a>
</div> </div>
<div class="list-item" v-if="!enteringInfo.eduData"> <div class="list-item" v-if="!enteringInfo.eduData">
<p class="empty-p">暂无</p> <p class="empty-p">暂无</p>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或