代码提交

src/components/dynamic-table/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%;min-height:300px"  border>
-      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : ''">
+      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>

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

@@ -25,7 +25,7 @@
       </div>
     </div>
     <div style="box-sizing: border-box;padding:10px">
-      <el-row class="flex-align-stretch no-wrap" :gutter="10">
+      <el-row class="flex-align-stretch no-wrap" :gutter="0">
         <el-col style="flex:1 0 auto;" :span="activeApp.isdatateam?18:activeApp.isdatafollowup?18:24">
           <slot name="customBefore"></slot>
           <tabTemp :tabs="tabs" :editData="editData" :idname="idname" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick">
@@ -36,7 +36,9 @@
           <slot name="custom"></slot>
         </el-col>
         <el-col v-if="collapse" style="width:400px;" :span="6">
-          <taskTemp :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></taskTemp>
+          <taskTemp v-if="activeApp.isdatateam" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </taskTemp>
           <group v-if="activeApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess">
             <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
           </group>

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

@@ -2,9 +2,15 @@
 <template>
     <div class="normal-panel mt-10">
       <div class="flex-align-center flex-between " style="border-bottom:1px solid #f1f2f3;padding:10px">
-        任务事项
+        <div>
+          <slot name="collapse"></slot>
+          任务事项
+        </div>
         <addTask :ownertable="ownertable" @onSuccess="listData"></addTask>
       </div>
+      <div v-if="list.length === 0">
+        <el-empty description="暂无记录" :image-size="40"></el-empty>
+      </div>
       <div class="task_list__panel" v-for="item in list" :key="item.sys_taskid">
         <div class="flex-align-center flex-between">
           <p class="task_title" @click="taskDetail(item)"><b>{{item.title}}</b></p>