modify

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

@@ -291,8 +291,9 @@
                     },
                     function (isConfirm) {
                         if (isConfirm) {
-                            vatReportService.hasManualDataSource(vatSessionService.project.id,vatSessionService.month).then(function (hasManual) {
-                               if(hasManual){
+                            vatReportService.hasManualDataSource(vatSessionService.project.id, vatSessionService.month).then(function (hasManual) {
+                                if (hasManual) {
+                                    setTimeout(function () {
                                         swal({
                                                 title: "warning!",
                                                 text: "是否保留手工数据！",
@@ -304,24 +305,23 @@
                                                 closeOnConfirm: true,
                                                 closeOnCancel: true
                                             },
-                                   function (isConfirm) {
-                                       if (isConfirm) {
+                                            function (tmpConfirm) {
+                                                if (tmpConfirm) {
                                                     doStartCaculate(true);
-                                       }else{
+                                                } else {
                                                     doStartCaculate(false);
                                                 }
                                             });
-                               }else{
+                                    }, 500);
+                                } else {
                                     doStartCaculate(false);
                                 }
                             });
-                         }
-                        else {
+                        } else {
                             swal.close();
                         }
                     });
-            }
-            else {
+            } else {
                 doStartCaculate(false);
             }
         };