diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 843280f..3c1b81d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -71,34 +71,59 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
+ <state relative-caret-position="150">
+ <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
<folding>
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
+ <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="108">
- <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="115" column="62" lean-forward="true" selection-start-line="115" selection-start-column="62" selection-end-line="115" selection-end-column="62" />
+ <state relative-caret-position="241">
+ <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#2973#2979#0" expanded="true" />
+ <element signature="e#2979#2985#0" expanded="true" />
+ <element signature="e#2985#2991#0" expanded="true" />
+ <element signature="e#2991#2997#0" expanded="true" />
+ <element signature="e#2997#3003#0" expanded="true" />
+ <element signature="e#3003#3009#0" expanded="true" />
+ <element signature="e#3009#3015#0" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#3995#4001#0" expanded="true" />
+ <element signature="e#4001#4007#0" expanded="true" />
+ <element signature="e#4007#4013#0" expanded="true" />
+ <element signature="e#4013#4019#0" expanded="true" />
+ <element signature="e#4019#4025#0" expanded="true" />
+ <element signature="e#4025#4031#0" expanded="true" />
+ <element signature="e#4031#4037#0" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
@@ -141,6 +166,8 @@
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java" />
<option value="$PROJECT_DIR$/src/main/resources/templates/config/container/container.html" />
+ <option value="$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
<option value="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" />
</list>
</option>
@@ -171,7 +198,6 @@
</navigator>
<panes>
<pane id="PackagesPane" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -372,6 +398,7 @@
<select />
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -728,14 +755,10 @@
<workItem from="1577321748902" duration="21403000" />
<workItem from="1577406875935" duration="16374000" />
<workItem from="1577436625365" duration="3084000" />
- <workItem from="1577665795897" duration="3373000" />
- </task>
- <task id="LOCAL-00021" summary="修改入库单数量使用BigDecimal类型，修改入库单添加、修改、物理类型添加和修改页面">
- <created>1569318560852</created>
- <option name="number" value="00021" />
- <option name="presentableId" value="LOCAL-00021" />
- <option name="project" value="LOCAL" />
- <updated>1569318560852</updated>
+ <workItem from="1577665795897" duration="4942000" />
+ <workItem from="1577670757674" duration="6000" />
+ <workItem from="1577670887870" duration="8057000" />
+ <workItem from="1577687039415" duration="15130000" />
</task>
<task id="LOCAL-00022" summary="修改物料管理中物料类型使用物料类别表，不在使用数据字典">
<created>1569395439782</created>
@@ -1073,17 +1096,24 @@
<option name="project" value="LOCAL" />
<updated>1577668882648</updated>
</task>
- <option name="localTasksCounter" value="70" />
+ <task id="LOCAL-00070" summary="托盘条码打印">
+ <created>1577669193189</created>
+ <option name="number" value="00070" />
+ <option name="presentableId" value="LOCAL-00070" />
+ <option name="project" value="LOCAL" />
+ <updated>1577669193189</updated>
+ </task>
+ <option name="localTasksCounter" value="71" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="85839000" />
+ <option name="totallyTimeSpent" value="110601000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.2660858" />
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.27680966" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -1101,11 +1131,11 @@
<window_info anchor="bottom" id="Spring" order="7" />
<window_info anchor="bottom" id="Terminal" order="8" />
<window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
- <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.08981233" side_tool="true" weight="0.4427157" />
+ <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.09048257" side_tool="true" weight="0.44192636" />
<window_info anchor="bottom" id="Java Enterprise" order="11" />
<window_info anchor="bottom" id="Database Changes" order="12" />
<window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3286119" />
- <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.91018766" visible="true" weight="0.5042493" />
+ <window_info anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" weight="0.509915" />
<window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -1302,41 +1332,6 @@
</SUITE>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/service/DeptServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="189">
- <caret line="212" column="39" selection-start-line="212" selection-start-column="39" selection-end-line="212" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/service/IDeptService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="246">
- <caret line="113" column="16" selection-start-line="113" selection-start-column="16" selection-end-line="113" selection-end-column="16" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/domain/AjaxResult.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="144">
- <caret line="10" column="24" lean-forward="true" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="47" column="30" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="113">
- <caret line="104" selection-start-line="104" selection-end-line="104" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
@@ -1610,13 +1605,6 @@
<state relative-caret-position="-962" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-133">
- <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
@@ -1653,10 +1641,24 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-316">
+ <caret line="43" column="118" selection-start-line="43" selection-start-column="113" selection-end-line="43" selection-end-column="118" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="155">
+ <caret line="46" column="4" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="115" column="62" lean-forward="true" selection-start-line="115" selection-start-column="62" selection-end-line="115" selection-end-column="62" />
+ <state relative-caret-position="147">
+ <caret line="98" column="13" selection-start-line="98" selection-start-column="13" selection-end-line="98" selection-end-column="13" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -1666,19 +1668,87 @@
</state>
</provider>
</entry>
+ <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="241">
+ <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#2973#2979#0" expanded="true" />
+ <element signature="e#2979#2985#0" expanded="true" />
+ <element signature="e#2985#2991#0" expanded="true" />
+ <element signature="e#2991#2997#0" expanded="true" />
+ <element signature="e#2997#3003#0" expanded="true" />
+ <element signature="e#3003#3009#0" expanded="true" />
+ <element signature="e#3009#3015#0" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#3995#4001#0" expanded="true" />
+ <element signature="e#4001#4007#0" expanded="true" />
+ <element signature="e#4007#4013#0" expanded="true" />
+ <element signature="e#4013#4019#0" expanded="true" />
+ <element signature="e#4019#4025#0" expanded="true" />
+ <element signature="e#4025#4031#0" expanded="true" />
+ <element signature="e#4031#4037#0" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="152">
+ <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <caret column="49663" selection-start-column="49663" selection-end-column="49663" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="108">
- <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" />
+ <state relative-caret-position="127">
+ <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="241">
+ <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
+ <state relative-caret-position="150">
+ <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
<folding>
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
diff --git a/src/main/resources/templates/config/container/print.html b/src/main/resources/templates/config/container/print.html
index 26367fd..823ea5f 100644
--- a/src/main/resources/templates/config/container/print.html
+++ b/src/main/resources/templates/config/container/print.html
@@ -10,41 +10,55 @@
<!--<!–[if IE]>-->
<!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />-->
<!--<![endif]–>-->
-
+ <link href="css/bootstrap.min.css" rel="stylesheet" />
+ <link href="css/font-awesome.min.css" rel="stylesheet" />
+ <link href="css/font-awesome-ie7.min.css" rel="stylesheet" />
<style type="text/css">
- .table-bordered td, .table-bordered th {
- border: 1px solid #000 !important;
+ body,ul,li{
+ padding:0;
+ margin:0;
+ }
+ ul,li{
+ list-style:none;
+ }
+ .table-bordered td,.table-bordered th{border:0px solid #000!important}
+
+ .ewm_w ul{width:500px; margin:0 auto;}
+ .ewm_w li{width:500px;height:228px; padding:0px;margin:0px auto; display:inline-table;}
+
+ .ewm_w{
+ width:156px;
+ float:left;
+ padding-left:0px;
}
- .table tbody tr td{
- padding: 3px;
- text-align: center;
+ .r_two{
+ padding-left:20px;
}
</style>
</head>
-<body id="ddd">
-<div class="noprint container" style="text-align:right; padding: 20px;float: right">
- <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
-</div>
-<div class="container" style=" width:320px;/*height:228px;*/color: #333">
- <div class="row">
- <table width="50%" border="0" class="dy-report table "
- th:each="row:${container}">
- <input th:value="${row.code}" id="code" type="hidden"/>
- <tbody>
- <tr>
- <!--<td >-->
- <!--<!–<span th:text="${row.code}" id="code" style="display: none"></span>–>-->
- <!--<input th:value="${row.code}" id="code" type="hidden"/>-->
- <!--</td>-->
- <td>
- <img id="barcode" name="aa"/>
- </td>
- </tr>
- </tbody>
- </table>
+<body >
+<div class="container">
+ <div class="row" style="text-align:right"><span class="hidden-print" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span></div>
+ <div class="row" style="width:500px;padding:0px 0px; margin:0 auto">
+ <div id="ddd" style="width: 312px; margin:0;padding:0;">
+ <div class="ewm_w" th:each="row:${container}">
+ <table style="height: 220px; margin:0;padding:0;" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered">
+ <!--th:each="row:${container}">-->
+ <tbody>
+ <tr>
+ <td align="center">
+ <img id="barcode" name="rotate" />
+ <input th:value="${row.code}" id="code" type="hidden" name="code"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
</div>
+
<div th:include="include :: footer"></div>
<style type="text/css">
@media print {
@@ -60,7 +74,7 @@
var barcodeStyle = {
format: "CODE128",//选择要使用的条形码类型
width:1,//设置条之间的宽度
- height:40,//高度
+ height:60,//高度
displayValue:true,//是否在条形码下方显示文字
// text:"456",//覆盖显示的文本
// fontOptions:"bold italic",//使文字加粗体或变斜体
@@ -75,12 +89,9 @@
};
function print_qrcode() {
$('.dy-report').each(function (i, item) {
- // var code = $(this).children()[0].children[0].innerText;
- // $("#barcode").JsBarcode($("#barcode").attr("data"), barcodeStyle);
- var code =document.getElementById("code").value
- $(this).find('#barcode').JsBarcode($(this).find('#barcode').attr("data"),barcodeStyle);
- JsBarcode(document.getElementById("barcode"), code, barcodeStyle);
-
+ var code= document.getElementsByName("code")[i].getAttribute("value");
+ $(this).find('#barcode').JsBarcode( code, barcodeStyle);
+ document.getElementsByName("rotate")[i].style.transform = 'rotate('+90+'deg)';
});
}
print_qrcode();