From 84e04276ce985d02fe98da297973988790c8e525 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 21 Dec 2022 18:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=88=91=E5=AE=A1=E6=A0=B8=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/model/process/ProjectProcess.java    |  6 ++++
 .../admin/business/process-review.ftl         | 36 ++++++++++++-------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
index 5a1fa4f..37bd03f 100644
--- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
+++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
@@ -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;
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index 751fa15..98af69d 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -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('查询失败');