Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev

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

@@ -295,11 +295,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     //设定该打印项在纸张内的位置和区域大小【Top,Left,Width,Height,strHtmlContent】
                     // LODOP.ADD_PRINT_HTM("24mm", "0",  "80mm", "24mm", document.getElementById("tagDiv").innerHTML);
 
-                    LODOP.ADD_PRINT_TEXT(107, 0, "100%", 20, $scope.json.policeData.toString());
+                    LODOP.ADD_PRINT_TEXT(107, 0, "100%", 20,"异地居民身份证");
                     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(137, 0, "100%", 20, $scope.json.policeName.toString()+($scope.json.machineNum==null?"":"("+$scope.json.machineNum+")"));
+                    // LODOP.ADD_PRINT_TEXT(137, 0, "100%", 20, $scope.json.policeName.toString()+($scope.json.machineNum==null?"":"("+$scope.json.machineNum+")"));
+                    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);