Merge branch 'dev-follow-20200415' into 'release'

Dev follow 20200415

Review Coder:王勇波

See merge request !144

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

@@ -185,8 +185,17 @@
         window.open(url)
       },
       goToScale(val) {
-        this.$router.push({path: '/followup/record-manage/form-template',
+        console.log(`goToScale`,val);
+        if(val.resourceId.indexOf('SCALE')>-1){
+          this.$router.push({path: '/followup/record-manage/form-template',
           query: {doctorId: val.doctorId, scaleNo: val.resourceId, planPatientsTimesId: val.planPatientsTimesId,planTimesId : val.planTimesId, showBtn: 0}});
+        }else{
+          this.$message({
+             message: '此次随访暂不支持在pc端录入',
+             type: 'warn'
+           });
+        }
+        
       }
     },
     watch: {

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

@@ -149,8 +149,17 @@
         this.$emit('closeDetail',false)
       },
       goToScale(val) {
-        this.$router.push({path: '/followup/record-manage/form-template',
+        console.log(`goToScale`,val);
+        if(val.scaleNo.indexOf('SCALE')>-1){
+          this.$router.push({path: '/followup/record-manage/form-template',
           query: {doctorId: this.enteringInfo.doctorId, scaleNo: val.scaleNo, planPatientsTimesId: this.enteringInfo.planPatientsTimesId,planTimesId : val.planTimesId, showBtn: 1}});
+        }else{
+          this.$message({
+             message: '此次随访暂不支持在pc端录入',
+             type: 'warn'
+           });
+        }
+        
       }
     },
     filters: {

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

@@ -89,12 +89,12 @@
           </el-table-column>
           <el-table-column label="操作" fixed="right" align="center" min-width="210">
             <template slot-scope="scope">
-              <el-button class="btn-right-class" type="text" @click="editRow(scope.row)">履约录入</el-button>|
-              <el-button
+              <el-button class="btn-right-class" type="text" @click="editRow(scope.row)">履约录入</el-button>
+              <!-- <el-button
                 class="btn-right-class"
                 type="text"
                 @click="changeStatusRow(scope.row)"
-              >变更履约状态</el-button>
+              >变更履约状态</el-button> -->
               <!--|<el-button type="text" @click="sendRow(scope.row)">发送患教</el-button>-->
             </template>
           </el-table-column>
@@ -320,6 +320,14 @@ export default {
     },
     async editRow(row) {
       await this.getFormList({planTimesId: row.fuPlanTimesId, planPatientTimesId: row.fuPlanPatientTimesId}); //获取量表列表
+      console.log(this.formList.scalesList);
+      if(this.formList.scalesList.length && this.formList.scalesList[0].resourceId.indexOf('SCALE') < 0){
+        this.$message({
+           message: '此次随访暂不支持在pc端录入',
+           type: 'warn'
+         });
+        return
+      }
       //获取量表列表情况
       this.patientIds = [row.patientId];
       if (this.formList.scalesList.length > 1) {
@@ -408,7 +416,16 @@ export default {
       };
       this.scaleNo = item.resourceId;
       // this.patientIds = [this.ScaleData.patientId];
-      this.uniteValidateAction();
+      console.log('goFormView',item);
+      if(item.resourceId.indexOf('SCALE')>-1){
+        this.uniteValidateAction();
+      }else{
+        this.$message({
+          message: '此次随访暂不支持在pc端录入',
+          type: 'warn'
+        });
+      }
+      
     },
     closeForm() {
       this.selectFormShow = false;

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

@@ -112,8 +112,8 @@
             label="操作"
             align="center">
             <template slot-scope="scope">
-              <el-button class="btn-right-class" type="text" @click="sendReservationRow(scope.row)">发送预约</el-button>|
-              <el-button class="btn-right-class" type="text" @click="changeReserveClick(scope.row)">变更预约</el-button>
+              <el-button class="btn-right-class" type="text" @click="sendReservationRow(scope.row)">发送预约</el-button>
+              <!-- <el-button class="btn-right-class" type="text" @click="changeReserveClick(scope.row)">变更预约</el-button> -->
             </template>
           </el-table-column>
         </el-table>