|
@@ -2,7 +2,7 @@
|
|
|
<div class="app-container">
|
|
|
<el-row :gutter="20">
|
|
|
<!--部门数据-->
|
|
|
- <el-col :span="4" :xs="24">
|
|
|
+ <el-col :span="2" :xs="24">
|
|
|
<div class="head-container">
|
|
|
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
|
|
|
style="margin-bottom: 20px" />
|
|
@@ -14,7 +14,7 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<!--用户数据-->
|
|
|
- <el-col :span="20" :xs="24">
|
|
|
+ <el-col :span="22" :xs="24">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
<el-form-item label="项目编号" prop="projectNumber">
|
|
|
<el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable style="width: 240px"
|
|
@@ -63,8 +63,10 @@
|
|
|
<el-table-column label="部门编号" align="center" key="deptId" prop="deptId" v-if="columns[2].visible"
|
|
|
:show-overflow-tooltip="true" />
|
|
|
<el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" />
|
|
|
- <el-table-column label="打卡时间" width="100" align="center" key="recordTime" prop="recordTime" v-if="columns[4].visible" />
|
|
|
- <el-table-column label="工时" align="center" key="duration" prop="duration" v-if="columns[5].visible" />
|
|
|
+ <el-table-column label="打卡时间" width="100" align="center" key="recordTime" prop="recordTime"
|
|
|
+ v-if="columns[4].visible" />
|
|
|
+ <el-table-column label="工时" align="center" width="50" key="duration" prop="duration"
|
|
|
+ v-if="columns[5].visible" />
|
|
|
<el-table-column label="打卡月份" align="center" key="createMonth" prop="createMonth" v-if="columns[6].visible" />
|
|
|
<el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber"
|
|
|
v-if="columns[7].visible" />
|
|
@@ -72,8 +74,10 @@
|
|
|
<el-table-column label="创段任务" align="center" key="projectStatus" prop="projectStatus"
|
|
|
v-if="columns[9].visible" />
|
|
|
<el-table-column label="日报内容" align="center" key="content" prop="content" v-if="columns[10].visible" />
|
|
|
+ <!-- :show-overflow-tooltip="true" -->
|
|
|
<el-table-column label="审核人员" align="center" key="examineName" prop="examineName" v-if="columns[11].visible" />
|
|
|
- <el-table-column label="审核时间" width="100" align="center" key="examineTime" prop="examineTime" v-if="columns[12].visible" />
|
|
|
+ <el-table-column label="审核时间" width="100" align="center" key="examineTime" prop="examineTime"
|
|
|
+ v-if="columns[12].visible" />
|
|
|
<el-table-column label="附件" align="center" width="160" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope" v-if="scope.row.userId !== 1">
|
|
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleSelect(scope.row)"
|