Merge branch 'dev-perform-20190116' into 'release'

Dev perform 20190116

reviewCoder：吴涛

See merge request !137

src/utils/followup/followapis.js

@@ -289,11 +289,12 @@ export const getEnteringInfo = (patientId, fuPlanPatientTimesId) => {
   // })
 
 }
-export const getFormList = (planTimesId) => {
+export const getFormList = (data) => {
+    const {planTimesId, planPatientTimesId} = data;
   // return utils.checkAuth(()=>{
     return fetch({
       headers,
-      url: getFollowUpSC(`/followup/entering/scale/${planTimesId}/list`),
+      url: getFollowUpSC(`/followup/entering/scale/${planTimesId}/list?planPatientTimesId=${planPatientTimesId}`),
       method: 'get',
       // params: params,
       description: '获取量表列表',

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

@@ -319,7 +319,7 @@ export default {
       this.search(1);
     },
     async editRow(row) {
-      await this.getFormList(row.fuPlanTimesId); //获取量表列表
+      await this.getFormList({planTimesId: row.fuPlanTimesId, planPatientTimesId: row.fuPlanPatientTimesId}); //获取量表列表
       //获取量表列表情况
       this.patientIds = [row.patientId];
       if (this.formList.scalesList.length > 1) {

src/views/patients/mypatients-manage/patient-detail.vue

@@ -94,7 +94,8 @@
                   <div class="record-date">{{item.finishedTime}}</div>
                   <div class="record-content">
                     <div class="record-title">
-                      <p>{{item.name}}-第{{item.seqNo}}次履约</p>
+                      <p v-if="item.seqNo">{{item.name}}-第{{item.seqNo}}次履约</p>
+                      <p v-else>{{item.name}}</p>
                       <span>{{item.fuTypeValue}}</span>
                     </div>
                     <div class="list-visit">