#

atms-api/src/main/java/pwc/taxtech/atms/dto/TableRule.java

@@ -13,18 +13,21 @@ import java.util.Map;
 public class  TableRule {
     public  static  Map<String, String> map = new HashMap<String, String>();
     static {
-        map.put("EBSZCFZB", "balance_sheet");
-        map.put("EBSLRB", "profit_loss_statement");
+        map.put("EBSZCFZB", "balance_sheet_prc");
+        map.put("EBSLRB", "profit_loss_statement_prc");
         map.put("EBSXJLLB", "cash_flow");
 
-        map.put("RGDRZCFZB", "balance_sheet_manual");
-        map.put("RGDRLRB", "profit_loss_statement_manual");
+        map.put("RGDRZCFZB", "balance_sheet_prc_manual");
+        map.put("RGDRLRB", "profit_loss_statement_prc_manual");
         map.put("RGDRXJLLB", "cash_flow_manual");
-        map.put("HZXXB", "red_letter_info_table");
+
 
         map.put("ZXZCFZB", "balance_sheet_final");
         map.put("ZXLLB", "profit_loss_statement_final");
         map.put("ZXXJLLB", "cash_flow_final");
+
+        map.put("HZXXB", "red_letter_info_table");
+
         map.put("CITZCFZB", "cit_balance_sheet_prc_adjust");
         map.put("CITLRB", "cit_profit_prc_adjust");
         map.put("CIT_TBAM", "cit_tbam");

atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html

@@ -22,8 +22,8 @@
             </div>
         </div>
         <div class="col-sm-5" class="bar-export" style="  margin-top: 20px;width: 39%;    float: right;">
-            <span    ngf-select="upload($files)"  ngf-multiple="false"
-                  ngf-validate="{size: {min:'10KB', max:'20MB'}}"><i class="fa fa-file">&nbsp;{{'uploadProfileTable' | translate}}</i></span>
+            <span    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" ><i class="fa fa-file">&nbsp;{{'uploadProfileTable' | translate}}</i></span>
             <span ng-click="saveAndRefresh()"><i class="fa fa-refresh"></i>&nbsp;{{'saveAndRefresh' | translate}}</span>
             <span ng-click="singleExport()"><i
                     class="fa fa-upload"></i>&nbsp;{{'singleExport' | translate}}</span>
@@ -32,7 +32,6 @@
         </div>
     </div>
 
-    internationalDataImport
     <div class='report-container' id="reportContainer">
         <input type="file" id="fileDemo" style="display: none" class="input" ng-model = "relation.fileName">
         <table-report-sheet  report-source="reportData" spread='spread' template-id='templateId'