Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

bug 19878

See merge request root/atms!182

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

@@ -160,7 +160,7 @@
                 //销项数据源
                 case enums.formulaDataSourceType.OutputInvoice:
                     obj.period = sourceData.period;
-                    obj.date = sourceData.invoiceDate ? (new Date(sourceData.invoiceDate)).dateTimeToString('yyyyMMdd') : "
+                    obj.date = sourceData.invoiceDate ? (new Date(sourceData.invoiceDate)).dateTimeToString('yyyyMMdd') : "";
                     obj.acquiringEnterprise = sourceData.buyerName;
                     obj.invoiceCode = sourceData.invoiceCode;
                     obj.invoiceNumber = sourceData.invoiceNumber;
@@ -1120,6 +1120,10 @@
                             if (report && report.result && report.data) {
                                 $scope.reportId = report.data.id;
                                 getReportData();
+                            } else if(!(report.result && report.data)){
+                                $scope.reportData = [];
+                                $scope.formulaBlocks = [];
+                                $scope.manualDataSources = [];
                             }
                         });
                     }

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

@@ -278,8 +278,10 @@
         }
 
        function doStartCaculate2(isMergeManualDataSource) {
+
              vatReportService.generateAll(vatSessionService.project.id, isMergeManualDataSource, vatSessionService.month, vatSessionService.logUser.id ? vatSessionService.logUser.id : "").success(function (data) {
-                if(data && data.result)
+                 $scope.readonly = true;
+                 if(data && data.result)
                    updateTasksStatus(data.data);
                    if(data.data.status=='Begin'){
                      $scope.timer= $interval(function(){