fix box close bug---Ken

f182be29 · ken.q.you · 01f0f00b · f182be29
Commit f182be29 authored Apr 24, 2019 by ken.q.you
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

vat-caculate-data.ctrl.js ...vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js +2 -1

No files found.
--- a/atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
+++ b/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;
@@ -478,6 +478,7 @@
                    }
                    else {
                        doStartCaculate2(false);
+                        swal.close();
                    }
         };