modify

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

@@ -291,37 +291,37 @@
                     },
                     function (isConfirm) {
                         if (isConfirm) {
-                            vatReportService.hasManualDataSource(vatSessionService.project.id,vatSessionService.month).then(function (hasManual) {
-                               if(hasManual){
-                                   swal({
-                                       title: "warning!",
-                                       text: "是否保留手工数据！",
-                                       type: "warning",
-                                       showCancelButton: true,
-                                       confirmButtonColor: "#DD6B55",
-                                       confirmButtonText: $translate.instant('Yes'),
-                                       cancelButtonText: $translate.instant('No'),
-                                       closeOnConfirm: true,
-                                       closeOnCancel: true
-                                   },
-                                   function (isConfirm) {
-                                       if (isConfirm) {
-                                           doStartCaculate(true);
-                                       }else{
-                                           doStartCaculate(false);
-                                       }
-                                    });
-                               }else{
-                                   doStartCaculate(false);
-                               }
+                            vatReportService.hasManualDataSource(vatSessionService.project.id, vatSessionService.month).then(function (hasManual) {
+                                if (hasManual) {
+                                    setTimeout(function () {
+                                        swal({
+                                                title: "warning!",
+                                                text: "是否保留手工数据！",
+                                                type: "warning",
+                                                showCancelButton: true,
+                                                confirmButtonColor: "#DD6B55",
+                                                confirmButtonText: $translate.instant('Yes'),
+                                                cancelButtonText: $translate.instant('No'),
+                                                closeOnConfirm: true,
+                                                closeOnCancel: true
+                                            },
+                                            function (tmpConfirm) {
+                                                if (tmpConfirm) {
+                                                    doStartCaculate(true);
+                                                } else {
+                                                    doStartCaculate(false);
+                                                }
+                                            });
+                                    }, 500);
+                                } else {
+                                    doStartCaculate(false);
+                                }
                             });
-                         }
-                        else {
+                        } else {
                             swal.close();
                         }
-                 });
-            }
-            else {
+                    });
+            } else {
                 doStartCaculate(false);
             }
         };