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

@@ -11,7 +11,8 @@ export default {
     groupList: [],  //分组列表
     residentDetail: {}, //居民详情,
     planDetail: {}, // 计划详情页,
-    nodeTimeList: [], //随访时间节点列表
+    nodeTimeList: [], //随访时间节点列表,
+    nodeContent: {}, //时间节点详情
 
   },
   mutations: {
@@ -29,6 +30,9 @@ export default {
     },
     GET_NODE_TIME_LIST(state, payload) {
       state.nodeTimeList = payload
+    },
+    GET_NODE_CONTENT(state, payload) {
+      state.nodeContent = payload
     }
   },
   actions: {
@@ -67,6 +71,13 @@ export default {
       }).then(({data}) => {
         context.commit('GET_NODE_TIME_LIST', data);
       });
+    },
+    getNodeTimeContent(context, payload) {
+      followApi.getNodeTimeContent({}, {
+        urlSuffix:payload
+      }).then(({data}) => {
+        context.commit('GET_NODE_CONTENT', data);
+      });
     }
   },
 }

src/utils/followup/followapis.js

@@ -21,6 +21,13 @@ const  planManageApi = [
     name: 'getNodeTimeList',
     description: '获取随访时间节点列表',
   },
+  {
+    url: '/plans/time/',
+    method: 'get',
+    params: 'params',
+    name: 'getNodeTimeContent',
+    description: '获取节点详情',
+  },
   {
     url: '/followup/planPatient/',
     method: 'get',

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

@@ -50,20 +50,20 @@
         <el-radio-group v-model="timeNodes">
           <el-radio-button :key="item.id" v-for="item in planDetail.fPlanTimeDtoList" :label="item.id">{{item.timeStr}}</el-radio-button>
         </el-radio-group>
-        <div class="followup-contents" v-if="thisNodeContents[0]">
+        <div class="followup-contents">
           <div class="content-div">
             <div class="c-title">随访方式：</div>
-            <div class="c-content">{{thisNodeContents[0].typeStr}}</div>
+            <div class="c-content">{{nodeContent.typeStr}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">提醒医生预约居民：</div>
             <div class="c-content more-content">
-              <p v-for="item in thisNodeContents[0].remindList">{{item.startDaysStr}}</p>
+              <p v-for="item in nodeContent.remindList">{{item.startDaysStr}}</p>
             </div>
           </div>
           <div class="content-div">
             <div class="c-title">推送患教：</div>
-            <div class="c-content more-content" v-for="item in thisNodeContents[0].pushContentList">
+            <div class="c-content more-content" v-for="item in nodeContent.pushContentList">
               <p>{{item.startDaysStr}} <span class="click-text" >《{{item.sendContent}}》</span></p>
               <p class="reminding">推送规则：优先微信推送，如果居民没关注云鹊医公众号，将短信推送，短信推送会消耗您的额度。推送详情请前往云鹊医app患教中心查询</p>
             </div>
@@ -71,7 +71,7 @@
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p v-for="item in thisNodeContents[0].followupList">{{item.sendContent}}</p>
+              <p v-for="item in nodeContent.followupList">{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -117,11 +117,12 @@
       ...mapState('planManage', {
         residentDetail: state => state.residentDetail,
         planDetail: state => state.planDetail,
-        nodeTimeList: state => state.nodeTimeList
+        nodeTimeList: state => state.nodeTimeList,
+        nodeContent: state => state.nodeContent
       })
     },
     methods: {
-      ...mapActions('planManage', ['getResidentDetail', 'getPlanDetail', 'getNodeTimeList']),
+      ...mapActions('planManage', ['getResidentDetail', 'getPlanDetail', 'getNodeTimeList', 'getNodeTimeContent']),
       goToFollowTime() {
         this.showFollowTime = true
       },
@@ -140,9 +141,7 @@
         this.timeNodes = val.fPlanTimeDtoList[0].id
       },
       timeNodes(val) {
-        this.thisNodeContents = this.planDetail.fPlanTimeDtoList.filter(function(item){
-          return item.id == val;
-        });
+        this.getNodeTimeContent(val)
       }
     }
   }

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

@@ -30,7 +30,7 @@
                 style="width: 380px;">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="居民预约状态：" prop="timeStatus">
+            <!--<el-form-item label="居民预约状态：" prop="timeStatus">
               <el-select v-model="searchData.timeStatus">
                 <el-option
                   v-for="item in statusOptions"
@@ -39,7 +39,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
           </el-form>
         </div>
         <div class="search-btn">