bug:19213\纳税申报表排序\preview 优化

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

 {
-	"WelcomeATMS":"欢迎使用ATMS系统管理"
+	"WelcomeATMS-Longi":"欢迎使用Longi申报系统管理"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/admin/homePage/admin-home-page.ctrl.js

@@ -48,6 +48,7 @@ adminHomePageModule
                                             return sub.isVisible;
                                         });
                                     }
+                                    row.isActive = false;
                                 }
                             }
                         });
@@ -120,17 +121,17 @@ adminHomePageModule
 
             $scope.menuMouseOver = function (x) {
 
-                if (x.isOpen) {
-                    return;
-                }
+                // if (x.isActive) {
+                //     return;
+                // }
 
                 if ($scope.menuData && $scope.menuData.length > 0) {
                     for (var i = 0; i < $scope.menuData.length; i++) {
                         var row = $scope.menuData[i];
-                        if (x.id === row.id) {
-                            row.isOpen = true;
+                        if (x.ID === row.ID) {
+                            row.isActive = true;
                         } else {
-                            row.isOpen = false;
+                            row.isActive = false;
                         }
                     }
                 }
@@ -229,7 +230,8 @@ adminHomePageModule
             (function initialize() {
                 $scope.open = false;
                 getMenusByServiceTypeId('1');
-
+                $scope.active = false;
+                $scope.isActive = false;
                 //var glyph_opts = {
                 //    map: {
                 //        doc: "glyphicon glyphicon-file",

atms-web/src/main/webapp/app/admin/homePage/admin-home-page.html

 <div class="admin-home-page">
     <div class="center-title" ng-mouseover="open=true" ng-mouseleave="open = false">
-        <span><h1 translate="WelcomeATMS"></h1></span>
+        <span><h1 translate="WelcomeATMS-Longi"></h1></span>
         <div ng-if="hasAdminPermission" class="import-title" ng-show="open"><a ng-click="showUploadModal()" href="#adminHomePage">{{'ImportBasicDataOneTime' |translate}}</a></div>
     </div>
     
@@ -16,7 +16,7 @@
                 <a href="{{x.navigationUrl}}"><b>{{x.name}}</b></a>
             </div>
             <!-- popover-trigger="mouseenter click" -->
-            <div ng-if="x.subMenus && x.subMenus.length > 0" class="{{x.firstMenuClass}}" uib-popover-template="x.templateUrl" popover-is-open="x.isOpen" popover-placement="{{x.popoverPlacement}}"  ng-mouseover="menuMouseOver(x)">
+            <div ng-if="x.subMenus && x.subMenus.length > 0" class="{{x.firstMenuClass}}" uib-popover-template="x.templateUrl" popover-is-open="x.isActive" popover-placement="{{x.popoverPlacement}}"  ng-mouseover="menuMouseOver(x)">
                 <img class="img" ng-src="{{x.imageUrl}}" alt="{{x.name}}" />
                 <br />
                 <b>{{x.name}}</b>

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

@@ -569,17 +569,17 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('ImportErrorPopUpNoCol'), width: '7%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
-                 { name: $translate.instant('InvoiceQJ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
+                 { 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('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: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{grid.appScope.typeToString(row.entity.fplx)}}</span></div>' },
-                 { name: $translate.instant('InvoiceJE'), headerCellClass: 'right', width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjje}}</span></div>' },
-                 { name: $translate.instant('InvoiceSE'), headerCellClass: 'right', width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjse}}</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: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certificationResult}}</span></div>' }
+                 { name: $translate.instant('InvoiceRZJG'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certificationResult}}</span></div>' }
                 ],
                 onRegisterApi: function (gridApi) {
                                    $scope.gridApi = gridApi;
@@ -595,10 +595,10 @@
                                                enableColumnMenus: false,
                                                columnDefs: [
                                                // { name: $translate.instant('ImportErrorPopUpNoCol'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
-                                               { name: $translate.instant('InvoiceHWMC'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.spmc}}">{{row.entity.spmc}}<span></div>' },
-                                               { name: $translate.instant('InvoiceJE'), headerCellClass:'right', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.je}}<span></div>' },
-                                               { name: $translate.instant('InvoiceSL'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.slv}}%<span></div>' },
-                                               { name: $translate.instant('InvoiceSE'), headerCellClass:'right', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.se}}<span></div>' }
+                                               { name: $translate.instant('InvoiceHWMC'), headerCellClass:'right', width: '20%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right" title="{{row.entity.spmc}}">{{row.entity.spmc}}<span></div>' },
+                                               { name: $translate.instant('InvoiceJE'), headerCellClass:'right', width: '13%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.je}}<span></div>' },
+                                               { name: $translate.instant('InvoiceSL'), headerCellClass:'right', width: '13%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.slv}}%<span></div>' },
+                                               { name: $translate.instant('InvoiceSE'), headerCellClass:'right', width: '13%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.se}}<span></div>' }
                                                ]
                                            };
 

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">
-        <button class="filter-button"
+        <!--<button class="filter-button"
                 atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
                 popover-container="body" popover-auto-hide="true" data-overwrite="true"
                 use-optimized-placement-algorithm="true"
                 data-placement="bottom"
                 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>
+        </button>-->
         
         <span translate="IncomeInvoiceTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
 

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

 <div class="vat-preview-output-invoice" id="mainPreviewDiv">
     <div class="top-area-wrapper">
-        <button class="filter-button"
+        <!--<button class="filter-button"
                 atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
                 popover-container="body" popover-auto-hide="true" data-overwrite="true"
                 use-optimized-placement-algorithm="true"
                 data-placement="bottom"
                 data-templateurl="/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice-search.html">
             <i class="fa fa-filter" aria-hidden="true"></i>
-        </button>
+        </button>-->
         <span translate="OutputInvoiceTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：       
         <input type="text" class="form-control input-width-middle" id="output-invoice-period-picker" />
          

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

@@ -47,20 +47,20 @@
                             name: 'TaxReturn',
                             children: _.chain(result[1].data.data)
                                 .sortBy(function(x){
-                                    return x.templateName;
+                                    return x.templateCode;
                                 })
-                                .map(function(x){
+                                /*.map(function(x){
                                     var nameIndex;
                                     var tempName = x.templateName.substr(x.templateName.length - 4);
-                                    if(tempName.search("一") != -1){
+                                    if(tempName.search("附表一") != -1){
                                         nameIndex = 0;
-                                    } else if(tempName.search("二") != -1){
+                                    } else if(tempName.search("附表二") != -1){
                                         nameIndex = 1;
-                                    } else if(tempName.search("三") != -1){
+                                    } else if(tempName.search("附表三") != -1){
                                         nameIndex = 2;
-                                    } else if(tempName.search("四") != -1){
+                                    } else if(tempName.search("附表四") != -1){
                                         nameIndex = 3;
-                                    } else if(tempName.search("五") != -1){
+                                    } else if(tempName.search("附表五") != -1){
                                         nameIndex = 4;
                                     } else {
                                         nameIndex = 10;
@@ -75,7 +75,7 @@
                                 })
                                 .sortBy(function(x){
                                     return x.nameIndex;
-                                })
+                                })*/
                                 .map(function (x) {
                                 return {
                                     reportId: x.id,