Merge branch 'dev-followUp-20190312' into 'release_followup'

Dev follow up 20190312



See merge request !22

src/components/followup/form/index.vue

@@ -184,6 +184,7 @@
   .form-box {
     padding: 20px 0px;
     .sec-title{
+      font-size: 18px;
       float: none;
       font-weight: bold;
       margin-left: 0;
@@ -233,6 +234,10 @@
     }
     .obj-form-title2{
       margin-left: 15px;
+      .el-checkbox__label{
+        font-size: 18px;
+      }
+
     }
     .obj-form-title3{
       margin-left: 25px;

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

@@ -456,6 +456,7 @@
       },
       // 校验漫画是否选择
       checkHasChoseComent(type){
+//        debugger
         let pushData = (this.setTimeNodeList[this.activeTab] && this.setTimeNodeList[this.activeTab].pushContentList) ? this.setTimeNodeList[this.activeTab].pushContentList : [];
         const len = pushData.length;
         const startDays = len ? pushData[0].startDays : null;
@@ -476,7 +477,7 @@
             })
           }
           return false;
-        }else if(len && startDays === '' && resourceId){
+        }else if(len && (startDays === '' || !startDays) && startDays!=0 && resourceId){
           //如果选了漫画，没选推送时间
           this.errMsg = '请选择推送时间';
           this.$message({
@@ -728,7 +729,7 @@
         })
         array.forEach((item,index)=>{
           if(timeNo == item.timeNo){
-            this.activeTab = index;
+            this.activeTab = index + '';
           }
         })
         return newList

src/views/followup/record-manage/form-template.vue

@@ -14,8 +14,8 @@
             社区、乡镇人群随访表
           </el-col>
           <el-col :span="4" v-if="showBtn=='1'">
-            <el-button class="button-white" size="small" plain @click="formSubmit(2)">暂存</el-button>
-            <el-button type="primary" size="small" @click="formSubmit(1)">提交</el-button>
+            <el-button type="primary" size="small" class="formSubmit" @click="formSubmit(1)">提交</el-button>
+            <el-button class="button-white formTempSave" size="small" plain @click="formSubmit(2)">暂存</el-button>
           </el-col>
         </el-row>
 
@@ -130,6 +130,13 @@
         margin-top: 15px;
       }
     }
+    .formSubmit{
+      float: right;
+      margin-left: 10px;
+    }
+    .formTempSave{
+      float: right;
+    }
     .form-container{
       padding: 0 10px;
     }