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

src/main/resources/static/js/service.js

@@ -308,6 +308,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            getPoliceCardsList:function(id,success) {
+                $http({
+                    method: 'GET',
+                    url: "../ReceiptApi/selectDetailList"+urlTimeStamp(),
+                    params:{
+                        receiptId:id
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             selectAnalyseLogCount:function (oldPackageName,date,success) {
                 if(angular.isUndefined(oldPackageName)){
                     oldPackageName='';

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

@@ -81,7 +81,7 @@
     <div class="box box-default">
             <strong class="box-header with-border">查询结果</strong>
             <div class="box-info" style="padding: 10px;">
-                <table class="table table-bordered table-hover" ng-if="xmlDatas">
+                <table class="table table-bordered table-hover" ng-if="xmlDatas.length>0">
                         <thead>
                         <tr>
                             <th>NO.</th>
@@ -103,10 +103,10 @@
                         </tr>
                         </tbody>
                     </table>
-                    <div style="padding-left: 27%;" ng-if="xmlDatas">
-                        <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
-                    </div>
-                <h4 ng-if="postData.length==0">暂无记录。</h4>
+                <div style="padding-left: 27%;" ng-if="xmlDatas.length>0">
+                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+                </div>
+                <h4 ng-if="xmlDatas.length==0">暂无记录。</h4>
             </div>
         </div>
 </div>

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

@@ -51,7 +51,6 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-        $scope.paginationConf.totalItems = 50;
 
         $scope.doXmlQuery = function() {
             var startDate=$("#datepicker1").val();
@@ -71,16 +70,18 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
             if(endDate==''){
                 endDate=$filter("date")(new Date(), "yyyy-MM-dd");
             }
-            console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate)
+            console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
+            HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
+                $scope.paginationConf.totalItems=data;
+                console.log($scope.paginationConf.totalItems,"count")
+            })
+
             HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
                 $scope.xmlDatas = data;
                 console.log($scope.xmlDatas)
             })
-
-            HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
-                $scope.paginationConf.totalItems=data;
-                console.log(data)
-            })
         }
+        // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQuery);
 
     });
\ No newline at end of file

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

@@ -38,9 +38,9 @@
         <div class="box-header with-border">
             <strong >详情信息</strong>
         </div>
-        <div class="box-body no-padding col-md-12">
-            <div class="col-md-5" style="padding-right: 0px;" >
-                <table class="table table-bordered table-hover postTable ">
+        <div class="box-body col-md-12">
+            <div class="col-md-5" style="padding:0" >
+                <table class="table table-bordered table-hover postTable" ng-if="tagPrintData.length>0">
                         <thead>
                         <tr>
                             <th>NO.</th>
@@ -59,14 +59,17 @@
                             <td>{{item.POLICE_NAME}}</td>
                             <td>{{item.download}}</td>
                             <td>{{item.electricCount}}</td>
-                            <td ng-if="item.STATE">未复核</td>
+                            <td ng-if="item.STATE==0">未复核</td>
                             <td></td>
                             <td></td>
                         </tr>
                         </tbody>
                     </table>
+                <h4 class="col-md-7" ng-if="tagPrintData.length==0" style="padding: 0;">
+                     暂无数据
+                </h4>
             </div>
-            <div class="col-md-7" style="" ng-if="policeCardsList">
+            <div class="col-md-7" ng-if="json.policeCardsList.length>0">
                 <table class="table table-bordered">
                     <thead>
                     <tr>
@@ -80,7 +83,7 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr ng-repeat="item in policeCardsList">
+                    <tr ng-repeat="item in json.policeCardsList">
                         <td>{{$index+1}}</td>
                         <td>{{item.acceptNo}}</td>
                         <td>{{item.username}}</td>
@@ -105,15 +108,14 @@
                     </tr>
                     </tbody>
                 </table>
+                <div class="box-footer clearfix" style="border: 0;">
+                    <button class="btn btn-success  pull-right" style="margin-right: 20px;" ng-click="checkSame(json.id)">复核一致</button>
+                    <button class="btn btn-info  pull-right" style="margin-right: 20px;">打印标签</button>
+                </div>
             </div>
-        </div>
-        <div class="box-footer clearfix">
-            <button class="btn btn-success  pull-right "
-                    style="margin-right: 20px;">复核一致
-            </button>
-            <button class="btn btn-info  pull-right"
-                    style="margin-right: 20px;">打印标签
-            </button>
+            <h4 class="col-md-7" ng-if="json.policeCardsList.length==0">
+                暂无数据
+            </h4>
         </div>
     </div>
 </div>