Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/followup/plan-manage/dialog/set-time-form.vue

@@ -74,6 +74,7 @@
           v-model="timeForm.followResourceId"
           multiple
           :multiple-limit=2
+          @change="changeFollowId"
           placeholder="请选择">
           <el-option
             v-for="item in formOptions"
@@ -140,7 +141,7 @@
          }
        },
       saveValiedBegin(val){
-         console.log('+++保存按钮子组件的校验',val)
+        console.log('保存按钮子组件的校验',val)
         console.log(this.timeForm.formRef)
         if(val && this.timeForm.formRef){
           this.$refs[this.timeForm.formRef].validate((valid) => {
@@ -154,6 +155,18 @@
       changeRemindDay(val){
         console.log(val)
       },
+      changeFollowId(val){
+        console.log(val)
+        this.formOptions.forEach((item1)=>{
+          console.log('item1',item1)
+          val.forEach((item2)=>{
+            console.log('item2',item2)
+            if(item2==item1.scaleNo){
+              this.timeForm.followResourceIdStr.push(item1.name)
+            }
+          })
+        })
+      },
       getNowTime() {
         const date = new Date();
         const year = date.getFullYear();

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -214,21 +214,26 @@
                 })
               })
             }
+            console.log(this.timeForm.followResourceIdStr)
             if(this.timeForm.pushDay){
               this.timeForm.pushContentList.push({
                 startDays: this.timeForm.pushDay,
-                resourceId: this.timeForm.comentMsg.id
-
+                resourceId: this.timeForm.comentMsg.id,
+                sendContent: this.timeForm.comentMsg.header_name
               })
             }
             if(this.timeForm.followResourceId.length>0){
-              this.timeForm.followResourceId.forEach((item)=>{
+              this.timeForm.followResourceId.forEach((item,index)=>{
                 this.timeForm.followupList.push({
-                  resourceId: item
+                  resourceId: item,
+                  sendContent : this.timeForm.followResourceIdStr[index]
                 })
               })
             }
-            this.setTimeNodeList.push(this.timeForm);
+
+            if(this.showSetBtn){
+              this.setTimeNodeList.push(this.timeForm);
+            }
             this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
             // 保存按钮发起的校验
             if(obj.type=='save'){
@@ -276,12 +281,24 @@
       // 验证是否重复
       checkTimeIsRepeat(){
         this.timeIsRepeat = false;
+        console.log('+++',this.setTimeNodeList)
+        console.log('+++',this.timeForm.timeNo)
         if(this.setTimeNodeList.length > 0){
-          this.setTimeNodeList.forEach(item=>{
-            if(item.timeNo == this.timeForm.timeNo){
-              this.timeIsRepeat = true;
-            }
-          })
+          if(this.showSetBtn){
+            this.setTimeNodeList.forEach(item=>{
+              if(item.timeNo == this.timeForm.timeNo){
+                this.timeIsRepeat = true;
+              }
+            })
+          }else{
+            this.setTimeNodeList.forEach((item,index)=>{
+              if(index > 0){
+                if(item.timeNo == this.timeForm.timeNo){
+                  this.timeIsRepeat = true;
+                }
+              }
+            })
+          }
         }
       },
       // 初始化新的表单
@@ -300,6 +317,7 @@
           pushDay: '',
           followResourceId: [],
           comentMsg: {},
+          followResourceIdStr: [],
           totalNumber: 0,
           wechatPatientNum: 0,
           messagePatientNum: 0