mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待我审核 调整显示

master
Harry Yang 2022-12-21 18:07:08 +08:00
parent 3065c34964
commit 84e04276ce
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/palmte/work/model/process/ProjectProcess.java
View File

@ -1,5 +1,7 @@
package cn.palmte.work.model.process;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import java.time.LocalDate;
@ -39,6 +41,7 @@ public class ProjectProcess {
// 项目编号
private String projectNo;
@JsonFormat(pattern="yyyy-MM-dd")
private LocalDate applyDate;
// 项目标题
@ -74,8 +77,11 @@ public class ProjectProcess {
private String currentAudit;
// 最后更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastUpdateAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createAt;
private ProcessType processType;

36
src/main/resources/templates/admin/business/process-review.ftl
View File

@ -50,15 +50,15 @@
<div>
<el-form-item label="标题">
<el-input placeholder="请输入标题" v-model="queryForm.projectTitle"></el-input>
<el-input placeholder="请输入标题" v-model="queryForm.projectTitle" clearable></el-input>
</el-form-item>
<el-form-item label="项目编号">
<el-input placeholder="请输入项目编号" v-model="queryForm.projectNo"></el-input>
<el-input placeholder="请输入项目编号" v-model="queryForm.projectNo" clearable></el-input>
</el-form-item>
<el-form-item label="流程类型">
<el-select v-model="queryForm.processType" placeholder="请选择">
<el-select v-model="queryForm.processType" placeholder="请选择" clearable>
<el-option label="全部" :value="null"></el-option>
<#list processTypes as processType>
<el-option label="${processType.description}"
@ -69,7 +69,7 @@
</el-form-item>
<el-form-item label="申请人">
<el-input placeholder="请输入申请人" v-model="queryForm.applyPersonName"></el-input>
<el-input placeholder="请输入申请人" v-model="queryForm.applyPersonName" clearable></el-input>
</el-form-item>
<el-button type="primary" @click="queryTable">查询</el-button>
@ -77,17 +77,17 @@
</el-form>
<el-table border :data="tableData">
<el-table border :data="page.data" >
<el-table-column type="index" :index="1" label="序号" fixed></el-table-column>
<el-table-column prop="projectNo" label="项目编号" fixed></el-table-column>
<el-table-column prop="projectTitle" label="标题"></el-table-column>
<el-table-column prop="projectNo" label="项目编号" fixed width="80"></el-table-column>
<el-table-column prop="projectTitle" label="标题" width="350"></el-table-column>
<el-table-column prop="processType" label="流程类型"></el-table-column>
<el-table-column prop="applyPersonName" label="申请人"></el-table-column>
<el-table-column prop="status" label="审核状态"></el-table-column>
<el-table-column prop="amount" label="当前审核人"></el-table-column>
<el-table-column prop="lastUpdateAt" label="最后更新时间"></el-table-column>
<el-table-column prop="lastUpdateAt" label="最后更新时间" width="170"></el-table-column>
<el-table-column label="操作" fixed="right" width="180">
<el-table-column label="操作" fixed="right" width="140">
<template slot-scope="scope">
<el-button type="text" @click="showDetail(scope.row, scope)">查看详情</el-button>
<el-button type="text" @click="auditProcess(scope.row, scope)">审核</el-button>
@ -97,8 +97,10 @@
</el-table>
<el-pagination style="text-align: center; margin-top: 10px"
:page-size="page.size"
:current-page="page.current"
@current-change="handlePageChange"
layout="prev, pager, next" :total="50"></el-pagination>
layout="prev, pager, next" :total="page.total"></el-pagination>
</div>
</div>
@ -157,7 +159,12 @@
processStatus: null
},
auditFormVisible: false,
tableData: [],
page: {
data: [],
total: 0,
size: 10,
current: 1,
},
queryForm: {},
projectSelected: false,
fileList: [],
@ -240,7 +247,12 @@
body: JSON.stringify(form),
}).then(res => res.json())
.then(data => {
this.tableData = data
this.page = {
data: data.content,
size: data.size,
current: data.numberOfElements,
total: data.totalElements
}
})
.catch(err => {
this.$message.error('查询失败');