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/views/followup/plan-manage/resident-list.vue

@@ -70,7 +70,7 @@
             label="姓名"
             align="center">
             <template slot-scope="scope">
-              <el-button type="text" @click="goPatientDetail(scope.row.patientId,scope.row.planId)" >{{scope.row.patientName}}</el-button>
+              <el-button type="text" @click="goPatientDetail(scope.row.patientId)" >{{scope.row.patientName}}</el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -226,8 +226,8 @@
           planId: this.$route.query.planId
         })
       },
-      goPatientDetail(patientId,planId) { //居民详情页
-        this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId:'1'}})
+      goPatientDetail(patientId) { //居民详情页
+        this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId: this.$route.query.planId}})
 
       },
       searchResidentList() { //查询居民列表
@@ -320,9 +320,12 @@
         console.log(selectPatients)
         let patientIds = []
         let patientNames = []
+
         selectPatients.forEach((item)=>{
+          if(!this.initialPatientIdList.includes(item.patientId)){
             patientIds.push(item.patientId)
             patientNames.push(item.nickname)
+          }
         })
         this.addPatientData = {
           id: this.$route.query.planId,

src/views/followup/record-manage/dialog/followupDetail.vue

@@ -86,7 +86,7 @@
         </div>
         <div class="list-item" v-if="enteringInfo.eduData">
           <p class="time">{{enteringInfo.eduData.timeNodeInfo}}</p>
-          <a class="link-p" :href="enteringInfo.eduData.shortUrl">{{enteringInfo.eduData.eduTitle}}</a>
+          <a class="link-p" :href="enteringInfo.eduData.shortUrl" target="_blank">{{enteringInfo.eduData.eduTitle}}</a>
         </div>
         <div class="list-item" v-if="!enteringInfo.eduData">
           <p class="empty-p">暂无</p>