Commit 696731f32d7fac48bea1d2525cc4baf2ffc5320b
1 parent
c6016de7
托盘条码打印
Showing
2 changed files
with
196 additions
and
115 deletions
.idea/workspace.xml
@@ -71,34 +71,59 @@ | @@ -71,34 +71,59 @@ | ||
71 | <file pinned="false" current-in-tab="true"> | 71 | <file pinned="false" current-in-tab="true"> |
72 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> | 72 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> |
73 | <provider selected="true" editor-type-id="text-editor"> | 73 | <provider selected="true" editor-type-id="text-editor"> |
74 | - <state relative-caret-position="148"> | ||
75 | - <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" /> | 74 | + <state relative-caret-position="150"> |
75 | + <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" /> | ||
76 | <folding> | 76 | <folding> |
77 | - <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | 77 | + <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> |
78 | + <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
79 | + <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
80 | + <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
81 | + <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" /> | ||
78 | </folding> | 82 | </folding> |
79 | </state> | 83 | </state> |
80 | </provider> | 84 | </provider> |
81 | </entry> | 85 | </entry> |
82 | </file> | 86 | </file> |
83 | <file pinned="false" current-in-tab="false"> | 87 | <file pinned="false" current-in-tab="false"> |
84 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css"> | 88 | + <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html"> |
85 | <provider selected="true" editor-type-id="text-editor"> | 89 | <provider selected="true" editor-type-id="text-editor"> |
86 | - <state relative-caret-position="108"> | ||
87 | - <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" /> | ||
88 | - </state> | ||
89 | - </provider> | ||
90 | - </entry> | ||
91 | - </file> | ||
92 | - <file pinned="false" current-in-tab="false"> | ||
93 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html"> | ||
94 | - <provider selected="true" editor-type-id="text-editor"> | ||
95 | - <state relative-caret-position="125"> | ||
96 | - <caret line="115" column="62" lean-forward="true" selection-start-line="115" selection-start-column="62" selection-end-line="115" selection-end-column="62" /> | 90 | + <state relative-caret-position="241"> |
91 | + <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" /> | ||
97 | <folding> | 92 | <folding> |
98 | <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 93 | <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
99 | - <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
100 | - <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
101 | - <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" /> | 94 | + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
95 | + <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" /> | ||
96 | + <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" /> | ||
97 | + <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" /> | ||
98 | + <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" /> | ||
99 | + <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" /> | ||
100 | + <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" /> | ||
101 | + <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" /> | ||
102 | + <element signature="e#2973#2979#0" expanded="true" /> | ||
103 | + <element signature="e#2979#2985#0" expanded="true" /> | ||
104 | + <element signature="e#2985#2991#0" expanded="true" /> | ||
105 | + <element signature="e#2991#2997#0" expanded="true" /> | ||
106 | + <element signature="e#2997#3003#0" expanded="true" /> | ||
107 | + <element signature="e#3003#3009#0" expanded="true" /> | ||
108 | + <element signature="e#3009#3015#0" expanded="true" /> | ||
109 | + <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" /> | ||
110 | + <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" /> | ||
111 | + <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" /> | ||
112 | + <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" /> | ||
113 | + <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" /> | ||
114 | + <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" /> | ||
115 | + <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" /> | ||
116 | + <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" /> | ||
117 | + <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" /> | ||
118 | + <element signature="e#3995#4001#0" expanded="true" /> | ||
119 | + <element signature="e#4001#4007#0" expanded="true" /> | ||
120 | + <element signature="e#4007#4013#0" expanded="true" /> | ||
121 | + <element signature="e#4013#4019#0" expanded="true" /> | ||
122 | + <element signature="e#4019#4025#0" expanded="true" /> | ||
123 | + <element signature="e#4025#4031#0" expanded="true" /> | ||
124 | + <element signature="e#4031#4037#0" expanded="true" /> | ||
125 | + <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" /> | ||
126 | + <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" /> | ||
102 | </folding> | 127 | </folding> |
103 | </state> | 128 | </state> |
104 | </provider> | 129 | </provider> |
@@ -141,6 +166,8 @@ | @@ -141,6 +166,8 @@ | ||
141 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java" /> | 166 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java" /> |
142 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java" /> | 167 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java" /> |
143 | <option value="$PROJECT_DIR$/src/main/resources/templates/config/container/container.html" /> | 168 | <option value="$PROJECT_DIR$/src/main/resources/templates/config/container/container.html" /> |
169 | + <option value="$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html" /> | ||
170 | + <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" /> | ||
144 | <option value="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" /> | 171 | <option value="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" /> |
145 | </list> | 172 | </list> |
146 | </option> | 173 | </option> |
@@ -171,7 +198,6 @@ | @@ -171,7 +198,6 @@ | ||
171 | </navigator> | 198 | </navigator> |
172 | <panes> | 199 | <panes> |
173 | <pane id="PackagesPane" /> | 200 | <pane id="PackagesPane" /> |
174 | - <pane id="Scope" /> | ||
175 | <pane id="ProjectPane"> | 201 | <pane id="ProjectPane"> |
176 | <subPane> | 202 | <subPane> |
177 | <expand> | 203 | <expand> |
@@ -372,6 +398,7 @@ | @@ -372,6 +398,7 @@ | ||
372 | <select /> | 398 | <select /> |
373 | </subPane> | 399 | </subPane> |
374 | </pane> | 400 | </pane> |
401 | + <pane id="Scope" /> | ||
375 | </panes> | 402 | </panes> |
376 | </component> | 403 | </component> |
377 | <component name="PropertiesComponent"> | 404 | <component name="PropertiesComponent"> |
@@ -728,14 +755,10 @@ | @@ -728,14 +755,10 @@ | ||
728 | <workItem from="1577321748902" duration="21403000" /> | 755 | <workItem from="1577321748902" duration="21403000" /> |
729 | <workItem from="1577406875935" duration="16374000" /> | 756 | <workItem from="1577406875935" duration="16374000" /> |
730 | <workItem from="1577436625365" duration="3084000" /> | 757 | <workItem from="1577436625365" duration="3084000" /> |
731 | - <workItem from="1577665795897" duration="3373000" /> | ||
732 | - </task> | ||
733 | - <task id="LOCAL-00021" summary="修改入库单数量使用BigDecimal类型,修改入库单添加、修改、物理类型添加和修改页面"> | ||
734 | - <created>1569318560852</created> | ||
735 | - <option name="number" value="00021" /> | ||
736 | - <option name="presentableId" value="LOCAL-00021" /> | ||
737 | - <option name="project" value="LOCAL" /> | ||
738 | - <updated>1569318560852</updated> | 758 | + <workItem from="1577665795897" duration="4942000" /> |
759 | + <workItem from="1577670757674" duration="6000" /> | ||
760 | + <workItem from="1577670887870" duration="8057000" /> | ||
761 | + <workItem from="1577687039415" duration="15130000" /> | ||
739 | </task> | 762 | </task> |
740 | <task id="LOCAL-00022" summary="修改物料管理中物料类型使用物料类别表,不在使用数据字典"> | 763 | <task id="LOCAL-00022" summary="修改物料管理中物料类型使用物料类别表,不在使用数据字典"> |
741 | <created>1569395439782</created> | 764 | <created>1569395439782</created> |
@@ -1073,17 +1096,24 @@ | @@ -1073,17 +1096,24 @@ | ||
1073 | <option name="project" value="LOCAL" /> | 1096 | <option name="project" value="LOCAL" /> |
1074 | <updated>1577668882648</updated> | 1097 | <updated>1577668882648</updated> |
1075 | </task> | 1098 | </task> |
1076 | - <option name="localTasksCounter" value="70" /> | 1099 | + <task id="LOCAL-00070" summary="托盘条码打印"> |
1100 | + <created>1577669193189</created> | ||
1101 | + <option name="number" value="00070" /> | ||
1102 | + <option name="presentableId" value="LOCAL-00070" /> | ||
1103 | + <option name="project" value="LOCAL" /> | ||
1104 | + <updated>1577669193189</updated> | ||
1105 | + </task> | ||
1106 | + <option name="localTasksCounter" value="71" /> | ||
1077 | <servers /> | 1107 | <servers /> |
1078 | </component> | 1108 | </component> |
1079 | <component name="TimeTrackingManager"> | 1109 | <component name="TimeTrackingManager"> |
1080 | - <option name="totallyTimeSpent" value="85839000" /> | 1110 | + <option name="totallyTimeSpent" value="110601000" /> |
1081 | </component> | 1111 | </component> |
1082 | <component name="ToolWindowManager"> | 1112 | <component name="ToolWindowManager"> |
1083 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | 1113 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
1084 | <editor active="true" /> | 1114 | <editor active="true" /> |
1085 | <layout> | 1115 | <layout> |
1086 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.2660858" /> | 1116 | + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.27680966" /> |
1087 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 1117 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
1088 | <window_info id="Designer" order="2" /> | 1118 | <window_info id="Designer" order="2" /> |
1089 | <window_info id="Image Layers" order="3" /> | 1119 | <window_info id="Image Layers" order="3" /> |
@@ -1101,11 +1131,11 @@ | @@ -1101,11 +1131,11 @@ | ||
1101 | <window_info anchor="bottom" id="Spring" order="7" /> | 1131 | <window_info anchor="bottom" id="Spring" order="7" /> |
1102 | <window_info anchor="bottom" id="Terminal" order="8" /> | 1132 | <window_info anchor="bottom" id="Terminal" order="8" /> |
1103 | <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" /> | 1133 | <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" /> |
1104 | - <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.08981233" side_tool="true" weight="0.4427157" /> | 1134 | + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.09048257" side_tool="true" weight="0.44192636" /> |
1105 | <window_info anchor="bottom" id="Java Enterprise" order="11" /> | 1135 | <window_info anchor="bottom" id="Java Enterprise" order="11" /> |
1106 | <window_info anchor="bottom" id="Database Changes" order="12" /> | 1136 | <window_info anchor="bottom" id="Database Changes" order="12" /> |
1107 | <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3286119" /> | 1137 | <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3286119" /> |
1108 | - <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.91018766" visible="true" weight="0.5042493" /> | 1138 | + <window_info anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" weight="0.509915" /> |
1109 | <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" /> | 1139 | <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" /> |
1110 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | 1140 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
1111 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | 1141 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
@@ -1302,41 +1332,6 @@ | @@ -1302,41 +1332,6 @@ | ||
1302 | </SUITE> | 1332 | </SUITE> |
1303 | </component> | 1333 | </component> |
1304 | <component name="editorHistoryManager"> | 1334 | <component name="editorHistoryManager"> |
1305 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/service/DeptServiceImpl.java"> | ||
1306 | - <provider selected="true" editor-type-id="text-editor"> | ||
1307 | - <state relative-caret-position="189"> | ||
1308 | - <caret line="212" column="39" selection-start-line="212" selection-start-column="39" selection-end-line="212" selection-end-column="39" /> | ||
1309 | - </state> | ||
1310 | - </provider> | ||
1311 | - </entry> | ||
1312 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/service/IDeptService.java"> | ||
1313 | - <provider selected="true" editor-type-id="text-editor"> | ||
1314 | - <state relative-caret-position="246"> | ||
1315 | - <caret line="113" column="16" selection-start-line="113" selection-start-column="16" selection-end-line="113" selection-end-column="16" /> | ||
1316 | - </state> | ||
1317 | - </provider> | ||
1318 | - </entry> | ||
1319 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/domain/AjaxResult.java"> | ||
1320 | - <provider selected="true" editor-type-id="text-editor"> | ||
1321 | - <state relative-caret-position="144"> | ||
1322 | - <caret line="10" column="24" lean-forward="true" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="25" /> | ||
1323 | - </state> | ||
1324 | - </provider> | ||
1325 | - </entry> | ||
1326 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java"> | ||
1327 | - <provider selected="true" editor-type-id="text-editor"> | ||
1328 | - <state relative-caret-position="209"> | ||
1329 | - <caret line="47" column="30" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="30" /> | ||
1330 | - </state> | ||
1331 | - </provider> | ||
1332 | - </entry> | ||
1333 | - <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"> | ||
1334 | - <provider selected="true" editor-type-id="text-editor"> | ||
1335 | - <state relative-caret-position="113"> | ||
1336 | - <caret line="104" selection-start-line="104" selection-end-line="104" /> | ||
1337 | - </state> | ||
1338 | - </provider> | ||
1339 | - </entry> | ||
1340 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java"> | 1335 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java"> |
1341 | <provider selected="true" editor-type-id="text-editor"> | 1336 | <provider selected="true" editor-type-id="text-editor"> |
1342 | <state relative-caret-position="209"> | 1337 | <state relative-caret-position="209"> |
@@ -1610,13 +1605,6 @@ | @@ -1610,13 +1605,6 @@ | ||
1610 | <state relative-caret-position="-962" /> | 1605 | <state relative-caret-position="-962" /> |
1611 | </provider> | 1606 | </provider> |
1612 | </entry> | 1607 | </entry> |
1613 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js"> | ||
1614 | - <provider selected="true" editor-type-id="text-editor"> | ||
1615 | - <state relative-caret-position="-133"> | ||
1616 | - <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" /> | ||
1617 | - </state> | ||
1618 | - </provider> | ||
1619 | - </entry> | ||
1620 | <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js"> | 1608 | <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js"> |
1621 | <provider selected="true" editor-type-id="text-editor"> | 1609 | <provider selected="true" editor-type-id="text-editor"> |
1622 | <state relative-caret-position="19"> | 1610 | <state relative-caret-position="19"> |
@@ -1653,10 +1641,24 @@ | @@ -1653,10 +1641,24 @@ | ||
1653 | </state> | 1641 | </state> |
1654 | </provider> | 1642 | </provider> |
1655 | </entry> | 1643 | </entry> |
1644 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js"> | ||
1645 | + <provider selected="true" editor-type-id="text-editor"> | ||
1646 | + <state relative-caret-position="-316"> | ||
1647 | + <caret line="43" column="118" selection-start-line="43" selection-start-column="113" selection-end-line="43" selection-end-column="118" /> | ||
1648 | + </state> | ||
1649 | + </provider> | ||
1650 | + </entry> | ||
1651 | + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts"> | ||
1652 | + <provider selected="true" editor-type-id="text-editor"> | ||
1653 | + <state relative-caret-position="155"> | ||
1654 | + <caret line="46" column="4" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" /> | ||
1655 | + </state> | ||
1656 | + </provider> | ||
1657 | + </entry> | ||
1656 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html"> | 1658 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html"> |
1657 | <provider selected="true" editor-type-id="text-editor"> | 1659 | <provider selected="true" editor-type-id="text-editor"> |
1658 | - <state relative-caret-position="125"> | ||
1659 | - <caret line="115" column="62" lean-forward="true" selection-start-line="115" selection-start-column="62" selection-end-line="115" selection-end-column="62" /> | 1660 | + <state relative-caret-position="147"> |
1661 | + <caret line="98" column="13" selection-start-line="98" selection-start-column="13" selection-end-line="98" selection-end-column="13" /> | ||
1660 | <folding> | 1662 | <folding> |
1661 | <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 1663 | <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
1662 | <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 1664 | <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 @@ | @@ -1666,19 +1668,87 @@ | ||
1666 | </state> | 1668 | </state> |
1667 | </provider> | 1669 | </provider> |
1668 | </entry> | 1670 | </entry> |
1671 | + <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html"> | ||
1672 | + <provider selected="true" editor-type-id="text-editor"> | ||
1673 | + <state relative-caret-position="241"> | ||
1674 | + <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" /> | ||
1675 | + <folding> | ||
1676 | + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1677 | + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1678 | + <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" /> | ||
1679 | + <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" /> | ||
1680 | + <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" /> | ||
1681 | + <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" /> | ||
1682 | + <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" /> | ||
1683 | + <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" /> | ||
1684 | + <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" /> | ||
1685 | + <element signature="e#2973#2979#0" expanded="true" /> | ||
1686 | + <element signature="e#2979#2985#0" expanded="true" /> | ||
1687 | + <element signature="e#2985#2991#0" expanded="true" /> | ||
1688 | + <element signature="e#2991#2997#0" expanded="true" /> | ||
1689 | + <element signature="e#2997#3003#0" expanded="true" /> | ||
1690 | + <element signature="e#3003#3009#0" expanded="true" /> | ||
1691 | + <element signature="e#3009#3015#0" expanded="true" /> | ||
1692 | + <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" /> | ||
1693 | + <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" /> | ||
1694 | + <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" /> | ||
1695 | + <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" /> | ||
1696 | + <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" /> | ||
1697 | + <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" /> | ||
1698 | + <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" /> | ||
1699 | + <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" /> | ||
1700 | + <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" /> | ||
1701 | + <element signature="e#3995#4001#0" expanded="true" /> | ||
1702 | + <element signature="e#4001#4007#0" expanded="true" /> | ||
1703 | + <element signature="e#4007#4013#0" expanded="true" /> | ||
1704 | + <element signature="e#4013#4019#0" expanded="true" /> | ||
1705 | + <element signature="e#4019#4025#0" expanded="true" /> | ||
1706 | + <element signature="e#4025#4031#0" expanded="true" /> | ||
1707 | + <element signature="e#4031#4037#0" expanded="true" /> | ||
1708 | + <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" /> | ||
1709 | + <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" /> | ||
1710 | + </folding> | ||
1711 | + </state> | ||
1712 | + </provider> | ||
1713 | + </entry> | ||
1714 | + <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css"> | ||
1715 | + <provider selected="true" editor-type-id="text-editor"> | ||
1716 | + <state relative-caret-position="152"> | ||
1717 | + <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" /> | ||
1718 | + </state> | ||
1719 | + </provider> | ||
1720 | + </entry> | ||
1721 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css"> | ||
1722 | + <provider selected="true" editor-type-id="text-editor"> | ||
1723 | + <state> | ||
1724 | + <caret column="49663" selection-start-column="49663" selection-end-column="49663" /> | ||
1725 | + </state> | ||
1726 | + </provider> | ||
1727 | + </entry> | ||
1669 | <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css"> | 1728 | <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css"> |
1670 | <provider selected="true" editor-type-id="text-editor"> | 1729 | <provider selected="true" editor-type-id="text-editor"> |
1671 | - <state relative-caret-position="108"> | ||
1672 | - <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" /> | 1730 | + <state relative-caret-position="127"> |
1731 | + <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" /> | ||
1732 | + </state> | ||
1733 | + </provider> | ||
1734 | + </entry> | ||
1735 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css"> | ||
1736 | + <provider selected="true" editor-type-id="text-editor"> | ||
1737 | + <state relative-caret-position="241"> | ||
1738 | + <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" /> | ||
1673 | </state> | 1739 | </state> |
1674 | </provider> | 1740 | </provider> |
1675 | </entry> | 1741 | </entry> |
1676 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> | 1742 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> |
1677 | <provider selected="true" editor-type-id="text-editor"> | 1743 | <provider selected="true" editor-type-id="text-editor"> |
1678 | - <state relative-caret-position="148"> | ||
1679 | - <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" /> | 1744 | + <state relative-caret-position="150"> |
1745 | + <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" /> | ||
1680 | <folding> | 1746 | <folding> |
1681 | - <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | 1747 | + <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> |
1748 | + <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1749 | + <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1750 | + <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1751 | + <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" /> | ||
1682 | </folding> | 1752 | </folding> |
1683 | </state> | 1753 | </state> |
1684 | </provider> | 1754 | </provider> |
src/main/resources/templates/config/container/print.html
@@ -10,41 +10,55 @@ | @@ -10,41 +10,55 @@ | ||
10 | <!--<!–[if IE]>--> | 10 | <!--<!–[if IE]>--> |
11 | <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />--> | 11 | <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />--> |
12 | <!--<![endif]–>--> | 12 | <!--<![endif]–>--> |
13 | - | 13 | + <link href="css/bootstrap.min.css" rel="stylesheet" /> |
14 | + <link href="css/font-awesome.min.css" rel="stylesheet" /> | ||
15 | + <link href="css/font-awesome-ie7.min.css" rel="stylesheet" /> | ||
14 | <style type="text/css"> | 16 | <style type="text/css"> |
15 | - .table-bordered td, .table-bordered th { | ||
16 | - border: 1px solid #000 !important; | 17 | + body,ul,li{ |
18 | + padding:0; | ||
19 | + margin:0; | ||
20 | + } | ||
21 | + ul,li{ | ||
22 | + list-style:none; | ||
23 | + } | ||
24 | + .table-bordered td,.table-bordered th{border:0px solid #000!important} | ||
25 | + | ||
26 | + .ewm_w ul{width:500px; margin:0 auto;} | ||
27 | + .ewm_w li{width:500px;height:228px; padding:0px;margin:0px auto; display:inline-table;} | ||
28 | + | ||
29 | + .ewm_w{ | ||
30 | + width:156px; | ||
31 | + float:left; | ||
32 | + padding-left:0px; | ||
17 | } | 33 | } |
18 | - .table tbody tr td{ | ||
19 | - padding: 3px; | ||
20 | - text-align: center; | 34 | + .r_two{ |
35 | + padding-left:20px; | ||
21 | } | 36 | } |
22 | </style> | 37 | </style> |
23 | </head> | 38 | </head> |
24 | 39 | ||
25 | -<body id="ddd"> | ||
26 | -<div class="noprint container" style="text-align:right; padding: 20px;float: right"> | ||
27 | - <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span> | ||
28 | -</div> | ||
29 | -<div class="container" style=" width:320px;/*height:228px;*/color: #333"> | ||
30 | - <div class="row"> | ||
31 | - <table width="50%" border="0" class="dy-report table " | ||
32 | - th:each="row:${container}"> | ||
33 | - <input th:value="${row.code}" id="code" type="hidden"/> | ||
34 | - <tbody> | ||
35 | - <tr> | ||
36 | - <!--<td >--> | ||
37 | - <!--<!–<span th:text="${row.code}" id="code" style="display: none"></span>–>--> | ||
38 | - <!--<input th:value="${row.code}" id="code" type="hidden"/>--> | ||
39 | - <!--</td>--> | ||
40 | - <td> | ||
41 | - <img id="barcode" name="aa"/> | ||
42 | - </td> | ||
43 | - </tr> | ||
44 | - </tbody> | ||
45 | - </table> | 40 | +<body > |
41 | +<div class="container"> | ||
42 | + <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> | ||
43 | + <div class="row" style="width:500px;padding:0px 0px; margin:0 auto"> | ||
44 | + <div id="ddd" style="width: 312px; margin:0;padding:0;"> | ||
45 | + <div class="ewm_w" th:each="row:${container}"> | ||
46 | + <table style="height: 220px; margin:0;padding:0;" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered"> | ||
47 | + <!--th:each="row:${container}">--> | ||
48 | + <tbody> | ||
49 | + <tr> | ||
50 | + <td align="center"> | ||
51 | + <img id="barcode" name="rotate" /> | ||
52 | + <input th:value="${row.code}" id="code" type="hidden" name="code"/> | ||
53 | + </td> | ||
54 | + </tr> | ||
55 | + </tbody> | ||
56 | + </table> | ||
57 | + </div> | ||
58 | + </div> | ||
46 | </div> | 59 | </div> |
47 | </div> | 60 | </div> |
61 | + | ||
48 | <div th:include="include :: footer"></div> | 62 | <div th:include="include :: footer"></div> |
49 | <style type="text/css"> | 63 | <style type="text/css"> |
50 | @media print { | 64 | @media print { |
@@ -60,7 +74,7 @@ | @@ -60,7 +74,7 @@ | ||
60 | var barcodeStyle = { | 74 | var barcodeStyle = { |
61 | format: "CODE128",//选择要使用的条形码类型 | 75 | format: "CODE128",//选择要使用的条形码类型 |
62 | width:1,//设置条之间的宽度 | 76 | width:1,//设置条之间的宽度 |
63 | - height:40,//高度 | 77 | + height:60,//高度 |
64 | displayValue:true,//是否在条形码下方显示文字 | 78 | displayValue:true,//是否在条形码下方显示文字 |
65 | // text:"456",//覆盖显示的文本 | 79 | // text:"456",//覆盖显示的文本 |
66 | // fontOptions:"bold italic",//使文字加粗体或变斜体 | 80 | // fontOptions:"bold italic",//使文字加粗体或变斜体 |
@@ -75,12 +89,9 @@ | @@ -75,12 +89,9 @@ | ||
75 | }; | 89 | }; |
76 | function print_qrcode() { | 90 | function print_qrcode() { |
77 | $('.dy-report').each(function (i, item) { | 91 | $('.dy-report').each(function (i, item) { |
78 | - // var code = $(this).children()[0].children[0].innerText; | ||
79 | - // $("#barcode").JsBarcode($("#barcode").attr("data"), barcodeStyle); | ||
80 | - var code =document.getElementById("code").value | ||
81 | - $(this).find('#barcode').JsBarcode($(this).find('#barcode').attr("data"),barcodeStyle); | ||
82 | - JsBarcode(document.getElementById("barcode"), code, barcodeStyle); | ||
83 | - | 92 | + var code= document.getElementsByName("code")[i].getAttribute("value"); |
93 | + $(this).find('#barcode').JsBarcode( code, barcodeStyle); | ||
94 | + document.getElementsByName("rotate")[i].style.transform = 'rotate('+90+'deg)'; | ||
84 | }); | 95 | }); |
85 | } | 96 | } |
86 | print_qrcode(); | 97 | print_qrcode(); |