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/record-manage/record-list.vue

@@ -138,6 +138,7 @@
         isShowChangeDialog: false,
         hasData: false,
         selectFormShow: false,
+        ScaleData: {}
       }
     },
     computed: {
@@ -217,13 +218,13 @@
         //获取量表列表情况
         if(this.formList.length > 1){
           this.selectFormShow = true
+          this.ScaleData = {
+            doctorId: row.doctorId,
+            scaleNo: row.planPatientTimesId
+          }
         }else if(this.formList.length === 1){
-          this.$router.push({
-            name: 'formTemplate',
-            params: {
-              data: this.formList[0]
-            }
-          })
+          this.$router.push({path: '/followup/record-manage/form-template',
+            query: {doctorId: row.doctorId, scaleNo: item.resourceId, planPatientsTimesId: row.planPatientTimesId}})
         }else {
           this.$message.warning('暂不支持录入量表!')
         }
@@ -262,12 +263,8 @@
       },
       goFormView(item) {
         this.selectFormShow = false
-        this.$router.push({
-          name: 'formTemplate',
-          params: {
-            data: item
-          }
-        })
+        this.$router.push({path: '/followup/record-manage/form-template',
+          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientTimesId}});
       },
       closeForm() {
         this.selectFormShow = false;