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

项目审核记录优化

master
pengqiang 2021-11-22 11:30:30 +08:00
parent 4439a35391
commit de4c2be271
2 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/resources/templates/admin/project_approve.ftl
View File

@ -2,6 +2,7 @@
<#import "../common/defaultLayout.ftl" as defaultLayout>
<@defaultLayout.layout>
<link rel="stylesheet" type="text/css" href="${base}/common/css/time-axis.css">
<style type="text/css">
/**让所有的模态对话框都居中*/
@ -35,6 +36,7 @@
<li><a href="#tab3">项目预算信息</a></li>
<li><a href="#tab4">项目结算信息</a></li>
<li><a href="#tab5">项目决算信息</a></li>
<li><a href="#tab6">项目审核记录</a></li>
</ul>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active" id="tab1">
@ -1210,6 +1212,35 @@
<!--验证表单元素（validate end-->
</div>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab6">
<div class="main">
<#if taskRecords?exists >
<ul class="time-axis">
<#list taskRecords as node>
<li class="time-axis-item">
<div class="time-axis-date" style="margin-left: -96px"> ${node.createTime}
<span></span>
</div>
<div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
<#if node.taskIndex!=2 && node.taskStatus==2>审核通过</#if>
<#if node.taskIndex!=2 && node.taskStatus==3>审核不通过</#if>
</div>
<div class="time-axis-title">
${node.taskComment}
</div>
</li>
</#list>
</ul>
<#else>
<div class="am-kai" align="center">
<h3>无记录!</h3>
</div>
</#if>
</div>
</div>
</div>
</div>
@ -1725,24 +1756,6 @@
</div>
</div>
<div class="am-tabs am-margin" data-am-tabs>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active">
<div class="am-g am-form-group am-margin-top" style="display: flex;">
<div class="am-u-sm-4 am-u-md-2 am-text-right">
审核意见
</div>
<div class="am-u-sm-8 am-u-md-10 am-text-left">
<#list taskRecords as node>
<span>${node.assigneeName} : ${node.taskComment} &nbsp;&nbsp; ${node.createTime}</span>
<hr/>
</#list>
</div>
</div>
</div>
</div>
</div>
<!--选项卡（tabs）end-->
<div class="am-margin">
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">

51
src/main/resources/templates/admin/project_detail.ftl
View File

@ -2,6 +2,7 @@
<#import "../common/defaultLayout.ftl" as defaultLayout>
<@defaultLayout.layout>
<link rel="stylesheet" type="text/css" href="${base}/common/css/time-axis.css">
<style type="text/css">
/**让所有的模态对话框都居中*/
@ -34,6 +35,7 @@
<li><a href="#tab3">项目预算信息</a></li>
<li><a href="#tab4">项目结算信息</a></li>
<li><a href="#tab5">项目决算信息</a></li>
<li><a href="#tab6">项目审核记录</a></li>
</ul>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active" id="tab1">
@ -1209,6 +1211,36 @@
<!--验证表单元素（validate end-->
</div>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab6">
<div class="main">
<#if taskRecords?exists >
<ul class="time-axis">
<#list taskRecords as node>
<li class="time-axis-item">
<div class="time-axis-date" style="margin-left: -96px"> ${node.createTime}
<span></span>
</div>
<div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
<#if node.taskIndex!=2 && node.taskStatus==2>审核通过</#if>
<#if node.taskIndex!=2 && node.taskStatus==3>审核不通过</#if>
</div>
<div class="time-axis-title">
${node.taskComment}
</div>
</li>
</#list>
</ul>
<#else>
<div class="am-kai" align="center">
<h3>无记录!</h3>
</div>
</#if>
</div>
</div>
</div>
</div>
@ -1477,25 +1509,6 @@
</div>
</div>
<div class="am-tabs am-margin" data-am-tabs>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active">
<div class="am-g am-form-group am-margin-top" style="display: flex;">
<div class="am-u-sm-4 am-u-md-2 am-text-right">
审核意见
</div>
<div class="am-u-sm-8 am-u-md-10 am-text-left">
<#list taskRecords as node>
<span>${node.assigneeName} : ${node.taskComment} &nbsp;&nbsp; ${node.createTime}</span>
<hr/>
</#list>
</div>
</div>
</div>
</div>
</div>
<!--选项卡（tabs）end-->
<div class="am-margin">
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">返回上一级</button>