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/plan-manage/dialog/set-time-node.vue

@@ -187,6 +187,7 @@
         activeResourceId: '',
         errMsg: '',
         timeIsRepeat: false,
+        getData: false,
       }
     },
     props: {
@@ -233,7 +234,7 @@
         }
       },
       setTimeNodeList(val){
-        this.setTimeNodeList = val;
+//        this.setTimeNodeList = val;
         if(this.setTimeNodeList.length > 0){
           this.timeUnit = this.setTimeNodeList[0].timeUnit
           // 这里操作时间节点的数据
@@ -275,9 +276,16 @@
             }
             this.setTimeNodeList[index].formRef = 'form' + index;
           });
-          this.$forceUpdate();
+
           this.choseTimeUit(this.setTimeNodeList[0].timeUnit);
-          this.activeTab = this.setTimeNodeList.length - 1 + '';
+          if(!this.getData){
+            this.$nextTick(()=>{
+              this.activeTab = this.setTimeNodeList.length - 1 + '';
+            })
+            this.getData = true;
+          }
+          this.$forceUpdate();
+//          this.activeTab = this.setTimeNodeList.length - 1 + '';
         }
 
       },
@@ -379,6 +387,9 @@
             // 保存 校验通过后，排序 + 发送请求
             // 新增成功之后
             this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo',this.setTimeNodeList[this.activeTab].timeNo);
+            this.$nextTick(()=>{
+              this.activeTab = this.setTimeNodeList.length - 1 + '';
+            })
             this.$emit('addListenSave',{
               status: true,
               setTimeNodeList: this.setTimeNodeList
@@ -410,6 +421,10 @@
           this.activeTab = newTabName;
           // 新增成功之后
           this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo',this.setTimeNodeList[this.activeTab].timeNo);
+          this.$nextTick(()=>{
+            this.activeTab = this.setTimeNodeList.length - 1 + '';
+          })
+
         }else{
           this.$message({
             message: this.errMsg,