EMS角色的功能完成

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

@@ -337,27 +337,36 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             getPackageData:function(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
-                                    typeCode,packageType,date,success){
-                var json ={
-                    uploadNo:uploadNo,
-                    idCard:idCard,
-                    oldPackageNo:oldPackageNo,
-                    newPackageNo:newPackageNo,
-                    sljg:sljg,
-                    typeCode:typeCode,
-                    packageType:packageType,
-                    date:date
-                }
-                var arr = [];
-                arr.push(json);
-                var body = JSON.stringify(arr);
-                $http({
-                    method: 'POST',
-                    url: "../PackageInformation/selectInformation",
-                    data: body,
-                    headers: {'Content-Type': 'application/json'}
+                                    typeCode,packageType,date,currentPage,itemsPerPage,success){
+                // var json ={
+                //     uploadNo:uploadNo,
+                //     IDCard:idCard,
+                //     oldFile:oldPackageNo,
+                //     newFile:newPackageNo,
+                //     SSXQDM:sljg,
+                //     cardType:typeCode,
+                //     state:packageType,
+                //     uploadDate:date
+                // }
+                // var arr = [];
+                // arr.push(json);
+                // var body = JSON.stringify(arr);
+                $http({
+                    method: 'GET',
+                    url: "../queryPreproPerson/queryPreproPerson",
+                    params:{
+                        uploadNo:uploadNo,
+                        IDCard:idCard,
+                        oldFile:oldPackageNo,
+                        newFile:newPackageNo,
+                        SSXQDM:sljg,
+                        cardType:typeCode,
+                        state:packageType,
+                        uploadDate:date,
+                        currPage:currentPage,
+                        pageSize:itemsPerPage
+                    }
                 }).then(function successCallback(response) {
-                    console.log(response)
                     success(response.data)
                 })
             },

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

@@ -48,9 +48,9 @@
                    <td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
                    <td>制证类型:</td>
                    <td style="text-align: left;">
-                      <select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择制证类型--"
+                      <select class="form-control select2" id="county"  data-placeholder="--请选择制证类型--"
                               style="width: 100%;" ng-model="typeCode">
-                              <option value="{{county}}" ng-repeat="county in countyList track by $index">{{county}}</option>
+                              <option value="{{type.typeCode}}" ng-repeat="type in typeList">{{type.typeName}}</option>
                       </select>
                    </td>
                </tr>

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

@@ -38,9 +38,35 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
         $scope.paginationConf.totalItems = 50;
 
         $scope.doPackageQuery=function(){
+            if(angular.isUndefined($scope.uploadNo)){
+                $scope.uploadNo='';
+            }
+            if(angular.isUndefined($scope.idCard)){
+                $scope.idCard='';
+            }
+            if(angular.isUndefined($scope.oldPackageNo)){
+                $scope.oldPackageNo='';
+            }
+            if(angular.isUndefined($scope.newPackageNo)){
+                $scope.newPackageNo='';
+            }
+            if(angular.isUndefined($scope.sljg)){
+                $scope.sljg='';
+            }
+            if(angular.isUndefined($scope.typeCode)){
+                $scope.typeCode='';
+            }
+            if(angular.isUndefined($scope.packageType)){
+                $scope.packageType='';
+            }
+            var date = $("#datepicker").val();
+            if (date==''){
+                date=$filter("date")(new Date(), "yyyy-MM-dd");
+            }
             HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
-                $scope.typeCode,$scope.packageType,$("#datepicker").val(),function(data) {
-                    $scope.packageData = data;
+                $scope.typeCode,$scope.packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
+                    $scope.paginationConf.totalItems=data.total;
+                    $scope.packageData = data.list;
                     console.log(data)
                 })
         }