dev01 1 year ago
parent
commit
82cf21179c
2 changed files with 7 additions and 9 deletions
  1. 6 8
      src/views/project/list/index.vue
  2. 1 1
      src/views/system/dept/index.vue

+ 6 - 8
src/views/project/list/index.vue

@@ -67,10 +67,8 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber"
             v-if="columns[0].visible" />
-          <el-table-column label="项目年份" align="center" key="projectYear" prop="projectYear" v-if="columns[1].visible"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="是否跨年" align="center" key="crossYear" prop="crossYear" v-if="columns[2].visible"
-            :show-overflow-tooltip="true">
+          <el-table-column label="项目年份" align="center" width="80" key="projectYear" prop="projectYear" v-if="columns[1].visible" />
+          <el-table-column label="是否跨年" align="center" width="80" key="crossYear" prop="crossYear" v-if="columns[2].visible">
             <template slot-scope="scope">
               <span>{{ ["非跨年", "跨年"][scope.row.crossYear] }}</span>
             </template>
@@ -79,12 +77,12 @@
             :show-overflow-tooltip="true" />
           <el-table-column label="负责人" align="center" key="adminName" prop="adminName" v-if="columns[4].visible" />
           <el-table-column label="参与研发人员" align="center" key="staffName" prop="staffName" v-if="columns[5].visible" />
-          <el-table-column label="项目状态" align="center" key="projectStatus" prop="projectStatus"
+          <el-table-column label="项目状态" align="center" width="80" key="projectStatus" prop="projectStatus"
             v-if="columns[6].visible"></el-table-column>
-          <el-table-column label="累积工时" align="center" key="duration" prop="duration"
+          <el-table-column label="累积工时" align="center" width="80" key="duration" prop="duration"
             v-if="columns[6].visible"></el-table-column>
-          <el-table-column label="创建年份" align="center" key="createYear" prop="createYear" v-if="columns[7].visible" />
-          <el-table-column label="起止时间" align="center" key="startTime" prop="startTime" v-if="columns[8].visible">
+          <el-table-column label="创建年份" align="center" width="80" key="createYear" prop="createYear" v-if="columns[7].visible" />
+          <el-table-column label="起止时间" align="center" width="100" key="startTime" prop="startTime" v-if="columns[8].visible">
             <template slot-scope="scope">
               <div>{{ scope.row.startTime }}</div>
               <div>至</div>

+ 1 - 1
src/views/system/dept/index.vue

@@ -90,7 +90,7 @@
         </template>
       </el-table-column>
       <el-table-column label="logo" align="center" prop="companyLogo">
-        <template slot-scope="scope">
+        <template slot-scope="scope" v-if="!!scope.row.companyLogo">
           <el-image
             style="width: 50px; height: 50px"
             :src="realSrc(scope.row.companyLogo)"