Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js

@@ -203,6 +203,18 @@
                 $scope.hasTaxReturnPermission = data[reportTemp.taxReturnCode];
                 $scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
                 $scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
+
+
+
+                // TODO 临时代码,待删除
+                $scope.hasBsPlPermission = true;
+                $scope.hasBsPermission = true;
+                $scope.hasPlPermission = true;
+                $scope.hasTaxReturnPermission = true;
+                $scope.hasQueryTaxReturnPermission = true;
+                $scope.hasEditTaxReturnPermission = true;
+
+
             });
         };
         var toggleGroup = function (group) {

atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js

@@ -595,7 +595,7 @@
                                 name: 'generateReport.reportView',
                                 state: 'generateReport.reportView',
                                 num: 4,
-                                permission: constant.vatPermission.reportView.reportViewCode,
+                                permission: constant.vatPermission.reportView.bsplCode,
                                 url: '#/vat/generateReport/reportView'
                             });
                         }