modify

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

@@ -364,31 +364,33 @@
                             },
                             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) {
-                                                   doStartCaculate2(true);
-                                               }else{
-                                                   doStartCaculate2(false);
-                                               }
-                                            });
-                                       }else{
-                                           doStartCaculate2(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 (isConfirm) {
+                                                        if (isConfirm) {
+                                                            doStartCaculate2(true);
+                                                        } else {
+                                                            doStartCaculate2(false);
+                                                        }
+                                                    });
+                                            }, 500);
+                                        } else {
+                                            doStartCaculate2(false);
+                                        }
                                     });
-                                 }
+                                }
                                 else {
                                     swal.close();
                                 }