跟进动态调整

src/components/normal-basic-layout/details/index.vue

@@ -82,7 +82,7 @@
       <el-row class="flex-align-stretch no-wrap" :gutter="activeApp.isdatateam?10:activeApp.isdatafollowup?10:0">
         <el-col style="flex:1 0 auto;" :span="activeApp.isdatateam?18:activeApp.isdatafollowup?18:24">
           <slot name="customBefore"></slot>
-          <tabTemp :disabled="disabled" :status="status" :tabs="tabs" :editData="editData" :idname="idname" :attachmentDisabled="attachmentDisabled" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick">
+          <tabTemp ref="tabRef" :disabled="disabled" :status="status" :tabs="tabs" :editData="editData" :idname="idname" :attachmentDisabled="attachmentDisabled" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick" :isFollow="activeApp.isdatafollowup">
             <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
               <slot :name="'slot' + index"></slot>
             </div>
@@ -96,7 +96,7 @@
           <group v-if="activeApp.isdatateam" :isGroup="isGroup" :status="status" :disabled="disabled" ref="group" style="margin-bottom:10px"  :justsaler="justsaler" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @teamList="teamList">
             <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
           </group>
-          <follow-up v-if="activeApp.isdatafollowup" :status="status" ref="follow" :disabled="disabled" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :editData="editData" :idname="idname" @logSuccess="logSuccess">
+          <follow-up v-if="activeApp.isdatafollowup" :status="status" ref="follow" :disabled="disabled" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :editData="editData" :idname="idname" @logSuccess="logSuccess" @onMore="$refs.tabRef.activeName = 'follow'">
             <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
           </follow-up>
         </el-col>

src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="default" size="mini" @click="onShow" :disabled="status === '已结案' || status === '已失败' || disabled">{{$t(`新 建`)}}</el-button>
+    <el-button type="primary" size="mini" @click="onShow" :disabled="status === '已结案' || status === '已失败' || disabled">{{$t(`新 建`)}}</el-button>
     <el-drawer :title="$t(`新建跟进动态`)" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" ref="form" label-position="top" :label-width="tool.onlyZh('80px')">

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -6,7 +6,8 @@
         <p class="inline-16">{{$t(`跟进动态`)}}</p>
       </div>
       <div style="display: flex;justify-content: space-between">
-        <fullScreen class="inline-16" domId="containerFull" @onFull="onFull" @backFull="backFull"></fullScreen>
+<!--        <fullScreen class="inline-16" domId="containerFull" @onFull="onFull" @backFull="backFull"></fullScreen>-->
+        <el-button type="default" size="mini" @click="onMore" class="inline-16">{{$t(`查看更多`)}}</el-button>
         <addLog :ownertable="ownertable" @onSuccess="queryLogs" :status="status" :disabled="disabled"></addLog>
       </div>
     </div>
@@ -368,6 +369,9 @@ export default {
       }else {
         this.commentShowId = i.sys_datafollowupid
       }
+    },
+    onMore(){
+      this.$emit('onMore')
     }
   },
   mounted () {

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -3,6 +3,7 @@
     <div>
       <el-tabs v-model="activeName"  @tab-click="handleClick">
         <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="$t(tab)" :name="'tab' + index"></el-tab-pane>
+        <el-tab-pane v-if="isFollow" :label="$t('跟进动态')" name="follow"></el-tab-pane>
         <el-tab-pane :label="$t('附件')" name="file"></el-tab-pane>
         <el-tab-pane :label="$t('操作记录')" name="log"></el-tab-pane>
       </el-tabs>
@@ -11,6 +12,9 @@
     <div v-show="'tab'+index === activeName" v-for="(item,index) in tabs" :key="index">
       <slot v-if="'tab'+index === activeName"  :name="'slot' + index"></slot>
     </div>
+    <div v-show="activeName === 'follow'">
+      跟进共同
+    </div>
     <div v-show="activeName === 'file'">
       <attachmentList v-if="activeName === 'file'" :disabled="disabled" :status="status" :attachmentDisabled="attachmentDisabled"  :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
         <upload slot="upload" :folderid="folderid" :status="status" :attachmentDisabled="attachmentDisabled" :disabled="disabled"
@@ -30,7 +34,7 @@ import upload from '@/components/upload/hw_obs_upload.vue'
 import datalog from '../datalog/index.vue'
 
 export default {
-  props:['tabs','editData','ownertable','idname','status','attachmentDisabled','disabled'],
+  props:['tabs','editData','ownertable','idname','status','attachmentDisabled','disabled','isFollow'],
   components:{
     attachmentList,
     upload,