页面优化

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/InputInvoiceDataImportServiceImpl.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.enums.EnumTbImportType;
 import pwc.taxtech.atms.constant.enums.EnumValidationType;
@@ -67,12 +68,24 @@ public class InputInvoiceDataImportServiceImpl {
         invoices.stream().forEach(x -> {
             x.setHJJE(df.format(new BigDecimal(x.getHJJE())));
             x.setHJSE(df.format(new BigDecimal(x.getHJSE())));
+            x.setRZJG(convertRzjg(x.getRZJG()));
                 }
         );
         PageInfo<InputInvoice> pageInfo = new PageInfo<>(invoices);
         return pageInfo;
     }
 
+    private String convertRzjg(String rzjg){
+        if (StringUtils.isEmpty(rzjg)) return "";
+        switch (rzjg){
+            case "0":
+                return "认证成功";
+            case "1":
+                return "认证失败";
+            default:
+                return "未认证";
+        }
+    }
 
     public List<InputVATInvoiceDto> getInputInvoiceList(Integer period) {
 

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

@@ -572,16 +572,16 @@
                 enableColumnMenus: false,
                 columnDefs: [
                  { name: $translate.instant('ImportErrorPopUpNoCol'), width: '5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
-                 { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
+                 // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
                  { name: $translate.instant('InvoiceKPRQ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.kprq | date:"yyyy-MM-dd"}}<span></div>' },
                  { name: $translate.instant('InvoiceFPDM'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.fpdm}}</span></div>' },
                  { name: $translate.instant('InvoiceFPHM'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fphm}}</span></div>' },
-                 { name: $translate.instant('InvoiceGHFSH'), width: '12%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.xfsh}}</span></div>' },
-                 { name: $translate.instant('InvoiceFPLX'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">增值税专票</span></div>' },
-                 { name: $translate.instant('InvoiceJE'), headerCellClass: 'right', width: '8%', cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjje}}</span></div>' },
-                 { name: $translate.instant('InvoiceSE'), headerCellClass: 'right', width: '8%', cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjse}}</span></div>' },
-                 { name: $translate.instant('InvoiceRZRQ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzsj  | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('InvoiceRZJG'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certificationResult}}</span></div>' }
+                 { name: $translate.instant('InvoiceGHFSH'), width: '14%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.xfsh}}</span></div>' },
+                 { name: $translate.instant('InvoiceFPLX'), width: '9%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">增值税专票</span></div>' },
+                 { name: $translate.instant('InvoiceJE'), headerCellClass: 'right', width: '9%', cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjje}}</span></div>' },
+                 { name: $translate.instant('InvoiceSE'), headerCellClass: 'right', width: '9%', cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjse}}</span></div>' },
+                 { name: $translate.instant('InvoiceRZRQ'), width: '12.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzsj  | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('InvoiceRZJG'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' }
                 ],
                 onRegisterApi: function (gridApi) {
                                    $scope.gridApi = gridApi;

atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.html

 <div class="vat-preview-input-invoice" id="mainPreviewDiv">
-    <div class="top-area-wrapper">
+    <div class="top-area-wrapper" style="margin-top: 10px">
         <!--<button class="filter-button"
                 atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
                 popover-container="body" popover-auto-hide="true" data-overwrite="true"
@@ -8,10 +8,8 @@
                 data-templateurl="/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice-search.html">
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>-->
-        <div></div><div></div>
         <span translate="IncomeInvoiceTitle" 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: -33px; left: 160px;" id="input-invoice-period-picker" />
+        <input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 130px;" id="input-invoice-period-picker" />
         <span ng-click="downloadInputInvoice()" style="position: relative; top: -61px; 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-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -480,12 +480,12 @@
                 name: $translate.instant('ImportErrorPopUpNoCol'), width: '5%',
                 cellTemplate: '<div class="ui-grid-cell-contents" ><span>{{row.entity.index}}<span></div>'
             },
-              {
-                  name: $translate.instant('PeriodId'), width: '5%',
-                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.periodID}}"><span>{{row.entity.periodID}}<span></div>'
-              },
+              // {
+              //     name: $translate.instant('PeriodId'), width: '5%',
+              //     cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.periodID}}"><span>{{row.entity.periodID}}<span></div>'
+              // },
                {
-                   name: $translate.instant('InvoiceDate'), width: '10%',
+                   name: $translate.instant('InvoiceDate'), width: '10',
                    cellTemplate: '<div class="ui-grid-cell-contents" ><span>{{row.entity.kprq | date:"yyyy-MM-dd"}}</span></div>'
                },
                  {
@@ -501,11 +501,11 @@
                   cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.fphm}}"><span>{{row.entity.fphm}}</span></div>'
               },
               {
-                  name: $translate.instant('BuyerName'), width: '15%',
+                  name: $translate.instant('BuyerName'), width: '18%',
                   cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.gfmc}}"><span>{{row.entity.gfmc}}</span></div>'
               },
               {
-                  name: $translate.instant('BuyerTaxNumber'), width: '15%',
+                  name: $translate.instant('BuyerTaxNumber'), width: '17%',
                   cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.gfsh}}"><span>{{row.entity.gfsh}}</span></div>'
               },
               //{