[Bugfix] fixed some flow for import munual data

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -33,6 +33,7 @@
         var webHost = apiTokenObj.api_host;
         var chunkSize = 100000;
         var resumable = true;
+        var hasManualLoad = false;
         // File: Voucher Upload Declarations ENDED:
         //***************************************************************************************
 
@@ -1486,7 +1487,7 @@
         };
 
         //单元格详细信息点击确定时执行
-        $scope.Confirm = function () {
+        $scope.confirm = function () {
             $scope.handInputModel.name = $scope.taxCellDetail.inputMemo;
             $scope.handInputModel.amount = $scope.taxCellDetail.inputValue;
             $scope.handInputModel.description = $scope.taxCellDetail.inputMemo;
@@ -2696,23 +2697,33 @@
         };
 
         $scope.loadMyExcel = function(){
-          $scope.manualSpread = new GC.Spread.Sheets.Workbook(document.getElementById("ss"),{sheetCount: 1});
-          var excelIo = new GC.Spread.Excel.IO();
-          var excelFile = $scope.file;
-           excelIo.open(excelFile, function(json) {
-               var workbookObj = json;
-               $scope.manualSpread.fromJSON(workbookObj);
-           }, function(e) {
-               alert(e.errorMessage);
-               if (e.errorCode === 2 /*noPassword*/ || e.errorCode === 3 /*invalidPassword*/ ) {
-                   document.getElementById('password').onselect = null;
+          if($scope.file){
+              if($scope.hasManualLoad){
+                 SweetAlert.warning("已载入文件，如需重新载入请先清空！");
+              }else{
+                  $scope.manualSpread = new GC.Spread.Sheets.Workbook(document.getElementById("ss"),{sheetCount: 1});
+                  var excelIo = new GC.Spread.Excel.IO();
+                  var excelFile = $scope.file;
+                   excelIo.open(excelFile, function(json) {
+                       var workbookObj = json;
+                       $scope.manualSpread.fromJSON(workbookObj);
+                   }, function(e) {
+                       alert(e.errorMessage);
+                       if (e.errorCode === 2 /*noPassword*/ || e.errorCode === 3 /*invalidPassword*/ ) {
+                           document.getElementById('password').onselect = null;
+                       }
+                   }, {
+
+                   });
+                   $scope.hasManualLoad = true;
                }
-           }, {
-
-           });
+           }else{
+              SweetAlert.warning("请先选择文件！");
+           }
         };
 
         $scope.multiWrite = function(){
+            if($scope.hasManualLoad){
             var manualSheet = $scope.manualSpread.getActiveSheet();
             var currentSheet = $scope.spread.getActiveSheet()
             currentSheet.options.isProtected=false;
@@ -2748,6 +2759,9 @@
                       }
                   }
             }
+            }else{
+               SweetAlert.warning("文件未载入！");
+            }
         };
 
 
@@ -2783,9 +2797,15 @@
         $scope.cleanManual = function(){
             $scope.manualSpread = new GC.Spread.Sheets.Workbook(document.getElementById("ss"),{sheetCount: 1});
             $('#ss').html('');
+            $scope.hasManualLoad = false;
             $scope.file = null;
         };
 
+        $scope.closeManualModal = function () {
+            $scope.cleanManual();
+            $scope.modalInstance.dismiss('cancel');
+        };
+
 
         /****************************************证据文件function Ended*************************************************/
         /****************************************证据文件function Ended*************************************************/

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.html

@@ -194,7 +194,7 @@
         <div class="modal-dialog" style="width:850px;height:500px" role="document" >
             <div class="modal-content">
                 <div class="modal-header">
-                    <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="closeModal()">×</span>
+                    <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="closeManualModal()">×</span>
                     <span>批量录入手工数据</span>
                 </div>