Skip to content

D
device-back
提交 15b22b35 authored 作者: 133's avatar 133
浏览文件
操作

[模版] 提交模版

上级 3b550f1f
显示空白字符变更
内嵌 并排
正在显示 包含 114 行增加 和 64 行删除
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ 15b22b35
......@@ -850,11 +850,20 @@ public class JavaToPdfHtmlFreeMarker {
}
}
if (checkList2.size() != 0) {
lists.add(checkList2);
int size=30-i;
lists.add(addCheck(checkList2,size));
}
return lists;
}
private static List<Check> addCheck(List<Check> checks,Integer size){
for (int i=0;i<size-1;i++){
checks.add(new Check(null,null,null,null,"",1));
}
return checks;
}
/**
* freemarker渲染html 核查确认单据
*/
......@@ -1917,10 +1926,19 @@ public class JavaToPdfHtmlFreeMarker {
}
}
if (checkList2.size() != 0) {
lists.add(checkList2);
int size=pageSize-checkList2.size();
lists.add(addExportDevice(checkList2,size));
}
return lists;
}
private static List<ExportDevice> addExportDevice(List<ExportDevice> exportDevices,Integer size){
for (int i=0;i<size-1;i++){
exportDevices.add(new ExportDevice(null,null,null,null,"",1,null,null,1,""));
}
return exportDevices;
}
private static Map<String,Object> toExportDeviceMap(Confirm confirm, List<ExportDevice> list,Integer page,Integer count,String time){
Map<String,Object> data = new HashMap();
data.put("title",confirm.getTitle());
......
dev-union/src/main/resources/bill10.html
浏览文件 @ 15b22b35
......@@ -111,8 +111,8 @@
width: 100%;
font-size: 14px;
color: #141414;
border-width: 0px;
border-color: #a9c6c9;
border-width: 2px;
border-color: #000;
border-collapse: collapse;
text-align: center;
table-layout: fixed;
......@@ -123,7 +123,7 @@
border-width: 1px;
padding: 8px;
border-style: solid;
border-color: #ccc;
border-color: #000;
background-color: #dedede;
height: 20px;
line-height: 20px;
......@@ -136,7 +136,7 @@
font-size: 15px;
word-break: break-all;
word-wrap: break-word;
border:1px solid #bebebe;
border:1px solid #000;
width: 100%;
}
.td2{
......@@ -274,9 +274,9 @@
</span>
</div>
</p>
<div style="height: 853px;border: 2px solid #000">
<div style="height: 853px;overflow: hidden">
<#list checks as dev>
<table class="altrowstable" id="alternatecolor">
<table class="altrowstable" border="0" id="alternatecolor">
<#if (dev.model)??>
<tr>
<td>${dev.model!}</td>
......@@ -286,65 +286,65 @@
</#if>
<tr>
<#if dev.oneCount == 1>
<td colspan="3" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 2>
<td colspan="3" class="td2" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td2" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 3>
<td colspan="3" class="td3" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td3" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 4>
<td colspan="3" class="td4" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td4" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 5>
<td colspan="3" class="td5" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td5" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 6>
<td colspan="3" class="td6" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td6" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 7>
<td colspan="3" class="td7" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td7" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 8>
<td colspan="3" class="td8" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td8" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 9>
<td colspan="3" class="td9" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td9" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 10>
<td colspan="3" class="td10" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td10" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 11>
<td colspan="3" class="td11" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td11" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 12>
<td colspan="3" class="td12" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td12" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 13>
<td colspan="3" class="td13" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td13" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 14>
<td colspan="3" class="td14" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td14" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 15>
<td colspan="3" class="td15" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td15" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 16>
<td colspan="3" class="td16" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td16" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 17>
<td colspan="3" class="td17" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td17" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 18>
<td colspan="3" class="td18" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td18" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 19>
<td colspan="3" class="td19" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td19" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 20>
<td colspan="3" class="td20" style="text-align: center;color: #555;t">${dev.seqStirng!}</td>
<td colspan="3" class="td20" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 21>
<td colspan="3" class="td21" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td21" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 22>
<td colspan="3" class="td22" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td22" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 23>
<td colspan="3" class="td23" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td23" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 24>
<td colspan="3" class="td24" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td24" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
<#elseif dev.oneCount == 25>
<td colspan="3" class="td25" style="text-align: center;color: #555;">${dev.seqStirng!}</td>
<td colspan="3" class="td25" style="text-align: left;padding: 0 2em;color: #555;">${dev.seqStirng!}</td>
</#if>
</tr>
</table>
......
dev-union/src/main/resources/bill11.html
浏览文件 @ 15b22b35
......@@ -112,19 +112,20 @@
width: 100%;
font-size: 14px;
color: #141414;
border-width: 0px;
border-width: 2px;
border-color: #000;
border-collapse: collapse;
text-align: center;
table-layout: fixed;
word-break: break-all;
}
table.altrowstable th {
border-width: 1px;
padding: 0px;
border-style: solid;
border-color: #ccc;
border-color: #000;
background-color: #dedede;
height: 25px;
line-height: 25px;
......@@ -137,7 +138,37 @@
font-size: 15px;
word-break: break-all;
word-wrap: break-word;
border:1px solid #bebebe;
border:1px solid #000;
width: 100%;
}
table.altrowstable2 {
width: 100%;
font-size: 16px;
color: #000;
border-width: 0px;
border-color: #000;
border-collapse: collapse;
text-align: center;
table-layout: fixed;
word-break: break-all;
}
table.altrowstable2 th {
height: 23px;
line-height:23px;
font-size: 15px;
background-color: #fff;
border:1px solid #000;
padding-top: 0;
}
table.altrowstable2 td {
height: 23px;
line-height: 23px;
font-size: 15px;
word-break: break-all;
word-wrap: break-word;
border: 1px solid #000;
width: 100%;
}
.td2{
......@@ -290,7 +321,7 @@
</head>
<body>
<div class="returnTablePrint">
<div class="returnTablePrint">
<div class="content">
<div>
<div class="listWrapper">
......@@ -302,8 +333,8 @@
</span>
</div>
</p>
<div style="height: 530px;border:2px solid #000">
<table class="altrowstable" id="alternatecolor">
<div style="height: 530px;overflow:hidden">
<table class="altrowstable" border='0' id="alternatecolor">
<tr>
<th width="190px">型号</th>
<th width="190px">名称</th>
......@@ -462,6 +493,7 @@
</tr>
</#list>
</table>
</div>
</div>
<p class="person" style="margin-top: 20px;font-size: 10px;width: 100%;text-align: left;">
......@@ -473,33 +505,33 @@
</p>
</div>
</div>
</div>
<div>
</div>
<div>
<!--<p class="bottomTxt" style="float: left;">注：编号连续使用＂-＂省略</p>-->
<p class="bottomTxt" style="float: right;">第${page}页/共${count}页</p>
</div>
</div>
<!--<script type="text/javascript">-->
<!--function altRows(id){-->
<!--if(document.getElementsByTagName){-->
<!--var table = document.getElementById(id);-->
<!--var rows = table.getElementsByTagName("tr");-->
<!--for(i = 0; i < rows.length; i++){-->
<!--if(i % 2 == 0){-->
<!--rows[i].className = "evenrowcolor";-->
<!--}else{-->
<!--rows[i].className = "oddrowcolor";-->
<!--}-->
<!--}-->
<!--}-->
<!--}-->
<!--window.onload=function(){-->
<!--altRows('alternatecolor');-->
<!--}-->
<!--</script>-->
</div>
</div>
<!--<script type="text/javascript">-->
<!--function altRows(id){-->
<!--if(document.getElementsByTagName){-->
<!--var table = document.getElementById(id);-->
<!--var rows = table.getElementsByTagName("tr");-->
<!--for(i = 0; i < rows.length; i++){-->
<!--if(i % 2 == 0){-->
<!--rows[i].className = "evenrowcolor";-->
<!--}else{-->
<!--rows[i].className = "oddrowcolor";-->
<!--}-->
<!--}-->
<!--}-->
<!--}-->
<!--window.onload=function(){-->
<!--altRows('alternatecolor');-->
<!--}-->
<!--</script>-->
</body>
</html>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论