From 3bf2d10dae09ebb53421aba8788f269a16541809 Mon Sep 17 00:00:00 2001
From: "suhang_max@163.com" <suhang_max@163.com>
Date: Thu, 8 Dec 2022 11:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E7=8E=A9-=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       |  1 +
 .../templates/admin/project_list.ftl          | 28 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index ad2ba20..a85fef0 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1,6 +1,7 @@
 <#assign base=request.contextPath />
 
 <#import "../common/defaultLayout.ftl" as defaultLayout>
+
 <@defaultLayout.layout>
     <link rel="stylesheet" type="text/css" href="${base}/common/css/time-axis.css">
 
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index a25d274..46cb330 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -773,7 +773,7 @@
                         }
                     </style>
                     <table class="am-table am-table-striped am-table-hover table-main">
-                        <thead style="display:block;width: 120%;">
+                        <thead style="display:block;width: 160vw;">
                         <tr class="am-text-nowrap">
                             <th width="30px">
                                 <input type="checkbox" id="allCheck">
@@ -781,12 +781,12 @@
                             <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" 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 == "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" >项目阶段</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 == "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>-->
@@ -806,16 +806,16 @@
                             <#--<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">项目周期</th>-->
                             <#--<th class="table-title">最后更新时间</th>-->
-                            <th class="table-title" width="240px">操作</th>
+                            <th class="table-title" width="">操作</th>
                         </tr>
                         </thead>
 
-                        <tbody style="display:block;width: 120%;">
+                        <tbody style="display:block;width: 160vw;">
                         <#list pager.list as list>
                             <tr>
                                 <td width="30px">
@@ -830,9 +830,9 @@
                                     <a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a>
                                 </td>
                                 <#--项目类型-->
-                                <td width="200px">${list.typeDesc!}</td>
+                                <td >${list.typeDesc!}</td>
                                 <#--项目阶段-->
-                                <td width="200px">等韩博确定字段</td>
+                                <td>${list.stage!}</td>
                                 <#--垫资模式-->
                                 <#--<td>${list.underwrittenModeStr!}</td>-->
                                 <#--垫资利息-->
@@ -840,7 +840,7 @@
                                 <#--垫资峰值-->
                                 <#--<td>${list.advancePeakAmountRound!}</td>-->
                                 <#--项目合同金额-->
-                                <td width="200px">${list.contractRound!}</td>
+                                <td>${list.contractRound!}</td>
                                 <#--项目毛利-->
                                 <#--<td>${list.grossProfitRound!}</td>-->
                                 <#--项目毛利率-->
@@ -889,9 +889,9 @@
                                 <#--审核状态-->
                                 <#--<td>${list.approveStatusDesc!}</td>-->
                                 <#--当前审核人-->
-                                <td width="200px">${list.approveName!}</td>
+                                <td >${list.approveName!}</td>
                                 <#--项目创建者-->
-                                <td width="200px">${list.creatorName!}</td>
+                                <td>${list.creatorName!}</td>
                                 <#--部门名称-->
                                <#-- <td>${list.deptName!}</td>-->
                                 <#--项目周期-->
@@ -899,7 +899,7 @@
                                 <#--最后更新时间-->
                                 <#--<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
                                 <#--操作-->
-                                <td width="240px">
+                                <td width="">
                                     <div class="am-btn-toolbar">
                                         <div class="am-btn-group am-btn-group-xs">
                                             <#if adminId==1>