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/plan-modify.vue

@@ -128,6 +128,7 @@
       }
     },
     created() {
+      this.planId = String(this.$route.query.planId)
       this.getPlanDetail(this.$route.query.planId); //获取计划详情
       this.getRemarkOption()
       this.getNodeTimeList(this.$route.query.planId); // 获取随访时间列表
@@ -203,7 +204,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          console.log(this.checkForm)
+//          console.log(this.checkForm)
           // 点击保存，先进行校验，表单字段是否通过验证
           this.checkForm = true
 
@@ -224,10 +225,10 @@
       addListenSave(val){
         console.log('监听保存校验结果',val)
         this.checkForm = false
-        if(val){
+        if(val.status){
           //  关闭弹层，继续创建
           this.planDetail.joinTime = '2019-04-09T16:00:00.000+0000'
-          this.planDetailData.fPlanTimeReqList = this.setTimeNodeList
+          this.planDetailData.fPlanTimeReqList = val.setTimeNodeList
           console.log('修改计划前的数据===>>>',this.planDetailData)
           createFollowPlan(this.planDetailData).then(res=>{
             if(res.code=='000000'){
@@ -267,14 +268,13 @@
       planDetail(val) {
         console.log(val)
         this.planDetailData = val
-//        this.setTimeNodeListOnCom(val.fPlanTimeReqList)
         this.setTimeNodeList = val.fPlanTimeReqList
-        this.planId = String(val.id)
-        if(val.resourceId){
+        if(this.planDetailData.resourceId){
           this.isStandedTemplate = true
         }else{
           this.isStandedTemplate = false
         }
+
       },
       selectResidentList(val) {
         const _this = this