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

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

@@ -13,14 +13,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
 
         //Date picker
         $('#datepicker1').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            minView: 0, //选择到分钟
             language: 'zh-CN',
             format: 'yyyy-MM-dd HH:mm:ss',
             todayBtn: 1,
             autoclose: 1
         });
         $('#datepicker2').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            minView: 0, //选择到分钟
             language: 'zh-CN',
             format: 'yyyy-MM-dd HH:mm:ss',
             todayBtn: 1,

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

@@ -238,18 +238,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "");
                     // LODOP.SET_PRINT_STYLE("FontName", "黑体");
                     //设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
-                    LODOP.ADD_PRINT_BARCODE(15,9, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
+                    LODOP.ADD_PRINT_BARCODE(24,12, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
                     LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
 
                     //设定该打印项在纸张内的位置和区域大小【Top,Left,Width,Height,strHtmlContent】
                     // LODOP.ADD_PRINT_HTM("24mm", "0",  "80mm", "24mm", document.getElementById("tagDiv").innerHTML);
 
-                    LODOP.ADD_PRINT_TEXT(102, 0, "100%", 20, $scope.json.policeData.toString());
+                    LODOP.ADD_PRINT_TEXT(107, 0, "100%", 20, $scope.json.policeData.toString());
                     LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
                     LODOP.SET_PRINT_STYLEA(0, "FontSize", 15);
-                    LODOP.ADD_PRINT_TEXT(132, 0, "100%", 20, $scope.json.policeName.toString());
+                    LODOP.ADD_PRINT_TEXT(137, 0, "100%", 20, $scope.json.policeName.toString());
                     LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
                     LODOP.SET_PRINT_STYLEA(0, "VOrient", 0);