Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

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

@@ -52,6 +52,7 @@
                     </td>
               </tr>
            </table>
+        </div>
         <div class="box-info"style="margin:7px;margin-top:0px;">
             <table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
                 <thead>
@@ -90,7 +91,5 @@
             </div>
         </div>
     </div>
-
-    </div>
 </div>
 </div>

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

@@ -59,6 +59,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             if(packageType==''){
                 packageType=-1;
             }
+            if($scope.paginationConf.currentPage==0){
+                $scope.paginationConf.currentPage=1
+            }
             HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
                 cardType,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
                     $scope.paginationConf.totalItems=data.total;

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

@@ -92,6 +92,7 @@
                             <th>记录数</th>
                             <th>生成时间</th>
                             <th>新包号</th>
+                            <th>记录状态</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -102,6 +103,8 @@
                             <td>{{item.recordNumber}}</td>
                             <td>{{item.createDate | myDateFilter}}</td>
                             <td>{{item.newFileName}}</td>
+                            <td ng-if="item">已删除</td>
+                            <td ng-if="item">未删除</td>
                         </tr>
                         </tbody>
                     </table>

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

@@ -29,10 +29,10 @@
 </style>
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
-    <div class="box box-primary">
+    <div class="box">
         <strong class="box-header">格口文件上传</strong>
         <div class="box-primary">
-            <table class="table table-bordered" style="margin-bottom: 0; width: 80%">
+            <table class="table table-bordered">
               <tr>
                   <td>订单起始日期：</td>
                   <td>
@@ -77,9 +77,9 @@
            </table>
         </div>
     </div>
-    <div class="box box-primary">
+    <div class="box ">
         <strong class="box-header with-border">格口文件管理</strong>
-        <div class="box-primary" style="padding: 15px;padding-top: 0;">
+        <div class="box box-primary" >
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                     <td>上传时间:</td>
@@ -113,6 +113,8 @@
                     </td>
               </tr>
            </table>
+        </div>
+        <div class="box-info" style="padding: 7px;padding-top: 0;">
             <table class="table table-bordered table-hover postTable" ng-if="postPackageData.length>0">
                 <thead>
                 <tr>

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

@@ -28,7 +28,7 @@
     <div class="col-md-12" style="margin-top:20px;">
     <div class="box">
         <strong class="box-header with-border">打包日志</strong>
-        <div class="box box-primary" style="padding: 7px;padding-top: 0;">
+        <div class="box box-primary">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                    <td>新包名:</td>

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

@@ -13,9 +13,9 @@
 </style>
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
-    <div class="box box-primary">
+    <div class="box">
         <strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
-        <div class="box-info">
+        <div class="box box-primary">
             <div class="row" style="padding: 15px;">
                 <div class="col-lg-3" style="text-align: center;padding-top: 20px;"><img style="height:148px;width:115px;" id="imgDetail" class="img-thumbnail" /></div>
                 <div class="col-lg-9">
@@ -58,9 +58,9 @@
              <button class="btn btn-info" ng-click="endReading()">停止读卡</button>
         </div>
     </div>
-    <div class="box box-primary box-default">
+    <div class="box box-default">
         <strong class="box-header with-border">个人邮寄信息详情</strong>
-        <div class="box-info" style="padding: 10px;">
+        <div class="box-info" style="padding: 7px;">
             <table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0">
                     <thead>
                     <tr>
@@ -108,7 +108,7 @@
     </div>
 </div>
 </div>
-
+<!--EMS热敏纸模板-->
 <div style="display: none;" >
     <div id="div1">
     		<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family:'黑体';">

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

@@ -28,10 +28,10 @@
     }
 </style>
 <div class="content row">
-    <div class="col-md-12" style="margin-top:20px;">
-    <div class="box box-primary" >
+    <div class="col-md-12" style="margin-top:17px;">
+    <div class="box " >
         <strong class="box-header">快递单信息管理</strong>
-        <div class="box-info">
+        <div class="box box-primary">
            <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                     <td>申请人姓名:</td>
@@ -88,7 +88,7 @@
         <div class="box-header with-border"><strong>邮寄单详情</strong>
                 (<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
                     {{paginationConf.totalItems}}条</span>)</div>
-            <div class="box-info" style="padding: 10px;">
+            <div class="box-info" style="padding: 7px;">
                 <table class="table table-bordered table-hover" ng-if="postData.length>0">
                         <thead>
                         <tr>