From 160b70c6d871397031ab28b54364786ec7b3cd1c Mon Sep 17 00:00:00 2001
From: "suhang_max@163.com" <suhang_max@163.com>
Date: Tue, 6 Dec 2022 18:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE-=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC-=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA-=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../templates/admin/project_list.ftl | 188 +++++++++++-------
.../templates/admin/project_list_approve.ftl | 35 ++++
2 files changed, 148 insertions(+), 75 deletions(-)
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index de2e2e0..a25d274 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -773,93 +773,132 @@
}
</style>
<table class="am-table am-table-striped am-table-hover table-main">
- <thead style="display:block;width: 4200px;">
+ <thead style="display:block;width: 120%;">
<tr class="am-text-nowrap">
<th width="30px">
- <input type="checkbox" id="allCheck"></th>
+ <input type="checkbox" id="allCheck">
+ </th>
<th class="table-title" width="60px">序号</th>
<th class="table-title" width="120px">项目编号<i class="am-icon-caret-down" <#if orderTypeStr == "projectNoDown">style="color: red"</#if> onclick="sub_function('projectNoDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNoUp">style="color: red"</#if> onclick="sub_function('projectNoUp')"></i></th>
<th class="table-title" width="480px">项目名称<i class="am-icon-caret-down" <#if orderTypeStr == "projectNameDown">style="color: red"</#if> onclick="sub_function('projectNameDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNameUp">style="color: red"</#if> onclick="sub_function('projectNameUp')"></i></th>
- <th class="table-title">项目类型<i class="am-icon-caret-down" <#if orderTypeStr == "projectTypeDown">style="color: red"</#if> onclick="sub_function('projectTypeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectTypeUp">style="color: red"</#if> onclick="sub_function('projectTypeUp')"></i></th>
- <th class="table-title">垫资模式<i class="am-icon-caret-down" <#if orderTypeStr == "underModeDown">style="color: red"</#if> onclick="sub_function('underModeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underModeUp">style="color: red"</#if> onclick="sub_function('underModeUp')"></i></th>
- <th class="table-title">垫资利息<i class="am-icon-caret-down" <#if orderTypeStr == "underIntDown">style="color: red"</#if> onclick="sub_function('underIntDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underIntUp">style="color: red"</#if> onclick="sub_function('underIntUp')"></i></th>
- <th class="table-title">垫资峰值<i class="am-icon-caret-down" <#if orderTypeStr == "underPeakDown">style="color: red"</#if> onclick="sub_function('underPeakDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underPeakUp">style="color: red"</#if> onclick="sub_function('underPeakUp')"></i></th>
- <th class="table-title">项目合同金额<i class="am-icon-caret-down" <#if orderTypeStr == "projectContractDown">style="color: red"</#if> onclick="sub_function('projectContractDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectContractUp">style="color: red"</#if> onclick="sub_function('projectContractUp')"></i></th>
- <th class="table-title">项目毛利<i class="am-icon-caret-down" <#if orderTypeStr == "grossProfitDown">style="color: red"</#if> onclick="sub_function('grossProfitDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "grossProfitUp">style="color: red"</#if> onclick="sub_function('grossProfitUp')"></i></th>
- <th class="table-title">项目毛利率<i class="am-icon-caret-down" <#if orderTypeStr == "grossProfitMarginDown">style="color: red"</#if> onclick="sub_function('grossProfitMarginDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "grossProfitMarginUp">style="color: red"</#if> onclick="sub_function('grossProfitMarginUp')"></i></th>
- <th class="table-title">项目把握度<i class="am-icon-caret-down" <#if orderTypeStr == "certaintyDown">style="color: red"</#if> onclick="sub_function('certaintyDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "certaintyUp">style="color: red"</#if> onclick="sub_function('certaintyUp')"></i></th>
- <th class="table-title">汇智产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "huizhiDown">style="color: red"</#if> onclick="sub_function('huizhiDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "huizhiUp">style="color: red"</#if> onclick="sub_function('huizhiUp')"></i></th>
- <th class="table-title">华智产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "huazhiDown">style="color: red"</#if> onclick="sub_function('huazhiDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "huazhiUp">style="color: red"</#if> onclick="sub_function('huazhiUp')"></i></th>
- <th class="table-title">华三产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "huasanDown">style="color: red"</#if> onclick="sub_function('huasanDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "huasanUp">style="color: red"</#if> onclick="sub_function('huasanUp')"></i></th>
- <th class="table-title">其他产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "otherDown">style="color: red"</#if> onclick="sub_function('otherDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "otherUp">style="color: red"</#if> onclick="sub_function('otherUp')"></i></th>
- <th class="table-title">项目状态</th>
- <th class="table-title">行业场景应用</th>
- <th class="table-title">解决方案</th>
- <th class="table-title">客户名称</th>
- <th class="table-title">最终用户名称</th>
- <th class="table-title">预计合同签订时间</th>
- <th class="table-title">项目计划招标时间</th>
- <th class="table-title">是否二次合作</th>
- <th class="table-title">直签</th>
- <th class="table-title">战略合作对象</th>
- <th class="table-title">项目负责人</th>
- <th class="table-title">审核状态</th>
- <th class="table-title">当前审核人</th>
- <th class="table-title">项目创建者</th>
- <th class="table-title">部门名称</th>
- <th class="table-title">项目周期</th>
- <th class="table-title">最后更新时间</th>
+ <th class="table-title" width="200px">项目类型<i class="am-icon-caret-down" <#if orderTypeStr == "projectTypeDown">style="color: red"</#if> onclick="sub_function('projectTypeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectTypeUp">style="color: red"</#if> onclick="sub_function('projectTypeUp')"></i></th>
+ <th class="table-title" width="200px">项目阶段</th>
+ <#--<th class="table-title">垫资模式<i class="am-icon-caret-down" <#if orderTypeStr == "underModeDown">style="color: red"</#if> onclick="sub_function('underModeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underModeUp">style="color: red"</#if> onclick="sub_function('underModeUp')"></i></th>-->
+ <#--<th class="table-title">垫资利息<i class="am-icon-caret-down" <#if orderTypeStr == "underIntDown">style="color: red"</#if> onclick="sub_function('underIntDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underIntUp">style="color: red"</#if> onclick="sub_function('underIntUp')"></i></th>-->
+ <#--<th class="table-title">垫资峰值<i class="am-icon-caret-down" <#if orderTypeStr == "underPeakDown">style="color: red"</#if> onclick="sub_function('underPeakDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underPeakUp">style="color: red"</#if> onclick="sub_function('underPeakUp')"></i></th>-->
+ <th class="table-title" width="200px">项目合同金额<i class="am-icon-caret-down" <#if orderTypeStr == "projectContractDown">style="color: red"</#if> onclick="sub_function('projectContractDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectContractUp">style="color: red"</#if> onclick="sub_function('projectContractUp')"></i></th>
+ <#--<th class="table-title">项目毛利<i class="am-icon-caret-down" <#if orderTypeStr == "grossProfitDown">style="color: red"</#if> onclick="sub_function('grossProfitDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "grossProfitUp">style="color: red"</#if> onclick="sub_function('grossProfitUp')"></i></th>-->
+ <#--<th class="table-title">项目毛利率<i class="am-icon-caret-down" <#if orderTypeStr == "grossProfitMarginDown">style="color: red"</#if> onclick="sub_function('grossProfitMarginDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "grossProfitMarginUp">style="color: red"</#if> onclick="sub_function('grossProfitMarginUp')"></i></th>-->
+ <#--<th class="table-title">项目把握度<i class="am-icon-caret-down" <#if orderTypeStr == "certaintyDown">style="color: red"</#if> onclick="sub_function('certaintyDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "certaintyUp">style="color: red"</#if> onclick="sub_function('certaintyUp')"></i></th>-->
+ <#--<th class="table-title">汇智产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "huizhiDown">style="color: red"</#if> onclick="sub_function('huizhiDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "huizhiUp">style="color: red"</#if> onclick="sub_function('huizhiUp')"></i></th>-->
+ <#--<th class="table-title">华智产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "huazhiDown">style="color: red"</#if> onclick="sub_function('huazhiDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "huazhiUp">style="color: red"</#if> onclick="sub_function('huazhiUp')"></i></th>-->
+ <#--<th class="table-title">华三产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "huasanDown">style="color: red"</#if> onclick="sub_function('huasanDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "huasanUp">style="color: red"</#if> onclick="sub_function('huasanUp')"></i></th>-->
+ <#--<th class="table-title">其他产品金额<i class="am-icon-caret-down" <#if orderTypeStr == "otherDown">style="color: red"</#if> onclick="sub_function('otherDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "otherUp">style="color: red"</#if> onclick="sub_function('otherUp')"></i></th>-->
+ <#--<th class="table-title">项目状态</th>-->
+ <#--<th class="table-title">行业场景应用</th>-->
+ <#--<th class="table-title">解决方案</th>-->
+ <#--<th class="table-title">客户名称</th>-->
+ <#--<th class="table-title">最终用户名称</th>-->
+ <#--<th class="table-title">预计合同签订时间</th>-->
+ <#--<th class="table-title">项目计划招标时间</th>-->
+ <#--<th class="table-title">是否二次合作</th>-->
+ <#--<th class="table-title">直签</th>-->
+ <#--<th class="table-title">战略合作对象</th>-->
+ <#--<th class="table-title">项目负责人</th>-->
+ <#--<th class="table-title">审核状态</th>-->
+ <th class="table-title" width="200px">当前审核人</th>
+ <th class="table-title" width="200px">项目创建者</th>
+ <#--<th class="table-title">部门名称</th>-->
+ <#--<th class="table-title">项目周期</th>-->
+ <#--<th class="table-title">最后更新时间</th>-->
<th class="table-title" width="240px">操作</th>
</tr>
</thead>
- <tbody style="display:block;width: 4200px;">
+
+ <tbody style="display:block;width: 120%;">
<#list pager.list as list>
<tr>
<td width="30px">
- <input type="checkbox" name="ids" value="${list.id!}" /></td>
+ <input type="checkbox" name="ids" value="${list.id!}" />
+ </td>
+ <#--序号-->
<td width="60px">${list.tempId!}</td>
+ <#--项目编号-->
<td class="huanhang" width="120px">${list.projectNo!}</td>
- <td class="huanhang" width="480px"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td>
- <td>${list.typeDesc!}</td>
- <td>${list.underwrittenModeStr!}</td>
- <td>${list.advanceInterestAmountRound!}</td>
- <td>${list.advancePeakAmountRound!}</td>
- <td>${list.contractRound!}</td>
- <td>${list.grossProfitRound!}</td>
- <td>${list.grossProfitMarginRound!}</td>
-
-<#-- <td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.advancePeakAmount, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.contractAmount, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.grossProfit, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.grossProfitMargin, "0.00")}</td>-->
- <td>${list.certaintyStr!}</td>
- <td>${list.huizhiRound!}</td>
- <td>${list.huazhiRound!}</td>
- <td>${list.huasanRound!}</td>
- <td>${list.ziguangRound!}</td>
-
-<#-- <td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.huasanProductAmount, "0.00")}</td>-->
-<#-- <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>-->
- <td>${list.statusDesc!}</td>
- <td>${list.industryScenario!}</td>
- <td>${list.resolvePlanStr!}</td>
- <td>${list.customer!}</td>
- <td>${list.terminalCustomer!}</td>
- <td>${(list.contractTime?string("yyyy-MM-dd"))!}</td>
- <td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>
- <td>${list.isSecondStr!}</td>
- <td>${list.signTypeStr!}</td>
- <td>${list.collaborator!}</td>
- <td>${list.principal!}</td>
- <td>${list.approveStatusDesc!}</td>
- <td>${list.approveName!}</td>
- <td>${list.creatorName!}</td>
- <td>${list.deptName!}</td>
- <td>${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}</td>
- <td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>
+ <#--项目名称-->
+ <td class="huanhang" width="480px">
+ <a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a>
+ </td>
+ <#--项目类型-->
+ <td width="200px">${list.typeDesc!}</td>
+ <#--项目阶段-->
+ <td width="200px">等韩博确定字段</td>
+ <#--垫资模式-->
+ <#--<td>${list.underwrittenModeStr!}</td>-->
+ <#--垫资利息-->
+ <#--<td>${list.advanceInterestAmountRound!}</td>-->
+ <#--垫资峰值-->
+ <#--<td>${list.advancePeakAmountRound!}</td>-->
+ <#--项目合同金额-->
+ <td width="200px">${list.contractRound!}</td>
+ <#--项目毛利-->
+ <#--<td>${list.grossProfitRound!}</td>-->
+ <#--项目毛利率-->
+ <#--<td>${list.grossProfitMarginRound!}</td>-->
+ <#-- <td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.advancePeakAmount, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.contractAmount, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.grossProfit, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.grossProfitMargin, "0.00")}</td>-->
+ <#--项目把握度-->
+ <#--<td>${list.certaintyStr!}</td>-->
+ <#--汇智产品金额-->
+ <#--<td>${list.huizhiRound!}</td>-->
+ <#--华智产品金额-->
+ <#--<td>${list.huazhiRound!}</td>-->
+ <#--华三产品金额-->
+ <#--<td>${list.huasanRound!}</td>-->
+ <#--其他产品金额-->
+ <#--<td>${list.ziguangRound!}</td>-->
+ <#-- <td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.huasanProductAmount, "0.00")}</td>-->
+ <#-- <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>-->
+ <#--项目状态-->
+ <#--<td>${list.statusDesc!}</td>-->
+ <#--行业场景应用-->
+ <#--<td>${list.industryScenario!}</td>-->
+ <#--解决方案-->
+ <#--<td>${list.resolvePlanStr!}</td>-->
+ <#--客户名称-->
+ <#--<td>${list.customer!}</td>-->
+ <#--最终用户名称-->
+ <#--<td>${list.terminalCustomer!}</td>-->
+ <#--预计合同签订时间-->
+ <#--<td>${(list.contractTime?string("yyyy-MM-dd"))!}</td>-->
+ <#--项目计划招标时间-->
+ <#--<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>-->
+ <#--是否二次合作-->
+ <#--<td>${list.isSecondStr!}</td>-->
+ <#--直签-->
+ <#--<td>${list.signTypeStr!}</td>-->
+ <#--战略合作对象-->
+ <#--<td>${list.collaborator!}</td>-->
+ <#--项目负责人-->
+ <#--<td>${list.principal!}</td>-->
+ <#--审核状态-->
+ <#--<td>${list.approveStatusDesc!}</td>-->
+ <#--当前审核人-->
+ <td width="200px">${list.approveName!}</td>
+ <#--项目创建者-->
+ <td width="200px">${list.creatorName!}</td>
+ <#--部门名称-->
+ <#-- <td>${list.deptName!}</td>-->
+ <#--项目周期-->
+ <#--<td>${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}</td>-->
+ <#--最后更新时间-->
+ <#--<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
+ <#--操作-->
<td width="240px">
<div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs">
@@ -991,7 +1030,6 @@
</div>
</div>
</td>
-
</tr>
</#list>
</tbody>
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index a44201e..6b9d0a6 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -1,5 +1,6 @@
<#assign base=request.contextPath />
<#import "../common/defaultLayout.ftl" as defaultLayout>
+
<@defaultLayout.layout>
<link rel="stylesheet" href="../assets/css/amazeui.switch.css"/>
<style type="text/css">
@@ -520,40 +521,73 @@
<tbody style="display:block;width: 4200px;">
<#list pager.list as list>
<tr>
+ <#--序号-->
<td width="60px">${list.tempId!}</td>
+ <#--项目编号-->
<td class="huanhang" width="120px">${list.projectNo!}</td>
+ <#--项目名称-->
<td class="huanhang" width="200px">
<a style="cursor: pointer;text-decoration:none" onclick="approve2(${list.id})">${list.name!}</a>
</td>
+ <#--项目类型-->
<td>${list.typeDesc!}</td>
+ <#--垫资模式-->
<td>${list.underwrittenModeStr!}</td>
+ <#--垫资利息-->
<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>
+ <#--垫资峰值-->
<td>${Utils.format(list.advancePeakAmount, "0.00")}</td>
+ <#--项目合同金额-->
<td>${Utils.format(list.contractAmount, "0.00")}</td>
+ <#--项目毛利-->
<td>${Utils.format(list.grossProfit, "0.00")}</td>
+ <#--项目毛利率-->
<td>${Utils.format(list.grossProfitMargin, "0.00")}</td>
+ <#--项目把握度-->
<td>${list.certaintyStr!}</td>
+ <#--汇智产品金额-->
<td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>
+ <#--华智产品金额-->
<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>
+ <#--华三产品金额-->
<td>${Utils.format(list.huasanProductAmount, "0.00")}</td>
+ <#--其他产品金额-->
<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
+ <#--项目状态-->
<td>${list.statusDesc!}</td>
+ <#--行业场景应用-->
<td>${list.industryScenario!}</td>
+ <#--解决方案-->
<td>${list.resolvePlanStr!}</td>
+ <#--客户名称-->
<td>${list.customer!}</td>
+ <#--最终用户名称-->
<td>${list.terminalCustomer!}</td>
+ <#--预计合同签订时间-->
<td>${(list.contractTime?string("yyyy-MM-dd"))!}</td>
+ <#--项目计划招标时间-->
<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>
+ <#--是否二次合作-->
<td>${list.isSecondStr!}</td>
+ <#--直签-->
<td>${list.signTypeStr!}</td>
+ <#--战略合作对象-->
<td>${list.collaborator!}</td>
+ <#--项目负责人-->
<td>${list.principal!}</td>
+ <#--审核状态-->
<td>${list.approveStatusDesc!}</td>
+ <#--当前审核人-->
<td>${list.approveName!}</td>
+ <#--项目创建者-->
<td>${list.creatorName!}</td>
+ <#--部门名称-->
<td>${list.deptName!}</td>
+ <#--项目周期-->
<td>${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}</td>
+ <#--最后更新时间-->
<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>
+ <#--操作-->
<td>
<div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs">
@@ -604,6 +638,7 @@
</footer>
</div>
</@defaultLayout.layout>
+
<script src="../assets/js/amazeui.switch.js"></script>
<script type="text/javascript">
$(function () {