Merge branch 'orangeUrgent' into allTestUrgent

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

@@ -89,7 +89,7 @@
           </tabTemp>
           <slot name="custom"></slot>
         </el-col>
-        <el-col v-if="collapse" style="width:400px;" :span="6">
+        <el-col v-if="collapse"  :span="6">
           <taskTemp ref="task" v-if="activeApp.istask" :status="status" :disabled="disabled" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :typeTask="typeTask" :editData="editData" :idname="idname">
             <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
           </taskTemp>

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

@@ -88,7 +88,7 @@
           </div>
           <div style="padding: 0 10px 10px 10px">
             <div class="flex-align-center flex-between pionter" v-for="img in i.attinfos" :key="img.index" style="padding:10px;margin-bottom:5px;border: 1px solid #ccc">
-              <div class="flex-align-center" style="flex:1;width:100%;">
+              <div class="flex-align-center" style="flex:1;width:90%;">
                 <img width="30" :src="checkFileType(img.postfix) === 'file'?require('@/assets/file_icons/file.svg'):img.url" class="inline-16" alt="">
                 <div class="file__link">
                   <a :href="img.url">{{img.document}}</a>