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/components/followup/form/index.vue

@@ -177,6 +177,10 @@
 
 </style>
 <style lang="scss">
+  .form-template .screenSet{
+    margin: 88px 30px 0px;
+    overflow: visible !important;
+  }
   .form-box {
     padding: 20px 0px;
     .sec-title{

src/style/common.scss

@@ -123,7 +123,7 @@ html,body{
     animation: backOpacity 2s ease-in-out infinite;
 }
 // 屏幕适配
-@media screen and (min-width:1240px) and (max-width:1900px){
+@media screen and (max-width:1900px){
     .screenSet{
         // width: 163vh !important;
         // height: 66vh !important;

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

@@ -12,7 +12,8 @@
 
     <div class="add-time-content">
       <div class="time-line-scroll special-control-class">
-        <el-tabs v-model="activeTab" type="card" @tab-remove="deleteTimeNode" :closable="tabClosable()">
+        <el-tabs v-model="activeTab" type="card" @tab-remove="deleteTimeNode" :closable="tabClosable()" :before-leave="checkHasChoseComent">
+          <!--:before-leave="checkHasChoseComent"-->
 
           <el-tab-pane
             v-for="(itemTimeForm, index) in setTimeNodeList"
@@ -174,7 +175,7 @@
           type: [{ required: true, message: '请选择随访方式', trigger: 'change' }],
         },
         isSelectCartoon: false,
-        activeTab: 0,
+        activeTab: '0',
         activeComentId: '',
         markOptions: [],
         followTypeList: [],
@@ -187,6 +188,7 @@
         activeResourceId: '',
         errMsg: '',
         timeIsRepeat: false,
+        hasData: false,
       }
     },
     props: {
@@ -210,7 +212,7 @@
       // 初始化 固定模板或者修改计划 的时间节点
       standedTimeNodeList(val){
         if(this.isStandedTemplate || this.planId){
-          this.activeTab = 0 + '';
+//          this.activeTab = '0';
           this.setTimeNodeList = val;
           this.$forceUpdate();
         }
@@ -220,7 +222,7 @@
 //        console.log('activeResourceId=',this.activeResourceId)
         if(parseFloat(val) >= 0){
           if(val!==this.activeResourceId){
-            this.activeTab = 0 + '';
+            this.activeTab = '0';
             this.setTimeNodeList = this.standedTimeNodeList;
             this.$forceUpdate();
             if(this.isStandedTemplate){// 系统固定模板
@@ -233,7 +235,7 @@
         }
       },
       setTimeNodeList(val){
-        this.setTimeNodeList = val;
+//        this.setTimeNodeList = val;
         if(this.setTimeNodeList.length > 0){
           this.timeUnit = this.setTimeNodeList[0].timeUnit
           // 这里操作时间节点的数据
@@ -277,7 +279,13 @@
           });
           this.$forceUpdate();
           this.choseTimeUit(this.setTimeNodeList[0].timeUnit);
-          this.activeTab = this.setTimeNodeList.length - 1 + '';
+          if(!this.hasData){
+            this.$nextTick(()=>{
+              this.activeTab = this.setTimeNodeList.length - 1 + '';
+              this.hasData = true;
+            })
+          }
+//          this.activeTab = this.setTimeNodeList.length - 1 + '';
         }
 
       },
@@ -379,6 +387,9 @@
             // 保存 校验通过后，排序 + 发送请求
             // 新增成功之后
             this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo',this.setTimeNodeList[this.activeTab].timeNo);
+            this.$nextTick(()=>{
+              this.activeTab = this.setTimeNodeList.length - 1 + '';
+            })
             this.$emit('addListenSave',{
               status: true,
               setTimeNodeList: this.setTimeNodeList
@@ -410,6 +421,10 @@
           this.activeTab = newTabName;
           // 新增成功之后
           this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo',this.setTimeNodeList[this.activeTab].timeNo);
+          this.$nextTick(()=>{
+            this.activeTab = this.setTimeNodeList.length - 1 + '';
+          })
+
         }else{
           this.$message({
             message: this.errMsg,
@@ -441,7 +456,8 @@
       },
       // 校验漫画是否选择
       checkHasChoseComent(type){
-        let pushData = this.setTimeNodeList[this.activeTab].pushContentList;
+//        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;
         const resourceId = len ? pushData[0].resourceId : null;
@@ -461,7 +477,7 @@
             })
           }
           return false;
-        }else if(len && startDays === '' && resourceId){
+        }else if(len && (startDays === '' || !startDays) && startDays!=0 && resourceId){
           //如果选了漫画，没选推送时间
           this.errMsg = '请选择推送时间';
           this.$message({
@@ -713,7 +729,7 @@
         })
         array.forEach((item,index)=>{
           if(timeNo == item.timeNo){
-            this.activeTab = index;
+            this.activeTab = index + '';
           }
         })
         return newList

src/views/followup/record-manage/record-list.vue

@@ -62,7 +62,7 @@
               <span :class="scope.row.status == 1 ? 'status-span': ''">{{ scope.row.status | statusFileter }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" align="center" min-width="260">
+          <el-table-column label="操作" fixed="right" align="center" min-width="210">
             <template slot-scope="scope">
               <el-button class="btn-right-class" type="text" @click="editRow(scope.row)">随访录入</el-button>|
               <el-button class="btn-right-class" type="text" @click="changeStatusRow(scope.row)"> 变更随访状态</el-button>