[DEV] open cacal report when appoval agree

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -481,7 +481,7 @@ public class ReportServiceImpl {
         MyAsserts.assertEq(serviceType, EnumServiceType.VAT, new NotFoundException());
         MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId,periodParam), Exceptions.TASK_HAS_BEGINNING);
         String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam);
-        MyAsserts.assertTrue(status == null || status.equals(Constant.APPROVAL_DISAGREED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
+        MyAsserts.assertTrue(status == null || !status.equals(Constant.APPROVAL_COMMITTED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
 
         try {
             if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) {

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

@@ -299,7 +299,7 @@
                   }
                }).error(function (data,status,config,statusText) {
                   if(status==412){
-                     SweetAlert.error('报表提审中或审核已通过！');
+                     SweetAlert.error('报表提审中！');
                   }else if(status == 409){
                      SweetAlert.error('报表已在处理中！');
                   }