1、fixbug

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/excelheader/InvoiceDataHeader.java

+package pwc.taxtech.atms.dto.vatdto.excelheader;
+
+public class InvoiceDataHeader {
+
+    private String taxPayerNumber;
+
+    private Integer period;
+
+    public String getTaxPayerNumber() {
+        return taxPayerNumber;
+    }
+
+    public void setTaxPayerNumber(String taxPayerNumber) {
+        this.taxPayerNumber = taxPayerNumber;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+}

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less

@@ -169,7 +169,7 @@
         .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 80px');
+            height: calc(100% - 200px);
             position: relative;
             z-index: 1;
 

atms-web/src/main/webapp/app/cit/import/cit-old-import-asset-list/cit-old-import-asset-list.less

@@ -188,7 +188,7 @@
         .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 50px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/cit/import/vat-import-custom-invoice/vat-import-custom-invoice.less

@@ -214,7 +214,7 @@
          .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 60px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/cit/import/vat-invoice-mapping/vat-invoice-mapping.less

@@ -187,7 +187,7 @@
          .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 60px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/cit/import/vat-voucher-mapping/vat-voucher-mapping.less

@@ -186,7 +186,7 @@
          .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 60px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -945,6 +945,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             // $('.international').removeAttr('hidden');
             $scope.isLocal = false;
             $scope.isInternational = true;
+            $('.localRequired').removeAttr("required");
         };
 
         $scope.changeLocal = function () {
@@ -952,7 +953,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             // $('.local').removeAttr('hidden');
             $scope.isLocal = true;
             $scope.isInternational = false;
-            $('.localRequired').attr("required");
+            $('.localRequired').attr("required","true");
         };
 
         // 强制刷新机构控件里的机构
@@ -981,6 +982,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.regStatusList = constant.RegStatusList;
             $scope.architectureTypeList = constant.ArchitectureTypeList;
             $scope.trueFalse = constant.trueFalse;
+            $('.localRequired').attr("required","true");
         };
 
         // 省改变时联动市

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -575,7 +575,6 @@
                 </div>
 
                 <div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
-
                     <button type="submit" class="btn btn-primary" ng-click="saveOrg()">
                         {{'Confirm' | translate}}
                     </button>

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

@@ -177,7 +177,7 @@
         .dt-init-wrapper {
             margin: 60px 0;
             max-width: 99%;
-            height: calc(~'100% - 25px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/common/controls/import/import-journal-entry/import-journal-entry.less

@@ -151,7 +151,7 @@
         .dt-init-wrapper {
             margin: 40px 0;
             max-width: 99%;
-            height: calc(~'100% - 25px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

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

@@ -177,7 +177,7 @@
         .dt-init-wrapper {
             margin: 60px 0;
             max-width: 99%;
-            height: calc(~'100% - 25px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/common/controls/import/import-trialbalance/import-trialbalance.less

@@ -152,7 +152,7 @@
         .dt-init-wrapper {
             margin: 60px 0;
             max-width: 99%;
-            height: calc(~'100% - 25px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html

 <div id="app-data-import" class="app-data-import ">
     <nav class="navbar navbar-custom" role="navigation"
-         style="margin-bottom: 0; border-radius: 0px; background-image:url(../../../app-resources/images/leftbarbg.png); height:auto;width: 260px">
-        <div class="sidebar navbarfix" role="navigation">
+         style="margin-bottom: 0; border-radius: 0px; background-image:url(../../../app-resources/images/leftbarbg.png); height: 100%;width: 260px">
+        <div class="sidebar navbarfix" role="navigation" style="height: 100%;">
             <div class="sidebar-nav navbar-collapse" id="sidebar-area" style="height:100%;width: 260px">
                 <div class="app-data-import-side-bar" style="height: 100%">
                     <perfect-scrollbar class="scroller"
                                        wheel-propagation="true"
                                        wheel-speed="1"
                                        min-scrollbar-length="20"
-                                       style="position: relative;height: calc(100% - 250px)!important;margin-top:15px;">
+                                       style="position: relative;height: calc(100% - 50px)!important;margin-top:15px;">
                         <ul class="nav" id="sidebar">
                             <li ng-repeat="menuItem in menuData" ng-include="'menuTree'">
                             </li>

atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.less

@@ -19,7 +19,7 @@
 }
 
 .app-data-import-side-bar {
-    padding: 10px 0px 0px;
+    //padding: 10px 0px 0px;
     /* margin: auto; */
     height: 100%;
 

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

@@ -1176,8 +1176,6 @@
 
             getOrgData: function () {
 
-                debugger;
-
                 var data = vatSessionService.orgTree;
 
                 if (!data) {

atms-web/src/main/webapp/app/vat/import/product-item-import/product-item-import.less

@@ -151,7 +151,7 @@
         .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 25px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/vat/import/vat-import-custom-invoice/vat-import-custom-invoice.less

@@ -214,7 +214,7 @@
          .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 60px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/vat/import/vat-import-income-invoice/vat-import-income-invoice.less

@@ -188,7 +188,7 @@
         .dt-init-wrapper {
             margin: 45px 0;
             max-width: 99%;
-            height: calc(~'100% - 50px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/vat/import/vat-import-output-invoice/vat-import-output-invoice.less

@@ -158,7 +158,7 @@
         .dt-init-wrapper {
             margin: 45px 0;
             max-width: 99%;
-            height: calc(~'100% - 70px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/vat/import/vat-invoice-mapping/vat-invoice-mapping.less

@@ -191,7 +191,7 @@
          .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 60px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/vat/import/vat-voucher-mapping/vat-voucher-mapping.less

@@ -190,7 +190,7 @@
          .dt-init-wrapper {
             margin: 10px 0;
             max-width: 99%;
-            height: calc(~'100% - 60px');
+            height: calc(100% - 200px);
             position: relative;
 
             .dropdown {

atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.ctrl.js

@@ -114,7 +114,6 @@
 
         //计算页数，创建分页栏
         var computeCertifiedInvoicesListPage = function () {
-            debugger;
             if ($scope.queryCertifiedInvoicesListResult.pageInfo && $scope.queryCertifiedInvoicesListResult.pageInfo.total > 0) {
 
                 var totalPage = parseInt($scope.queryCertifiedInvoicesListResult.pageInfo.total / $scope.queryCertifiedInvoicesListResult.pageInfo.pageSize);