修改bug

src/main/resources/static/js/app.js

@@ -244,7 +244,6 @@ angular.module('AvatarCheck', [
 
         $scope.logout = function(){
             HttpService.logout(function(data) {
-                $location.path('/login')
                 $rootScope.loginData = {userid:'用户未登录', login:false};
                 localStorage.clear();
             });
@@ -288,6 +287,8 @@ angular.module('AvatarCheck', [
             if($(".prod:checked").length>0){
                 if(angular.isUndefined($scope.searchResult.workOrderData[0].CARD_TYPE_ID)){
                     MessageService.showAlert("无制证类型记录，请创建任务单后再添加快证")
+                }else if($scope.searchResult.workOrderData[0].POSITION_DATE!=null){
+                    MessageService.showAlert("该证件正在分拣，不能添加快证")
                 }else{
                     var idx = $(".prod:checked").val();
                     var check = idx.split("+");

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

@@ -62,12 +62,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             $scope.isHistory = 0;
             var startDate=$('#datepicker1').val();
             var endDate=$('#datepicker2').val();
-            if(startDate==''){
-                startDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
-            if(endDate==''){
-                endDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
             HttpService.getReceitp(startDate,endDate,function(data){
                 $scope.receitpData=data;
                 for(var i=0;i<$scope.receitpData.length;i++){
@@ -86,12 +80,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             $scope.isHistory = 1;
             var startDate=$('#datepicker1').val();
             var endDate=$('#datepicker2').val();
-            if(startDate==''){
-                startDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
-            if(endDate==''){
-                endDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
             HttpService.getHistoryReceitp(startDate,endDate,function(data){
                 $scope.receitpHistoryData=data;
                 for(var i=0;i<$scope.receitpHistoryData.length;i++){

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

@@ -9,11 +9,25 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         });
     }])
 
-    .controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
+    .controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog,$location) {
 
+        var getPoliceListDataNotChecked = function () {
+            HttpService.getPoliceListDataNotCheckedData(function(data){
+                $scope.tagPrintData = data;
+                for(var i=0;i<$scope.tagPrintData.length;i++){
+                    $scope.tagPrintData[i].show = false;
+                }
+                console.log($scope.tagPrintData)
+            })
+        };
 
-        $scope.acceptNo = 'ACCEPT_NO';
+        if($rootScope.loginData.login === false){
+            $location.path("/login");
+        }else{
+            getPoliceListDataNotChecked();
+        }
 
+        $scope.acceptNo = 'ACCEPT_NO';
 
         var postParam={
             idCard:'',
@@ -65,16 +79,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             getDetailListById(item.ID);
         };
 
-        var getPoliceListDataNotChecked = function () {
-            HttpService.getPoliceListDataNotCheckedData(function(data){
-                $scope.tagPrintData = data;
-                for(var i=0;i<$scope.tagPrintData.length;i++){
-                    $scope.tagPrintData[i].show = false;
-                }
-                console.log($scope.tagPrintData)
-            })
-        };
-        getPoliceListDataNotChecked();
+
 
         $scope.checkSame = function (id) {
             HttpService.updateReceiptList(id,function(data) {