1、css fix

atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json

@@ -1884,6 +1884,11 @@
 
     "DataProcessLog": "Data Process Log",
     "DataProcessLogTitle": "Data Process Log",
+    "ValidateContent": "Validate Content",
+    "ValidateResult": "Validate Result",
+    "ResultMsg": "Result Message",
+    "Operater": "Operater",
+    "OperateTime": "Operate Time",
 
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -2207,5 +2207,12 @@
     "BillDtlColNumber": "发票号码",
     "BillDtlColRevenueType": "收入类型",
     "BillDtlUpdateSuccess": "更新成功",
+
+    "ValidateContent": "校验内容",
+    "ValidateResult": "校验结果",
+    "ResultMsg": "校验信息",
+    "Operater": "操作员",
+    "OperateTime": "操作时间",
+
     "~MustBeEndOneApp": "我必须是最后一个！"
 }

atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.ctrl.js

@@ -66,42 +66,47 @@
                     dataField: "taxpayerIdNum",
                     width: '15%',
                     allowHeaderFiltering: false,
-                    caption: $translate.instant('TaxpayerIdNum')
+                    caption: $translate.instant('CompanyCode')
                 }, {
                     dataField: "companyCode",
                     allowHeaderFiltering: false,
-                    caption: $translate.instant('CompanyCode'),
+                    caption: $translate.instant('CompanyName'),
                     width: '15%'
                 }, {
                     dataField: "companyName",
                     allowHeaderFiltering: false,
-                    width: '27%',
-                    caption: $translate.instant('CompanyName')
+                    width: '10%',
+                    caption: $translate.instant('YearPeriod')
                 }, {
                     dataField: "periodYear",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
                     dataField: "periodMonth",
                     allowHeaderFiltering: false,
-                    width: '10%',
-                    caption: $translate.instant('TMSPeriod')
+                    width: '15%',
+                    caption: $translate.instant('ValidateContent')
                 }, {
                     dataField: "periodMonth",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('ValidateResult')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
-                    width: '8%',
-                    caption: $translate.instant('RecordSize')
+                    width: '15%',
+                    caption: $translate.instant('ResultMsg')
+                }, {
+                    dataField: "errorMsg",
+                    allowHeaderFiltering: false,
+                    width: '10%',
+                    caption: $translate.instant('Operater')
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
                     width: '15%',
-                    caption: $translate.instant('Status')
+                    caption: $translate.instant('OperateTime')
                 }
                 ],
                 onContentReady: function (e) {

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

@@ -30,15 +30,15 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
 //                },
             {
                 name: 'inputInvoice', permission: constant.vatPermission.dataPreview.inputInvoice.queryCode,
-                text: $translate.instant('inputInvoice'), icon: 'fa fa-file-text-o', show: true
+                text: $translate.instant('inputInvoice'), icon: 'fa fa-file-text-o', show: false
             },
             {
                 name: 'outputInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
-                text: $translate.instant('outputInvoice'), icon: 'fa fa-file-text-o', show: true
+                text: $translate.instant('outputInvoice'), icon: 'fa fa-file-text-o', show: false
             },
              {
                 name: 'outputoffInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
-                text: $translate.instant('offlineBilling'), icon: 'fa fa-file-text-o', show: true
+                text: $translate.instant('offlineBilling'), icon: 'fa fa-file-text-o', show: false
             },
              {
                 name: 'trialBalance', permission: constant.vatPermission.dataPreview.trialBalance.queryCode,

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.ctrl.js

-vatModule.controller('VatPreviewCashFlowController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService','$filter',
-    function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService,$filter) {
+vatModule.controller('VatPreviewCashFlowController', ['$rootScope','$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService','$filter',
+    function ($rootScope,$scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService,$filter) {
         'use strict';
 
         $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
@@ -252,6 +252,11 @@
             $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
             $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
             $scope.queryParams.orgId = vatSessionService.project.organizationID;
+            if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
+                $('.periodInput')[0].style.left = "240px";
+            }else{
+                $('.periodInput')[0].style.left = "140px";
+            }
             loadIncomeInvoiceItemDataFromDB(1);
 
         })();

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.html

 <div class="vat-preview-cash-flow" id="mainPreviewDiv">
     <div class="top-area-wrapper" style="margin-top: 10px">
         <span translate="CashFlowDDTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 130px;" id="input-invoice-period-picker" />
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 130px;" id="input-invoice-period-picker" />
         <span ng-click="downloadCashFlow()" style="position: relative; top: -13px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 

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

@@ -303,9 +303,9 @@
             initCertifiedInvoicesListPagination();
             //初始化查询条件-期间范围
             if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
-                $('.periodInput')[0].style.left = "280px";
+                $('.periodInput')[0].style.left = "310px";
             }else{
-                $('.periodInput')[0].style.left = "170px";
+                $('.periodInput')[0].style.left = "200px";
             }
             $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
             $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;

atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-data/vat-preview-invoice-data.ctrl.js

@@ -320,7 +320,7 @@
             if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
                 $('.periodInput')[0].style.left = "250px";
             }else{
-                $('.periodInput')[0].style.left = "150px";
+                $('.periodInput')[0].style.left = "130px";
             }
             loadInvoiceDataItemDataFromDB(1);
 

atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js

@@ -333,7 +333,7 @@
             $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
             $scope.queryParams.orgId = vatSessionService.project.organizationID;
             if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
-                $('.periodInput')[0].style.left = "280px";
+                $('.periodInput')[0].style.left = "260px";
             }else{
                 $('.periodInput')[0].style.left = "150px";
             }

atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.ctrl.js

@@ -317,9 +317,9 @@
             initRedLetterInfoTabItemPagination();
             //初始化查询条件-期间范围
             if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
-                $('.periodInput')[0].style.left = "280px";
+                $('.periodInput')[0].style.left = "350px";
             }else{
-                $('.periodInput')[0].style.left = "170px";
+                $('.periodInput')[0].style.left = "150px";
             }
             $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
             $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;