[DEV] fixed parameter for appravl skip

atms-api/src/main/java/pwc/taxtech/atms/dto/approval/ApprovalTask.java

@@ -3,7 +3,6 @@ package pwc.taxtech.atms.dto.approval;
 import lombok.Getter;
 import lombok.Setter;
 import org.activiti.engine.task.Task;
-import pwc.taxtech.atms.controller.ApprovalController;
 
 @Getter
 @Setter

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

@@ -2539,11 +2539,27 @@
         };
 
          $scope.commitApprove = function(){
+              SweetAlert.swal({
+                  title: "warning!",
+                  text: $translate.instant('报表提审后不能手工录入和重新生成！'),
+                  type: "warning",
+                  showCancelButton: true,
+                  confirmButtonColor: "#DD6B55",
+                  confirmButtonText: $translate.instant('Yes'),
+                  cancelButtonText: $translate.instant('No'),
+                  closeOnConfirm: true,
+                  closeOnCancel: true
+              },
+              function (isConfirm) {
+                  if (isConfirm) {
                      var approveParam={};
                      approveParam.projectId = vatSessionService.project.id;
                      approveParam.periodDate = vatSessionService.project.periodDate;
                      vatApproveService.commitNewApproval(approveParam);
                   }
+              });
+
+          }
 
          $scope.doApprove = function(){
               $("#ApprovalComment").modal('show');

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

@@ -14,7 +14,8 @@
                 isDocumentList: '=',
                 serviceType: '=',
                 initRow: '=?',
-                initCol: '=?'
+                initCol: '=?',
+                instanceId: '='
             },
             controller: 'VatReportViewController',
             link: function ($scope, $ele, $attr) {

atms-web/src/main/webapp/app/framework/app-approve/app-approve.ctrl.js

@@ -609,10 +609,10 @@
                 vatApproveService.getApprovalTemplateInfo(approvalInfo.templateIds.split(",")[0]).success(
                 function(template){
                     $state.go('vat.generateReport.reportView', {
-                            reportId: approvalInfo.reportIds.split(",")[0],
-                            templateId: template.id,
-                            templateName: template.name,
-                            templateCode: template.code
+                            id: approvalInfo.reportIds.split(",")[0],
+                            templateid: template.id,
+                            name: template.name,
+                            templatecode: template.code
                         });
                    });
                 });