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

@@ -219,12 +219,12 @@
         if(this.formList.scalesList.length > 1){
           this.selectFormShow = true
           this.ScaleData = {
-            doctorId: row.doctorId,
-            planPatientsTimesId: row.fuPlanTimesId
+            doctorId: this.formList.doctorId,
+            planPatientsTimesId: row.fuPlanPatientTimesId
           }
         }else if(this.formList.scalesList.length === 1){
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanTimesId}})
+            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanPatientTimesId}})
         }else {
           this.$message.warning('暂不支持录入量表!')
         }
@@ -264,7 +264,7 @@
       goFormView(item) {
         this.selectFormShow = false
         this.$router.push({path: '/followup/record-manage/form-template',
-          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.fuPlanTimesId}});
+          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId}});
       },
       closeForm() {
         this.selectFormShow = false;

src/views/home.vue

@@ -217,12 +217,12 @@ export default {
           if(this.formList.scalesList.length > 1){
             this.selectFormShow = true
             this.ScaleData = {
-              doctorId: row.doctorId,
-              planPatientsTimesId: row.plantimesId
+              doctorId: this.formList.doctorId,
+              planPatientsTimesId: row.planPatientTimesId
             }
           }else if(this.formList.scalesList.length === 1){
             this.$router.push({path: '/followup/record-manage/form-template',
-              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.plantimesId}})
+              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.planPatientTimesId}})
           }else {
             this.$message.warning('暂不支持录入量表!')
           }
@@ -241,6 +241,14 @@ export default {
 </script>
 <style lang="scss">
     .home-wrap {
+        .list-content{
+            p{
+              cursor: pointer;
+              line-height: 30px;
+              text-decoration: underline;
+              color: #449284;
+            }
+        }
         .message-content {
             .visitor {
                 padding: 0 25px 30px;
@@ -351,6 +359,7 @@ export default {
                 }
             }
         }
+
     }
 </style>