Commit f182be29 authored by ken.q.you's avatar ken.q.you

fix box close bug---Ken

parent 01f0f00b
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
var year=now.getFullYear(); var year=now.getFullYear();
var vatMonth=vatSessionService.month; var vatMonth=vatSessionService.month;
if(vatSessionService.year==year){ if(vatSessionService.year==year){
if(vatMonth===month-1){ if(vatMonth===month||vatMonth===month-1){
return false; return false;
}else{ }else{
return true; return true;
...@@ -430,8 +430,8 @@ ...@@ -430,8 +430,8 @@
var startCaculate2 = function () { var startCaculate2 = function () {
if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) { if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
swal({ swal({
title: "warning!", title: "warning!",
text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}), text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
type: "warning", type: "warning",
...@@ -478,6 +478,7 @@ ...@@ -478,6 +478,7 @@
} }
else { else {
doStartCaculate2(false); doStartCaculate2(false);
swal.close();
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment