新增页面

src/main/resources/static/dialogs/analysisDialog.html

@@ -83,7 +83,7 @@
 
         </tbody>
     </table>
-    <div style="padding-left: 27%;">
+    <div style="padding-left: 27%;" ng-if="resultData.length>0">
         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
     </div>
 </div>

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

@@ -433,7 +433,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                         date:date
                     }
                 }).then(function successCallback(response) {
-                    console.log(response.data)
                     success(response.data)
                 })
             },
@@ -449,7 +448,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                         pageSize:pageSize
                     }
                 }).then(function successCallback(response) {
-                    console.log(response.data)
                     success(response.data)
                 })
             },
@@ -462,7 +460,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     data: body,
                     headers: {'Content-Type': 'application/json'}
                 }).then(function successCallback(response) {
-                    console.log(response.data)
                     success(response.data)
                 })
             },

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

@@ -74,7 +74,7 @@
                         <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
                         <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
                         <td class="mailbox-name"><a>{{task.countyName}}</a></td>
-                        <td class="mailbox-subject">{{task.groupCount}}</td>
+                        <td class="mailbox-subject">{{task.groupList.length}}</td>
                         <td class="mailbox-subject">{{task.groupNum}}</td>
                         <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                         <td class="mailbox-date">{{task.countyInvalidCount}}</td>

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

@@ -154,14 +154,15 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                     date:$('#datepicker').val(),
                     name:$rootScope.loginData.name,
                     countyList:arr,
-                    groupList:groupList,
-                    tag:0
+                    groupList:groupList
                 }
                 console.log(map)
                 HttpService.createTask(map,function(data){
-                    MessageService.showAlert("创建成功")
+                    console.log(data)
+                    MessageService.showAlert(data.msg)
                     console.log($scope.searchCurrent)
                     $scope.searchCurrent();
+                    $scope.selected=[];
                 })
             }else{
                 MessageService.showAlert("请选择创建任务单的组")

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

@@ -57,7 +57,7 @@
                 <td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
                 <td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
                 <td class="mailbox-date">{{task.specialCount}}</td>
-                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
+                <td class="mailbox-date"><a ng-click="getPoliceList(task.countyCode,type.typeCode)">组号列表</a></td>
               </tr>
 
               </tbody>

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

@@ -57,7 +57,7 @@
                      <td style="text-align: left;">
                           <select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择区县--"
                                   style="width: 100%;" ng-model="currentCounty">
-                                  <option value="{{county}}" ng-repeat="county in countyList track by $index">{{county}}</option>
+                                  <option value="{{county.countyCode}}" ng-repeat="county in countyList">{{county.countyName}}</option>
                           </select>
                      </td>
                </tr>
@@ -109,7 +109,7 @@
                             <td>{{item.waybillNumber}}</td>
                             <td>{{item.backWaybillNumber}}</td>
                             <td>{{item.firstWhite}}</td>
-                            <td>{{item.recipientName}}</td>
+                            <td>{{item.applicantName}}</td>
                             <td>{{item.recipientPhone}}</td>
                             <td>{{item.recipientAddress}}</td>
                             <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>

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

@@ -29,7 +29,8 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
         });
 
         HttpService.getCountyListData(function (data) {
-            $scope.countyList = data
+            $scope.countyList = data;
+            console.log($scope.countyList)
         })
 
 
@@ -65,7 +66,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             if ($("#county").val() != null) {
                 json.getToCounty=$("#county").val();
             }else{
-                json.getToCounty='';
+                json.getToCounty=[];
             }
             json.uploadDate = $("#datepicker").val();
             return json;
@@ -98,18 +99,20 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.getToCounty=[];
             }
-            json.uploadDate = $("#datepicker").val();
+            if($("#datepicker").val()==''){
+                json.uploadDate = $filter("date")(new Date(), "yyyy-MM-dd");
+            }else{
+                json.uploadDate = $("#datepicker").val();
+            }
             json.firstIndex=$scope.paginationConf.currentPage;
             json.pageSize=$scope.paginationConf.itemsPerPage;
             return json;
         }
-        $scope.postData = [];
-        $scope.paginationConf.totalItems = 0
         $scope.doQuery = function () {
-            HttpService.getRecordsCount(getCountJson(), function (data) {
-                $scope.paginationConf.totalItems = data;
-                console.log(data)
-            })
+            // HttpService.getRecordsCount(getCountJson(), function (data) {
+            //     $scope.paginationConf.totalItems = data;
+            //     console.log(data)
+            // })
             HttpService.searchPostData(getJson(), function (data) {
                 $scope.postData = data;
                 console.log(data)
@@ -121,9 +124,38 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
         $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);
 
 
+        var getCountAndDownloadUrl = function (url) {
 
+            if (angular.isDefined($scope.applicantName)) {
+                url = url + 'sqrxm=' + $scope.applicantName + '&';
+            }
+            if (angular.isDefined($scope.orderNo)) {
+                url = url + 'ddh=' + $scope.orderNo + '&';
+            }
+            if (angular.isDefined($scope.number)) {
+                url = url + 'sequence=' + $scope.number + '&';
+            }
+            if ($("#print").val() == 1 || $("#print").val() == -1) {
+                url = url + 'hasPrinted=' + $("#print").val() + '&';
+            }
+            if (angular.isDefined($scope.gkxx)) {
+                url = url + 'gkxx=' + $scope.gkxx + '&';
+            }
+            if ($("#county").val() != null) {
+                for (var i = 0; i < $("#county").val().length; i++) {
+                    url = url + 'djx=' + ($("#county").val())[i] + '&';
+                }
+            }
+            if ($("#datepicker").val() == '') {
+                url = url + 'gmtCreat=' + $scope.choseDate + '&';
+            }
+            if ($("#datepicker").val() != '') {
+                url = url + 'gmtCreat=' + $("#datepicker").val() + '&';
+            }
+            return url + 't=' + Math.floor(Date.now());
+        }
         $scope.downloadExcel = function(){
-            var url = '../api/idCard/download?';
+            var url = '../personPostApi/download?';
             var a = document.createElement("a");
             document.body.appendChild(a);
             a.href = encodeURI(getCountAndDownloadUrl(url));