fixbug

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

@@ -36,7 +36,7 @@
                     allowHeaderFiltering: true
                 },
                 {
-                    dataField: 'reportFileName',
+                    dataField: 'reportName',
                     caption: $translate.instant('RepUploadDtlColFileName'),
                     fixed: true,
                     allowHeaderFiltering: true

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

@@ -911,7 +911,7 @@
         $scope.openExportPop = function (evenType) {
             $scope.evenType = evenType;
             var grp = _.find($scope.$parent.$parent.groups, function (g) {
-                return g.name == 'TaxReturn';
+                return g.name == 'TaxReturnType';
             });
 
             if (!grp || !grp.children) {
@@ -954,7 +954,7 @@
         //批量导出EXCEL
         $scope.export = function () {
             var grp = _.find($scope.$parent.$parent.groups, function (g) {
-                return g.name == 'TaxReturn';
+                return g.name == 'TaxReturnType';
             });
 
             if (!grp || !grp.children) {
@@ -1088,10 +1088,10 @@
                             },
                             withCredentials: true
                         }).then(function (resp) {
-                            alert("上传保存成功");
+                            SweetAlert.success('', $translate.instant('FileUploadSuccess'));
                             $('#busy-indicator-container').hide();
                         }, function (resp) {
-                            alert("上传保存失败");
+                            SweetAlert.error('', $translate.instant('FileUploadFailed'));
                             $('#busy-indicator-container').hide();
                         }, function (evt) {