Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/views/tagPrint/tagPrint.html

@@ -124,7 +124,7 @@
 </div>
 </section>
 <div style="display: none;">
-    <div id="div1">
+    <!--<div id="div1">
         <p>
            <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
                 <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0 pluginspage="install_lodop32.exe"></embed>
@@ -133,5 +133,26 @@
         <div  style="font-family:'黑体';height:7mm;position: absolute;top:5mm;left:4mm;">{{json.policeData}}</div>
         <div  style="font-family:'黑体';height:7mm;position: absolute;top:12mm;left:3mm;">{{json.policeName}}</div>
         <div  style="font-family:'黑体';height:7mm;position: absolute;top:20mm;left:5mm;">数量：{{json.count}}张</div>
+    </div>-->
+    <div id="tagDiv">
+        <p>
+           <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA"
+                   width=0 height=0>
+                <embed id="LODOP_EM" type="application/x-print-lodop"
+                       width=0 height=0 pluginspage="install_lodop32.exe"></embed>
+           </object>
+        </p ><div style="font-size:3mm ;">
+        <p style="text-align:center;margin:1mm 0mm 0mm 0mm;">
+            <span style="font-size:5mm ;">{{json.policeData}}</span>
+        </p >
+        <p style="text-align:center;margin:1.7mm 0mm 0mm 0mm;">
+            <span style="font-size: 3.5mm;">{{json.policeName}}</span>
+        </p >
+        <p style="text-align:center;margin:1.7mm 0mm 0mm 0mm;">
+            <span style="">数量：
+                <span style="font-size:5mm;">{{json.count}}</span>张
+            </span>
+        </p >
+        </div>
     </div>
 </div>

src/main/resources/static/views/tagPrint/tagPrint.js

@@ -146,27 +146,50 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         }
 
 
+        // $scope.PreviewMytableRotate = function() {
+        //     HttpService.getPoliceName($scope.json.policeCode, function (data) {
+        //         $scope.json.policeData = data[0].POLICE_NAME;
+        //         console.log($scope.json.policeData)
+        //         $timeout(function () {
+        //             var LODOP = getLodop();
+        //             LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+        //             LODOP.SET_PRINT_STYLE("FontName", "黑体");
+        //             LODOP.PRINT_INIT("标签");
+        //             LODOP.SET_PRINT_PAGESIZE(1, "70mm", "40mm", "");
+        //             LODOP = getLodop(document.getElementById('LODOP1'), document.getElementById('LODOP_EM'));
+        //             LODOP.SET_PRINT_STYLE("FontName", "黑体");
+        //             LODOP.ADD_PRINT_BARCODE(7, 20, 242, 60, "128A", $scope.json.policeCardsList[0].ACCEPT_NO.substring(0, 8));
+        //             LODOP.ADD_PRINT_HTM(60, 80, 300, 300, document.getElementById("div1").innerHTML);
+        //             LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 0);
+        //             LODOP.PREVIEW();
+        //             // LODOP.PRINT();
+        //         })
+        //     })
+        // }
+
         $scope.PreviewMytableRotate = function(){
                 HttpService.getPoliceName($scope.json.policeCode,function(data) {
                     $scope.json.policeData = data[0].POLICE_NAME;
                     console.log($scope.json.policeData)
                     $timeout(function () {
                         var LODOP = getLodop();
-                    LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
-                    LODOP.SET_PRINT_STYLE("FontName", "黑体");
-                    LODOP.PRINT_INIT("标签");
-                    LODOP.SET_PRINT_PAGESIZE(1, "70mm", "40mm", "");
                         LODOP = getLodop(document.getElementById('LODOP1'), document.getElementById('LODOP_EM'));
-                    LODOP.SET_PRINT_STYLE("FontName", "黑体");
-                    LODOP.ADD_PRINT_BARCODE(7, 20, 242, 60, "128A", $scope.json.policeCardsList[0].ACCEPT_NO.substring(0,8));
-                    LODOP.ADD_PRINT_HTM(60, 80, 300, 300, document.getElementById("div1").innerHTML);
-                    LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 0);
+                        if (!LODOP) { alert("请先安装控件！"); return; }
+                        LODOP.SET_LICENSES("民软网(www.minsoft.cn)", "158703810611011350109107113120", "", "");
+                        //初始化
+                        LODOP.PRINT_INIT("打印封口签");
+                        //设置纸张大小
+                        // LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "CreateCustomPage");
+                        LODOP.SET_PRINT_PAGESIZE(1, "84mm", "54mm", "");
+                        // LODOP.SET_PRINT_STYLE("FontName", "黑体");
+                        //设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
+                        LODOP.ADD_PRINT_BARCODE("2mm", "2mm", "74mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.substring(0,8));
+                        //设定该打印项在纸张内的位置和区域大小【Top,Left,Width,Height,strHtmlContent】
+                        LODOP.ADD_PRINT_HTM("22mm", "0",  "78mm", "24mm", document.getElementById("tagDiv").innerHTML);
                         LODOP.PREVIEW();
                         // LODOP.PRINT();
                     })
                 })
-
-
             };
 
     });