#

atms-web/src/main/webapp/app/analysis/table/sheet/table-report-sheet.js

@@ -193,6 +193,7 @@
                         sheet.clearSelection();
                     }
                     scope.spread = spread;
+                    scope.relation.sheet = spread.getActiveSheet();
                     setColWidth(sheet);
                     if(sheet.getRowCount() <= 38)
                         scope.relation.addEbitRow(sheet)

atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.ctrl.js

@@ -2939,7 +2939,7 @@
                  }
              }).error(function (error) {
              });*/
-            calculateEbitAndInsert($scope.sheet, true);
+            calculateEbitAndInsert($scope.relation.sheet, true);
             spreadTODb();
         }
 
@@ -2970,6 +2970,7 @@
                     success: function (data) {
                         //alert("上传成功！");
                         if (data.result) {
+                            SweetAlert.success("成功")
                         } else {
                             SweetAlert.error(data.resultMsg);
                         }
@@ -3074,6 +3075,7 @@
                     var workbookObj = json;
                     $scope.spread.fromJSON(workbookObj);
                     var sheet = $scope.spread.sheets[0];
+                    $scope.relation.sheet = $scope.spread.sheets[0];
                     /*vatReportService.saveAndRefresh($scope.relation.orgId, $scope.relation.period, 0, "1").success(function (res) {
                         if (res.resultMsg == "success") {
                             if (res.data) $scope.relation.data = res.data;