diff --git a/src/main/resources/static/common/css/print.css b/src/main/resources/static/common/css/print.css index a3457d7..5ae6481 100644 --- a/src/main/resources/static/common/css/print.css +++ b/src/main/resources/static/common/css/print.css @@ -35,7 +35,7 @@ /*border-right: 1px solid #ddd;*/ /*border-left: 1px solid #ddd;*/ } -#printContainer table td { +#printContainer table > tr > td { vertical-align: center; /*border-right: 1px solid #ddd;*/ /*border-left: 1px solid #ddd;*/ diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index da020ef..27c914a 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -691,15 +691,19 @@ +<#-- --> + - + @@ -716,7 +720,7 @@ <#list incomeDetails as incomeDetail> - - - - - - - - - @@ -784,6 +788,7 @@
序号序号 类别 名称 单位
${(incomeDetail_index+1)!} + <#--
+
<#--收入明细表--> @@ -1112,9 +1117,13 @@ +<#-- -->
+ @@ -1254,6 +1263,7 @@
+ <#--收入明细表 采购成本明细表 diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 3ed77c6..f81124f 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -14,6 +14,57 @@ table-layout:fixed; word-break:break-all } + /*固定表头的列表*/ + .fixed-list { + flex: 1 1 auto; + overflow: hidden; + } + .fixed-list table { + display: block; + width: 100%; + max-height: 100%; + border-spacing: 0px; + border-collapse: collapse; + border: none; + overflow-y: hidden; + overflow-x: auto; + margin: 0; + } + + .fixed-list.is-vertical-scroll table tbody { + max-height: calc(100% - 71px); + } + .fixed-list table>thead>tr>th { + height: 40px; + text-align: center; + vertical-align: middle; + } + .fixed-list table td { + height: 55px; + text-align: center; + } + .fixed-list table tbody { + display: block; + width: 100%; + max-height: calc(100% - 45px); + overflow-y: scroll; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + } + + .fixed-list table tr { + table-layout: fixed; + display: table; + } + .fixed-list table thead tr { + width: calc(100% - 18px); + border-top: 1px solid #ddd; + border-bottom: none; + } + .fixed-list table tbody tr { + width: 100%; + } +
@@ -322,17 +373,17 @@
-
+
-
+
- + - - - - + + + @@ -362,17 +413,17 @@ - + - + <#list pager.list as list> - - - - + + + @@ -402,7 +453,7 @@ -
+ 序号项目编号style="color: red" onclick="sub_function('projectNoDown')">style="color: red" onclick="sub_function('projectNoUp')">项目名称style="color: red" onclick="sub_function('projectNameDown')">style="color: red" onclick="sub_function('projectNameUp')">序号项目编号style="color: red" onclick="sub_function('projectNoDown')">style="color: red" onclick="sub_function('projectNoUp')">项目名称style="color: red" onclick="sub_function('projectNameDown')">style="color: red" onclick="sub_function('projectNameUp')"> 项目类型style="color: red" onclick="sub_function('projectTypeDown')">style="color: red" onclick="sub_function('projectTypeUp')"> 垫资模式style="color: red" onclick="sub_function('underModeDown')">style="color: red" onclick="sub_function('underModeUp')"> 垫资利息style="color: red" onclick="sub_function('underIntDown')">style="color: red" onclick="sub_function('underIntUp')">部门名称 项目周期 最后更新时间操作操作
+ ${list.tempId!}${list.projectNo!}${list.name!}${list.tempId!}${list.projectNo!}${list.name!} ${list.typeDesc!} ${list.underwrittenModeStr!} ${Utils.format(list.advanceInterestAmount, "0.00")}${list.deptName!} ${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!} ${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!} +
<#if adminId==1> @@ -539,18 +590,7 @@
-
- - <#if (pager.list)?exists && (pager.list?size>0) > -
- <#include "../common/project_pager.ftl"> -
- <#else> -
-

没有找到任何记录!

-
- -
+
@@ -574,7 +614,18 @@
-->