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

Dev follow up 20190312



See merge request !21

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

@@ -13,6 +13,7 @@
     <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()" :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);
+          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,

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>