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

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

@@ -2,7 +2,7 @@
     提示
 </div>
 <div class="ui-dialog-content">
-    <div>确认删除{{startDate}}到{{endDate}}导入的{{total}}条记录吗？</div>
+    <div>确认删除<span ng-if="startDate">{{startDate}}到{{endDate}}导入的</span>{{total}}条记录吗？</div>
 </div>
 <div class="ui-dialog-confirm">
     <button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>

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

@@ -225,6 +225,7 @@ angular.module('AvatarCheck', [
 
         }
         $scope.addQuickCardProd = function(){
+            console.log($scope.searchResult.workOrderData[0].CARD_TYPE_ID)
             if($(".prod:checked").length>0){
                 var idx = $(".prod:checked").val();
                 var check = idx.split("+");

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

@@ -350,6 +350,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(oldPackageName)){
                     oldPackageName='';
                 }
+                console.log(oldPackageName,date)
                 $http({
                     method: 'GET',
                     url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
@@ -365,6 +366,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(oldPackageName)){
                     oldPackageName='';
                 }
+                console.log(oldPackageName,date,currentPage,itemsPerPage)
                 $http({
                     method: 'GET',
                     url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(),

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

@@ -34,7 +34,6 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
 
 
         $scope.getAnalyseLog = function(){
-            console.log($('#datepicker').val());
             HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
                 $scope.paginationConf.totalItems = data;
                 console.log($scope.paginationConf.totalItems)

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

@@ -99,37 +99,36 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
             if(angular.isUndefined(pcs_name)){
                 pcs_name='';
             }
-            if(startDate==''){
-                startDate=$filter("date")(new Date(), "yyyy-MM-dd");
-            }
-            if(endDate==''){
-                endDate=$filter("date")(new Date(), "yyyy-MM-dd");
-            }
-            ngDialog.open({
-                template: 'dialogs/confirmDeleteProdCards.html' + urlTimeStamp(),
-                width: 600,
-                cache: false,
-                closeByDocument:false,
-                controller: ['$scope', function ($scope) {
-                    $scope.startDate = startDate;
-                    $scope.endDate = endDate;
-                    HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){
-                        $scope.total=data;
-                        console.log($scope.total,"count")
-                    })
-                    $scope.confirmDelete = function () {
-                        HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) {
-                            if(data){
-                                MessageService.showAlert("删除成功");
-                                $scope.closeThisDialog();
-                                reGet();
-                            }else{
-                                MessageService.showAlert("删除失败")
-                            }
+            if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')) {
+                MessageService.showAlert("请选择起始日期和结束日期")
+            }else{
+                ngDialog.open({
+                    template: 'dialogs/confirmDeleteProdCards.html' + urlTimeStamp(),
+                    width: 600,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', function ($scope) {
+                        $scope.startDate = startDate;
+                        $scope.endDate = endDate;
+                        HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){
+                            $scope.total=data;
+                            console.log($scope.total,"count")
                         })
-                    };
+                        $scope.confirmDelete = function () {
+                            HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) {
+                                if(data){
+                                    MessageService.showAlert("删除成功");
+                                    $scope.closeThisDialog();
+                                    reGet();
+                                }else{
+                                    MessageService.showAlert("删除失败")
+                                }
+                            })
+                        };
+
+                    }]
+                });
+            }
 
-                }]
-            });
         }
     });
\ No newline at end of file