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-node.vue

@@ -709,7 +709,8 @@
 //        }else{
 //
 //        }
-        if(item.timeNo>=0){
+        console.log(item)
+        if(item.timeNo>=0 && item.timeNo!==''){
           str = '开始后' + String(item.timeNo) + this.timeUnitStr
         }else{
           str = '设置时间节点'

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

@@ -58,6 +58,7 @@
               ref="beginDate"
               placeholder="请选择随访开始时间"
               :picker-options="pickerOptions"
+              value-format="timestamp"
               clearable
               @blur="handleDateInputConfirm"
               style="width:380px;">
@@ -196,7 +197,7 @@
         this.checkForm = false
          if(val.status){
            this.baseInfo.fPlanTimeReqList = val.setTimeNodeList
-           this.baseInfo.time = (new Date(this.baseInfo.time).getTime())
+//           this.baseInfo.time = (new Date(this.baseInfo.time).getTime())
            console.log(this.baseInfo.time)
            // 提交
            createFollowPlan(this.baseInfo).then(res=>{

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

@@ -252,7 +252,7 @@
             //  关闭弹层，继续创建
             this.planDetailData.fPlanTimeReqList = val.setTimeNodeList
 //            this.planDetailData.joinTime = new Date();
-            this.planDetailData.joinTime = (new Date(this.planDetailData.joinTime)).getTime()
+//            this.planDetailData.joinTime = (new Date(this.planDetailData.joinTime)).getTime()
             console.log(this.planDetailData.joinTime)
             console.log('修改计划前的数据===>>>',this.planDetailData)
             createFollowPlan(this.planDetailData).then(res=>{