[DEV] fixed allert for approval msg

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -1721,7 +1721,6 @@
                         }
                     });
             } else {
-
                 SweetAlert.warning($translate.instant('CompleteDeclarationStatusCheck'));
             }
         }
@@ -2541,14 +2540,7 @@
          $scope.commitApprove = function(){
               vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.month).success(function(result){
                   if(result&&result=='committed'){
-                      SweetAlert.swal({
-                          title: "warning!",
-                          text: $translate.instant('报表提审中'),
-                          type: "warning",
-                          showCancelButton: true,
-                          cancelButtonText: $translate.instant('No'),
-                          closeOnCancel: true
-                      });
+                      SweetAlert.error($translate.instant('报表提审中或审核通过'));
                   }else{
                         SweetAlert.swal({
                             title: "warning!",

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.html

@@ -6,6 +6,8 @@
                 class="fa fa-floppy-o"></i>&nbsp;{{'报表提审'}}</span>
         <span ng-if="!isBSPL" ng-click="doApprove();"><i
                 class="fa fa-floppy-o"></i>&nbsp;{{'报表审批'}}</span>
+        <span ng-if="!isBSPL" ng-click="saveReportCache();"><i
+                class="fa fa-floppy-o"></i>&nbsp;{{'Save' | translate}}</span>
     </div>
 
     <div class='report-container' id="reportContainer">

atms-web/src/main/webapp/app/common/vatservices/vatReportService.js

@@ -88,10 +88,14 @@
                     vatOperationLogService.addOperationLog(logInfo);
                     data.dataSourceType = enums.cellDataSourceType.KeyIn;
                     return $q.when(data);
-                }, function () {
-                    logInfo.UpdateState = $translate.instant('ManualInputFail');
-                    SweetAlert.error($translate.instant('PleaseContactAdministrator'));
-                    return vatOperationLogService.addOperationLog(logInfo);
+                },function (data) {
+                   if(data.status==412){
+                      SweetAlert.error($translate.instant('报表提审中或审核通过'));
+                   }else{
+                      logInfo.UpdateState = $translate.instant('ManualInputFail');
+                      SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+                      return vatOperationLogService.addOperationLog(logInfo);
+                   }
                 });
             },
             deleteCellVoucher: function (voucherId, datasourceId) {

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -295,14 +295,7 @@
                   }
                }).error(function (data,status,config,statusText) {
                   if(status==412){
-                     swal({
-                         title: "warning!",
-                         text: "报表提审中或审核通过",
-                         type: "warning",
-                         showCancelButton: true,
-                         cancelButtonText: $translate.instant('No'),
-                         closeOnCancel: true
-                     });
+                     SweetAlert.error('报表提审中或审核通过');
                   }
                });