Skip to content

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

[模版] 提交模版

上级 3b550f1f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 33 行删除
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ 15b22b35
...@@ -850,11 +850,20 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -850,11 +850,20 @@ public class JavaToPdfHtmlFreeMarker {
} }
} }
if (checkList2.size() != 0) { if (checkList2.size() != 0) {
lists.add(checkList2); int size=30-i;
lists.add(addCheck(checkList2,size));
} }
return lists; 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 核查确认单据 * freemarker渲染html 核查确认单据
*/ */
...@@ -1917,10 +1926,19 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -1917,10 +1926,19 @@ public class JavaToPdfHtmlFreeMarker {
} }
} }
if (checkList2.size() != 0) { if (checkList2.size() != 0) {
lists.add(checkList2); int size=pageSize-checkList2.size();
lists.add(addExportDevice(checkList2,size));
} }
return lists; 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){ private static Map<String,Object> toExportDeviceMap(Confirm confirm, List<ExportDevice> list,Integer page,Integer count,String time){
Map<String,Object> data = new HashMap(); Map<String,Object> data = new HashMap();
data.put("title",confirm.getTitle()); data.put("title",confirm.getTitle());
......
dev-union/src/main/resources/bill10.html
浏览文件 @ 15b22b35
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
color: #141414; color: #141414;
border-width: 0px; border-width: 2px;
border-color: #a9c6c9; border-color: #000;
border-collapse: collapse; border-collapse: collapse;
text-align: center; text-align: center;
table-layout: fixed; table-layout: fixed;
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
border-width: 1px; border-width: 1px;
padding: 8px; padding: 8px;
border-style: solid; border-style: solid;
border-color: #ccc; border-color: #000;
background-color: #dedede; background-color: #dedede;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
font-size: 15px; font-size: 15px;
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
border:1px solid #bebebe; border:1px solid #000;
width: 100%; width: 100%;
} }
.td2{ .td2{
...@@ -274,9 +274,9 @@ ...@@ -274,9 +274,9 @@
</span> </span>
</div> </div>
</p> </p>
<div style="height: 853px;border: 2px solid #000"> <div style="height: 853px;overflow: hidden">
<#list checks as dev> <#list checks as dev>
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" border="0" id="alternatecolor">
<#if (dev.model)??> <#if (dev.model)??>
<tr> <tr>
<td>${dev.model!}</td> <td>${dev.model!}</td>
...@@ -286,65 +286,65 @@ ...@@ -286,65 +286,65 @@
</#if> </#if>
<tr> <tr>
<#if dev.oneCount == 1> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> <#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> </#if>
</tr> </tr>
</table> </table>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论