no message

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

@@ -93,7 +93,7 @@
       setTimeNodeList: Array,
       patientIdList: Array,
       checkForm: Boolean,
-      saveStatus: Boolean,
+//      saveStatus: Boolean,
     },
     computed: {
       ...mapState('planManage',{
@@ -120,21 +120,26 @@
       //初始化一个随访时间节点
       this.activeTab = 'setNewRef';
       this.timeForm.formRef = this.getNowTime();
-      if(this.setTimeNodeList.length>0) {
-        this.timeForm.isDisabled = true;
-        this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
-      }
+
     },
     watch: {
-      saveStatus(val){
-        if(val){
-          // 校验通过并且保存一个时间节点，通知外层
-//          this.setTimeNodeList.push(this.timeForm);
-        }else{
-
+//      saveStatus(val){
+//        if(val){
+//          // 校验通过并且保存一个时间节点，通知外层
+////          this.setTimeNodeList.push(this.timeForm);
+//        }else{
+//
+//        }
+//      },
+      setTimeNodeList(val){
+        this.setTimeNodeList = val
+        if(this.setTimeNodeList.length>0) {
+          this.timeForm.isDisabled = true;
+          this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
         }
       },
       checkForm(val){
+        console.log('触发 保存 校验',val)
         // 触发 保存 校验
         this.saveValiedBegin = val
       },
@@ -188,7 +193,6 @@
       },
       // 校验通过之后，需要新增一个新的初始化的表单
       checkValid(obj){
-        this.valBegin = false
         console.log('校验结果',obj.valid)
         if (obj.valid) {
           if(this.timeForm.remindDay.length>0){
@@ -201,7 +205,6 @@
           if(this.timeForm.pushDay){
             this.timeForm.pushContentList.push({
               startDays: this.timeForm.pushDay,
-//              resourceId: '',
               resourceId: this.timeForm.comentMsg.id
 
             })
@@ -215,7 +218,7 @@
           }
 
           this.setTimeNodeList.push(this.timeForm);
-
+          this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
           if(obj.type=='save'){
             console.log('是点击保存时候的校验，因此告诉最外层的 new-plan 组件，校验结果')
             this.$emit('addListenSave',true)
@@ -228,8 +231,6 @@
 
           }
 
-          this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
-
          } else {
           // 告诉 保存 按钮， 校验没通过
           if(obj.type=='save'){
@@ -237,7 +238,7 @@
             this.$emit('addListenSave',false)
           }
 
-          return
+          this.valBegin = false
          }
       },
       // 点击 新增时间节点
@@ -246,17 +247,13 @@
 
         // 新增，则进行校验表单字段 触发校验
         if(this.activeTab == 'setNewRef') {
-
           this.valBegin = true
-
         }else {
           // 否则切换 已经新增的表单至新增节点表单
           this.activeTab = 'setNewRef';
           this.showSetBtn = true;
           this.initNewForm()
         }
-
-        console.log(this.timeForm)
       },
       // 初始化新的表单
       initNewForm(){
@@ -294,7 +291,7 @@
       changeTab(val){
         this.activeTab = val;
 
-        console.log('当前的activeTab ',val)
+        console.log('当前的 activeTab ',val)
 
         if(val == 'setNewRef') {
           this.initNewForm();

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

@@ -84,7 +84,6 @@
           @setTimeNodeListOnCom="setTimeNodeListOnCom"
           :patientIdList="baseInfo.patientIdList"
           :checkForm="checkForm"
-          :saveStatus="saveStatus"
           @addListenSave="addListenSave"
         />
       </div>
@@ -124,7 +123,7 @@
     data() {
       return {
         checkForm: false,
-        saveStatus: false,
+//        saveStatus: false,
         /*面包屑配置*/
         curmbFirst: '随访管理',
         curmbSecond: '计划管理',
@@ -165,6 +164,11 @@
       //清理store中存的数据setTimeNodeList
 
     },
+//    watch: {
+//      checkForm(val){
+//        this.checkForm = val
+//      }
+//    },
     computed: {
       ...mapState('planManage',{
         setTimeNodeList: state => state.setTimeNodeList,
@@ -208,7 +212,7 @@
                  message: res.message,
                  showClose: false
                });
-               this.saveStatus = false
+//               this.saveStatus = false
              }
            })
 //        console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1)

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

@@ -48,7 +48,12 @@
         </el-form-item>
       </el-form>
       <div class="edit-plan-content">
-        <set-time-node :setTimeNodeList="setTimeNodeList" @setTimeNodeListOnCom="setTimeNodeListOnCom"></set-time-node>
+        <set-time-node
+          :setTimeNodeList="setTimeNodeList"
+          @setTimeNodeListOnCom="setTimeNodeListOnCom"
+          :checkForm="checkForm"
+          @addListenSave="addListenSave"
+        />
       </div>
     </div>
     <select-patient
@@ -68,6 +73,7 @@
   import SetTimeNode from '@/views/followup/plan-manage/dialog/set-time-node';
 
   import FollowTime from '@/views/followup/plan-manage/dialog/follow-time';
+  import {createFollowPlan} from '@/utils/followup/followapis'
 
   import { mapState, mapActions } from 'vuex'
   export default {
@@ -81,6 +87,8 @@
     },
     data() {
       return {
+        checkForm: false,
+//        saveStatus: false,
         /*面包屑配置*/
         curmbFirst: '随访管理',
         curmbSecond: '计划管理',
@@ -110,7 +118,7 @@
         showFollowTime: false,  //是否展示全部时间
       }
     },
-    mounted() {
+    created() {
       this.getPlanDetail(this.$route.query.planId); //获取计划详情
       this.getRemarkOption()
       this.getNodeTimeList(this.$route.query.planId); // 获取随访时间列表
@@ -177,19 +185,54 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          //  关闭弹层，继续创建
-          this.planDetail.joinTime = '2019-04-09T16:00:00.000+0000'
-          this.setFollowPlan(this.planDetail)
-          /*this.$message({
-            message: '修改成功！',
-            type: 'success'
-          });*/
-          this.$router.back(-1)
+          console.log(this.checkForm)
+          // 点击保存，先进行校验，表单字段是否通过验证
+          this.checkForm = true
+
+//          //  关闭弹层，继续创建
+//          this.planDetail.joinTime = '2019-04-09T16:00:00.000+0000'
+//          this.setFollowPlan(this.planDetail)
+//          /*this.$message({
+//            message: '修改成功！',
+//            type: 'success'
+//          });*/
+//          this.$router.back(-1)
         }).catch(() => {
           //  确定放弃，跳出当前编辑页面
 
         });
       },
+      // 监听保存校验结果
+      addListenSave(val){
+        console.log('监听保存校验结果',val)
+        this.checkForm = false
+        if(val){
+          //  关闭弹层，继续创建
+          this.planDetail.joinTime = '2019-04-09T16:00:00.000+0000'
+//          this.setFollowPlan(this.planDetail)
+          createFollowPlan(this.planDetail).then(res=>{
+            if(res.code=='000000'){
+              this.getTimeNodeList([]);
+              //  各种校验通过后，提交编辑内容，toast提示
+              this.$notify.success({
+                title: '',
+                message: '修改成功',
+                showClose: false
+              });
+              setTimeout(()=>{
+                this.$router.back(-1)
+              },2000)
+            }else{
+              this.$notify.success({
+                title: '修改失败',
+                message: res.message,
+                showClose: false
+              });
+//              this.saveStatus = false
+            }
+          })
+        }
+      },
       goToFollowTime() {
         this.showFollowTime = true
       },