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

src/store/followup/planManage.js

@@ -43,6 +43,7 @@ export default {
     ],
     followStartTimeList: [], //随访时间
     residentCrumb: [], //居民面包屑
+    planModifyCrumb: [], //修改计划面包屑
     selectResidentList: [], //修改计划已选居民
   },
   mutations: {
@@ -111,6 +112,10 @@ export default {
       state.residentCrumb = payload
       sessionStorage.setItem('residentCrumb', JSON.stringify(state.residentCrumb));
     },
+    SET_PLAN_MODIFY_CRUMB(state, payload) {
+      state.planModifyCrumb = payload
+      sessionStorage.setItem('planModifyCrumb', JSON.stringify(state.planModifyCrumb));
+    },
     GET_SELECT_RESIDENT(state, payload) {
       state.selectResidentList = payload.fPlanPatientInfoDtoList
     }
@@ -251,6 +256,9 @@ export default {
     setResidentCrumb(context, payload) {
       context.commit('SET_RESIDENT_CRUMB', payload);
     },
+    setPlanModifyCrumb(context, payload) {
+      context.commit('SET_PLAN_MODIFY_CRUMB', payload);
+    },
     getSelectResident(context, payload) {
       getResidentList({
         ...payload

src/views/followup/plan-manage/plan-detail.vue

@@ -128,7 +128,9 @@
         'getPlanDetail',
         'getNodeTimeList',
         'getNodeTimeContent',
-        'setResidentCrumb']),
+        'setResidentCrumb',
+        'setPlanModifyCrumb'
+      ]),
       goToFollowTime() {
         this.showFollowTime = true
       },
@@ -155,6 +157,25 @@
         this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId: this.$route.query.planId, planName: this.planDetail.name}})
       },
       changePlan() {
+        let planModifyCrumb = [
+          {
+            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.setPlanModifyCrumb(planModifyCrumb)
         this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId: this.$route.query.planId}})
       },
       closeFollowTime(isShow) {

src/views/followup/plan-manage/plan-list.vue

@@ -140,7 +140,7 @@
       this.search(1);
     },
     methods: {
-      ...mapActions('planManage', ['getPlanList', 'setResidentCrumb']),
+      ...mapActions('planManage', ['getPlanList', 'setResidentCrumb', 'setPlanModifyCrumb']),
       async search(currentPage){
         await this.getPlanList({
           ...this.searchData,
@@ -185,6 +185,21 @@
         this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId:row.id, planName: row.name}})
       },
       changeRow(row){
+        let planModifyCrumb = [
+          {
+            name: '随访管理',
+            href: null
+          },
+          {
+            name: '计划管理',
+            href: `#/followup/plan-manage/plan-list`
+          },
+          {
+            name: '修改计划',
+            href: null
+          }
+        ]
+        this.setPlanModifyCrumb(planModifyCrumb)
         this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:row.id}})
       },
       deleteRow(row){

src/views/followup/plan-manage/plan-modify.vue

 <template>
   <div class="plan-modify">
-    <bread-crumb
-      :curmbFirst="curmbFirst"
-      :curmbSecond="curmbSecond"
-      :curmbThird="curmbThird"
-      :jumPathThird="jumPathThird">
-    </bread-crumb>
+    <div class="bread-crumb">
+      <el-breadcrumb separator-class="el-icon-arrow-right" >
+        <el-breadcrumb-item v-for="item in planModifyCrumb">
+          <a v-if="item.href" :href="item.href">{{item.name}}</a>
+          <span v-else >{{item.name}}</span>
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
     <div class="new-plan-content f-main-content screenSet">
       <div class="header">
         <div class="title">
@@ -75,7 +77,6 @@
 </template>
 
 <script>
-  import BreadCrumb from '@/components/breadcrumb'
   import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
   import HasSelectedPatient from '@/views/followup/plan-manage/dialog/has-selected-patient';
   import SetTimeNode from '@/views/followup/plan-manage/dialog/set-time-node';
@@ -87,7 +88,6 @@
   export default {
     name: "plan-modify",
     components: {
-      BreadCrumb,
       SelectPatient,
       HasSelectedPatient,
       SetTimeNode,
@@ -102,11 +102,7 @@
         checkForm: false,
         patientIdList: [], //获取的病人列表
         hasSelectedList: [], //已选居民
-        /*面包屑配置*/
-        curmbFirst: '随访管理',
-        curmbSecond: '计划管理',
-        curmbThird: '修改随访计划',
-        jumPathThird: '/followUp/plan-manage',
+        planModifyCrumb: [], //面包屑
         rules: {
           name: [{ required: true, message: '请输入随访计划名称', trigger: 'blur' }],
           followupTemplate: [{ required: true, message: '请选择随访模板', trigger: 'change' }],
@@ -137,7 +133,8 @@
       this.getSelectResident({
         planId: this.$route.query.planId
       }); //已选居民
-
+      let planModifyCrumbList = sessionStorage.getItem('planModifyCrumb');
+      this.planModifyCrumb = JSON.parse(planModifyCrumbList);
     },
     computed: {
       ...mapState('planManage', {