zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能优化

This commit is contained in:
hayu 2024-11-21 17:45:38 +08:00
parent 20834c7cd2
commit 2b971ececd
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/process/requestReport/index.vue
View File

@ -60,9 +60,9 @@
<el-table-column label="姓名" align="center" prop="userName" width="80"/>
<el-table-column label="职务" align="center" prop="postName" :show-overflow-tooltip="true" width="160">
</el-table-column>
<el-table-column label="类型" align="center" prop="leaveType" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="外出时间" align="center" prop="startDate" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="拟返回时间" align="center" prop="endDate" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="类型" align="center" prop="leaveType" :show-overflow-tooltip="true" width="130"/>
<el-table-column label="外出时间" align="center" prop="startDate" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="拟返回时间" align="center" prop="endDate" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="地点" align="center" prop="location" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="事由" align="center" prop="leaveReason" :show-overflow-tooltip="true" width="80"/>
<el-table-column label="是否请示领导同意" align="center" prop="isAgree" :show-overflow-tooltip="true" width="80">
@ -75,6 +75,14 @@
</el-table-column>
<el-table-column label="代理主持工作人员" align="center" prop="hostUserId" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="审批状态" align="center" prop="examineStatus" width="100">
<template slot-scope="scope">
<span v-if="scope.row.examineStatus === '0'">待审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已审核</span>
<span v-else ></span>
<!-- 可以添加更多的条件来处理其他可能的状态 -->
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding" >
<template slot-scope="scope">
<el-button

15
src/views/process/workReport/index.vue
View File

@ -114,13 +114,20 @@
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="userName" width="90"/>
<el-table-column label="职务" align="center" prop="postName" :show-overflow-tooltip="true" width="180">
<el-table-column label="职务" align="center" prop="postName" :show-overflow-tooltip="true" width="170">
</el-table-column>
<el-table-column label="所属部门" align="center" prop="orgName" width="180"/>
<el-table-column label="申请时间" align="center" prop="createTime" width="180"/>
<el-table-column label="开始时间" align="center" prop="startDate" width="180"/>
<el-table-column label="结束时间" align="center" prop="endDate" width="180"/>
<el-table-column label="申请时间" align="center" prop="createTime" width="160"/>
<el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
<el-table-column label="结束时间" align="center" prop="endDate" width="160"/>
<el-table-column label="时长（天）" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '外出办事')">
<template slot-scope="scope">
<span v-if="scope.row.examineStatus === '0'">待审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已审核</span>
<!-- 可以添加更多的条件来处理其他可能的状态 -->
</template>
</el-table-column>
</el-table>
<pagination
v-show="totalDialog>0"