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/select-cartoon.vue

@@ -37,11 +37,10 @@
         </el-select>
       </div>
       <div class="scroll-section">
-        <el-radio-group v-model="sendObj.hasSelected" size="small">
+        <el-radio-group v-model="sendObj" size="small">
           <el-radio
             v-for="(item, index) in cartoonList"
             :key="index"
-            @change="changeComent(item)"
             :label="item" class="radio-item">{{item.header_name}}</el-radio>
         </el-radio-group>
       </div>
@@ -60,10 +59,7 @@
     components: {},
     data() {
       return {
-        sendObj: {
-          hasSelected: '',
-          closeStatus: false,
-        },
+        sendObj: {},
         saasDisease: '', // 高血压标识
         showSecond: false,//是否显示分类
         showCartoonDialog: true,
@@ -158,15 +154,11 @@
         return array[id]
       },
       clickClose() {
-        this.$emit('closeSelectCartoon', this.sendObj)
+        this.$emit('closeSelectCartoon')
       },
       sureSelect() {
-        console.log(this.sendObj)
-        this.$emit('closeSelectCartoon', this.sendObj);
+        this.$emit('confirmSelectComent', this.sendObj);
       },
-      changeComent(item){
-        this.$emit('pushConmentMsg',item)
-      }
     },
   }
 </script>

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

@@ -133,6 +133,7 @@
         curmbThird: '新建随访计划',
         jumPathThird: '/followUp/plan-manage',
         activeTab: 'first',
+        resourceId: '',//当前选择的随访模板id
         noName: false,
         noResourceId: false,
         noTime: false,
@@ -275,6 +276,7 @@
           }
           if (valid) {
             console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
+            this.resourceId = this.baseInfo.resourceId
             if(this.baseInfo.resourceId){
               this.isStandedTemplate = true
               getFollowupTableTemplate(this.baseInfo.resourceId).then(res=>{
@@ -283,6 +285,7 @@
               })
             }else{
               this.isStandedTemplate = false
+              this.standedTimeNodeList = [];
               this.activeTab = 'second';
             }