1、fix

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html

@@ -43,34 +43,25 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadAT(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadAT(importEnum.CoverImport)"></button>
-                    <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
-                        <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
-                                 permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
-                                 translate="ConverImportBtn" 
-                                 ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
-                                 <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" 
-                                         permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" 
-                                         translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
-                    </div>
                 </div>
             </div>
 

atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html

@@ -43,22 +43,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadBS(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadBS(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html

@@ -43,22 +43,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadCF(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadCF(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html

@@ -43,22 +43,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadCIL(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadCIL(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html

@@ -40,22 +40,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.html

@@ -17,22 +17,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.html

@@ -17,22 +17,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.html

@@ -40,22 +40,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.html

@@ -40,22 +40,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.html

@@ -40,22 +40,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -40,22 +40,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="importFile(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="importFile(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html

@@ -43,22 +43,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadCPR(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadCPR(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html

@@ -43,22 +43,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadID(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadID(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html

@@ -43,37 +43,25 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadIR(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadIR(importEnum.CoverImport)"></button>
-
-
-
-                    <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
-                        <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
-                                 permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
-                                 translate="ConverImportBtn" 
-                                 ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
-                                 <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" 
-                                         permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" 
-                                         translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
-                    </div>
                 </div>
             </div>
         </form>

atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html

@@ -43,22 +43,22 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadPL(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadPL(importEnum.CoverImport)"></button>

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html

@@ -43,37 +43,25 @@
                     <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
                     </div>
-                    <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
                         {{'SelectFile' | translate}}
                     </button>
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
                             ng-click="doUploadRLIT(importEnum.AddImport)"></button>
 
-                    <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                    <button type="button"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
                             ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
-
-
-
-                    <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
-                        <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
-                                 permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
-                                 translate="ConverImportBtn" 
-                                 ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
-                                 <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" 
-                                         permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" 
-                                         translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
-                    </div>
                 </div>
             </div>
         </form>