Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -381,7 +381,7 @@
             var year=now.getFullYear();
             var vatMonth=vatSessionService.month;
             if(vatSessionService.year==year){
-                if(vatMonth===month-1){
+                if(vatMonth===month||vatMonth===month-1){
                     return false;
                 }else{
                     return true;
@@ -406,7 +406,7 @@
                     allowOutsideClick: false,
                     confirmButtonText: $translate.instant('Yes'),
                     cancelButtonText: $translate.instant('No'),
-                    closeOnConfirm: true,
+                    closeOnConfirm: false,
                     closeOnCancel: true
                 },
                 function (isConfirm) {
@@ -430,8 +430,8 @@
 
          var startCaculate2 = function () {
             
-                    if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
-                        swal({
+                if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
+                    swal({
                                 title: "warning!",
                                 text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
                                 type: "warning",
@@ -478,6 +478,7 @@
                     }
                     else {
                         doStartCaculate2(false);
+                        swal.close();
                     }
          };