Merge remote-tracking branch 'origin/dev_mysql' into uat_didi

atms-orangeheap/src/components/Panel.vue

 <template>
-    <v-container>
+    <v-container >
         <v-navigation-drawer
                 v-model="drawerRight"
                 fixed
@@ -16,7 +16,7 @@
             <!--                        <v-list-tile-title>Ope Temporary Drawer</v-list-tile-title>-->
             <!--                    </v-list-tile-content>-->
             <!--                </v-list-tile>-->
-            <v-list subheader>
+            <v-list subheader >
                 <v-subheader>列表</v-subheader>
                 <v-list-tile
                         v-for="item in items"
@@ -24,19 +24,19 @@
                         @click="switchTable(item)"
                         avatar
                 >
-                    <v-list-tile-action>
+                    <v-list-tile-action >
                         <svg class="icon" aria-hidden="true">
                             <use :xlink:href="item.iconName"></use>
                         </svg>
                     </v-list-tile-action>
 
-                    <v-list-tile-content>
+                    <v-list-tile-content  >
                         <v-list-tile-title v-html="item.title"></v-list-tile-title>
                     </v-list-tile-content>
 
                     <v-list-tile-action>
                         <v-icon v-show="item.active"
-                                color="green"
+                                color="#333333"
                         >check
                         </v-icon>
                     </v-list-tile-action>
@@ -48,18 +48,20 @@
                 fixed
                 app
                 clipped-right
+                height="90"
+                color="#ffffff"
         >
-            <!--                        <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>-->
-            <v-toolbar-title>仪表盘</v-toolbar-title>
-            <v-spacer></v-spacer>
+            <!--<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+            <v-toolbar-title></v-toolbar-title>
+            <v-spacer ></v-spacer>-->
 
             <span class="body-2"
-                  @click.stop="drawerRight = !drawerRight"
+                  @click.stop="drawerRight = !drawerRight" style="vertical-align: middle; margin-right: 5px; width:100%"
             >
-                <svg class="icon" aria-hidden="true" style="vertical-align: middle; margin-right: 5px"><use
+                <svg class="icon" aria-hidden="true" ><use
                         :xlink:href="selectedItem.iconName"></use></svg>
-                <span style="vertical-align: middle; margin-right: 2px" v-text="selectedItem.title"></span>
-                <v-icon style="vertical-align: middle">menu</v-icon>
+                <span style="vertical-align: middle; margin-left: 10px; font-size:27px" v-text="selectedItem.title"></span>
+                <v-icon style="vertical-align: middle;margin-top:5px;float:right;height:28px;width:28px;color:#333333;">menu</v-icon>
             </span>
 
             <!--            <v-btn  large-->
@@ -242,4 +244,8 @@
 
 <style scoped>
 
+    .head {
+        height: 90px;
+        background-color: red;
+    }
 </style>
\ No newline at end of file

atms-orangeheap/src/views/ChartApp.vue

@@ -11,7 +11,8 @@
                     style=" overflow: hidden;
                         position: fixed;
                         bottom: 0;
-                        width: 100%;"
+                        width: 100%;
+                        border-top:1px solid #dddddd;"
 
             >
                 <v-btn
@@ -21,8 +22,8 @@
                         depressed
                         :to="{name: 'panel'}"
                 >
-                    <span>仪表盘</span>
-                    <v-icon>table_chart</v-icon>
+                    <span style="font-size:20px ; color:#999999">仪表盘</span>
+                    <v-icon color="#dddddd">table_chart</v-icon>
                 </v-btn>
 
                 <v-btn
@@ -32,8 +33,8 @@
                         depressed
                         :to="{name: 'mine'}"
                 >
-                    <span>我的</span>
-                    <v-icon>account_box</v-icon>
+                    <span style="font-size:20px ;color:#999999 " > 我的</span>
+                    <v-icon color="#dddddd" >account_box</v-icon>
 
                 </v-btn>
             </v-bottom-nav>
@@ -49,10 +50,39 @@
             }
         },
 
-        components: {}
+        components: {
+
+        }
+       /* ,
+        mounted :function() {
+            var color = 'rgb(221, 221, 221)';
+            var targetColor = "red";
+            setTimeout(function(){
+                document.getElementsByClassName('v-btn__content')[3].addEventListener('click', function(e){
+                    if(e.target.style.color != targetColor){
+                        e.target.style.color = targetColor;
+                        document.getElementsByClassName('v-btn__content')[3].getElementsByTagName('i')[0].style.color = targetColor;
+                    }else{
+                        e.target.style.color = color;
+                        document.getElementsByClassName('v-btn__content')[3].getElementsByTagName('i')[0].style.color = color;
+                    }
+                });
+                document.getElementsByClassName('v-btn__content')[4].addEventListener('click', function(e){
+                    if(e.target.style.color != targetColor){
+                        e.target.style.color = targetColor;
+                        document.getElementsByClassName('v-btn_content')[4].getElementsByTagName('i')[0].style.color = targetColor;
+                    }else{
+                        e.target.style.color = color;
+                        document.getElementsByClassName('v-btn__content')[4].getElementsByTagName('i')[0].style.color = color;
+                    }
+                })
+            }, 500);
+        }*/
     }
 </script>
 
 <style scoped>
-
+ .color_active{
+     color:red!important;
+ }
 </style>
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js

@@ -112,7 +112,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表.xlsx', true);
+                vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表', true);
             }).error(function (error) {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js

@@ -153,7 +153,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '日记账信息.xlsx',true);
+                vatExportService.exportToExcel(data, status, headers, '日记账信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js

@@ -114,7 +114,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '预提重分类数据源.xlsx', true);
+                vatExportService.exportToExcel(data, status, headers, '预提重分类数据源', true);
             }).error(function (error) {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js

@@ -140,7 +140,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '试算平衡表信息.xlsx',true);
+                vatExportService.exportToExcel(data, status, headers, '试算平衡表信息',true);
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js

@@ -144,7 +144,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '试算平衡表+Mapping信息.xlsx',true);
+                vatExportService.exportToExcel(data, status, headers, '试算平衡表+Mapping信息',true);
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/preview/vat-preview-customInvoice-sheet/vat-preview-customInvoice-sheet.ctrl.js

@@ -85,7 +85,7 @@
                 criteria = "";
 
             vatImportService.getExportCustomInvoiceList(criteria).success(function (data, status, headers) {
-                vatExportService.exportToExcel(data, status, headers, 'CustomInvoice.xlsx');
+                vatExportService.exportToExcel(data, status, headers, '海关发票信息');
             });
         };
         //************ EXCEL EXPORT FUNCTION ***************/

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

@@ -512,7 +512,7 @@
         //导出进项发票数据
         var downloadInputInvoice = function () {
             vatPreviewService.getExportInputInvoiceList($scope.queryParams).success(function (data, status, headers) {
-                vatExportService.exportToExcel(data, status, headers, '进项发票信息.xlsx');
+                vatExportService.exportToExcel(data, status, headers, '进项发票信息');
             });
         };
 

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

@@ -445,7 +445,7 @@
         var doExport = function ()
         { 
             vatPreviewService.getExportOutputInvoiceList($scope.queryParams).success(function (data, status, headers) {
-                vatExportService.exportToExcel(data, status, headers, '销项发票信息.xlsx');
+                vatExportService.exportToExcel(data, status, headers, '销项发票信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js

@@ -161,7 +161,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, 'CIT.WP01901_固定资产.xlsx');
+                vatExportService.exportToExcel(data, status, headers, 'CIT.WP01901_固定资产');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js

@@ -172,7 +172,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, 'A202000.xlsx');
+                vatExportService.exportToExcel(data, status, headers, 'A202000');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/common/vatservices/vatExportService.js

-webservices.factory('vatExportService', ['$log', '$http', 'apiConfig', '$q', function ($log, $http, apiConfig, $q) {
+webservices.factory('vatExportService', ['$log', '$http', 'apiConfig', '$q','vatSessionService', function ($log, $http, apiConfig, $q ,vatSessionService) {
     'use strict';
     $log.debug('vatExportService.ctor()...');
 
     //下载服务器上的xls文件
     var exportToExcel = function (data, status, headers, defaultFileName, noExtendFileName) {
-
         $('#busy-indicator-container').show();
 
         var defer = $q.defer();
@@ -16,10 +15,10 @@
 
         // Get the filename from the x-filename header or default to "download.bin"
         var filename = null;
-        if(noExtendFileName){
-            filename = defaultFileName
-        }else{
-            filename = decodeURI(headers['x-file-name']) + defaultFileName
+        if (noExtendFileName) {
+            filename = defaultFileName+ "_" +vatSessionService.project.name+'.xls'
+        } else {
+            filename = defaultFileName+"_"+decodeURI(headers['x-file-name']+ "_" +vatSessionService.project.name+'.xls')
         }
 
 
@@ -29,7 +28,7 @@
         try {
             // Try using msSaveBlob if supported
             //console.log("Trying saveBlob method ...");
-            var blob = new Blob([data], { type: contentType });
+            var blob = new Blob([data], {type: contentType});
             if (navigator.msSaveBlob)
                 navigator.msSaveBlob(blob, filename);
             else {
@@ -56,7 +55,7 @@
                     try {
                         // Prepare a blob URL
                         //console.log("Trying download link method with simulated click ...");
-                        var blobdownload = new Blob([data], { type: contentType });
+                        var blobdownload = new Blob([data], {type: contentType});
                         var urldownload = urlCreator.createObjectURL(blobdownload);
                         link.setAttribute('href', urldownload);
 
@@ -83,7 +82,7 @@
                         // Prepare a blob URL
                         // Use application/octet-stream when using window.location to force download
                         //console.log("Trying download link method with window.location ...");
-                        var blobsuccess = new Blob([data], { type: octetStreamMime });
+                        var blobsuccess = new Blob([data], {type: octetStreamMime});
                         var urlsuccess = urlCreator.createObjectURL(blobsuccess);
                         window.location = urlsuccess;
                         //console.log("Download link method with window.location succeeded");
@@ -118,7 +117,7 @@
     return {
         exportToExcel: exportToExcel,
         exportReport: function (jsonData) {
-            return $http.post('/Report/export', { ReportData: jsonData }, apiConfig.createVat());
+            return $http.post('/Report/export', {ReportData: jsonData}, apiConfig.createVat());
         }
     }
 }]);
\ No newline at end of file

atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js

-webservices.factory('vatPreviewService', ['$http', 'apiConfig','FileSaver', function ($http, apiConfig,FileSaver) {
+webservices.factory('vatPreviewService', ['$http', 'apiConfig','FileSaver', 'vatSessionService',function ($http, apiConfig,FileSaver,vatSessionService) {
     'use strict';
     return {
         sample: function () {
@@ -195,7 +195,7 @@
             thisConfig.responseType = "arraybuffer";
             return $http.post('/dataPreview/exportCFData/get', queryParm, thisConfig).then(function (response) {
                 var data = new Blob([response.data], {type: response.headers('Content-Type')});
-                FileSaver.saveAs(data, fileName + '.xlsx');
+                FileSaver.saveAs(data,fileName + '_'+vatSessionService.year+queryParm.periodStart+'-'+vatSessionService.year+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         },
         getPLDataForDisplay: function (queryParams) {
@@ -224,7 +224,7 @@
             thisConfig.responseType = "arraybuffer";
             return $http.post('/dataPreview/exportIRData/get', queryParm, thisConfig).then(function (response) {
                 var data = new Blob([response.data], {type: response.headers('Content-Type')});
-                FileSaver.saveAs(data, fileName + '.xlsx');
+                FileSaver.saveAs(data,fileName + '_'+vatSessionService.year+queryParm.periodStart+'-'+vatSessionService.year+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         },
         getCPRDataForDisplay: function (queryParams) {
@@ -235,7 +235,7 @@
             thisConfig.responseType = "arraybuffer";
             return $http.post('/dataPreview/exportCPRData/get', queryParm, thisConfig).then(function (response) {
                 var data = new Blob([response.data], {type: response.headers('Content-Type')});
-                FileSaver.saveAs(data, fileName + '.xlsx');
+                FileSaver.saveAs(data,fileName + '_'+vatSessionService.year+queryParm.periodStart+'-'+vatSessionService.year+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         },
         getRLITDataForDisplay: function (queryParams) {
@@ -246,7 +246,7 @@
             thisConfig.responseType = "arraybuffer";
             return $http.post('/dataPreview/exportRLITData/get', queryParm, thisConfig).then(function (response) {
                 var data = new Blob([response.data], {type: response.headers('Content-Type')});
-                FileSaver.saveAs(data, fileName + '.xlsx');
+                FileSaver.saveAs(data,fileName + '_'+vatSessionService.year+queryParm.periodStart+'-'+vatSessionService.year+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         },
         getCILDataForDisplay: function (queryParams) {
@@ -257,7 +257,7 @@
             thisConfig.responseType = "arraybuffer";
             return $http.post('/dataPreview/exportCILData/get', queryParm, thisConfig).then(function (response) {
                 var data = new Blob([response.data], {type: response.headers('Content-Type')});
-                FileSaver.saveAs(data, fileName + '.xlsx');
+                FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         },
         getIDDataForDisplay: function (queryParams) {
@@ -268,7 +268,7 @@
             thisConfig.responseType = "arraybuffer";
             return $http.post('/dataPreview/exportIDData/get', queryParm, thisConfig).then(function (response) {
                 var data = new Blob([response.data], {type: response.headers('Content-Type')});
-                FileSaver.saveAs(data, fileName + '.xlsx');
+                FileSaver.saveAs(data,fileName + '_'+vatSessionService.year+queryParm.periodStart+'-'+vatSessionService.year+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         }
     };

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.ctrl.js

@@ -541,7 +541,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '进项发票信息');
             });
         };
 

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

@@ -193,10 +193,10 @@
             })
         };
 
-        //导出进项发票数据
+        //导出现金流量信息
         $scope.downloadCashFlow = function () {
             var localDate=$filter('date')(new  Date(), 'yyyyMMddHHmmss');
-            var fileName="cash_flow_"+localDate;
+            var fileName="现金流量信息";
             vatPreviewService.initExportCFData($scope.queryParams,fileName).then(function (data) {
                 if (data) {
                     ackMessageBox.success(translate('FileExportSuccess'));

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

@@ -234,7 +234,7 @@
 
         var downloadCertifiedInvoicesList = function () {
             var localDate=$filter('date')(new  Date(), 'yyyyMMddHHmmss');
-            var fileName= constant.exportExcelFileName.certifiedInvoicesList + localDate;
+            var fileName= '已认证发票清单'; //constant.exportExcelFileName.invoicesRecord
             vatPreviewService.initExportCILData($scope.queryParams,fileName).then(function (data) {
                 if (data) {
                     ackMessageBox.success(translate('FileExportSuccess'));

atms-web/src/main/webapp/app/vat/preview/vat-preview-customInvoice-sheet/vat-preview-customInvoice-sheet.ctrl.js

@@ -86,7 +86,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, 'CustomInvoice.xlsx');
+                vatExportService.exportToExcel(data, status, headers, '海关发票信息');
             });
         };
         //************ EXCEL EXPORT FUNCTION ***************/

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

@@ -541,7 +541,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '进项发票信息');
             });
         };
 

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

@@ -540,7 +540,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '进项发票信息');
             });
         };
 

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

@@ -278,7 +278,7 @@
 
             var downloadIR = function () {
                 var localDate = $filter('date')(new Date(), 'yyyyMMddHHmmss');
-                var fileName = constant.exportExcelFileName.invoicesRecord + localDate;
+                var fileName = '已开增值发票记录' ; //constant.exportExcelFileName.invoicesRecord+ localDate
                 vatPreviewService.initExportIRData($scope.queryParams, fileName).then(function (data) {
                     if (data) {
                         ackMessageBox.success(translate('FileExportSuccess'));

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

@@ -5,8 +5,8 @@
         $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
         $scope.endDate = new Date(vatSessionService.project.year, 11, 31);
         $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
-        $scope.startMonth = vatSessionService.month;
-        $scope.endMonth = vatSessionService.month;
+        $scope.startMonth =  vatSessionService.year+vatSessionService.month;
+        $scope.endMonth = vatSessionService.year+vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
         $scope.pageSize = constant.vatPagesize;
@@ -264,7 +264,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '日记账信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '日记账信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js

@@ -494,7 +494,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '资产负债表信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '资产负债表信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

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

@@ -476,7 +476,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '销项发票信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '销项发票信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

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

@@ -476,7 +476,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '销项发票信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '销项发票信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.ctrl.js

@@ -512,7 +512,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '利润表信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '利润表信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/app/vat/preview/vat-preview-quarterly-owners-equity-change-tab/vat-preview-quarterly-owners-equity-change-tab.ctrl.js

@@ -541,7 +541,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '进项发票信息');
             });
         };
 

atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js

@@ -5,8 +5,8 @@
         $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
         $scope.endDate = new Date(vatSessionService.project.year, 11, 31);
         $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
-        $scope.startMonth = vatSessionService.month;
-        $scope.endMonth = vatSessionService.month;
+        $scope.startMonth =vatExportService.year+vatSessionService.month;
+        $scope.endMonth = vatExportService.year+vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
         $scope.pageSize = constant.vatPagesize;
@@ -261,7 +261,7 @@
                     SweetAlert.warning("没有数据可以下载");
                     return;
                 }
-                vatExportService.exportToExcel(data, status, headers, '科目余额表信息.xls');
+                vatExportService.exportToExcel(data, status, headers, '科目余额表信息');
             }).error(function () {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });

atms-web/src/main/webapp/orangeweb/css/app.8f5ac7e7.css

+.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-0817fb63]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}.color_active{color:red!important}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/css/app.cf16809e.css

-.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/index.html

@@ -49,4 +49,4 @@
         //send 发送
         xmlhttp.send();
 
-      }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.e819e3a1.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.e819e3a1.js></script></body></html>
+      }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.8f5ac7e7.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.cf3691a6.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.8f5ac7e7.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.cf3691a6.js></script></body></html>
\ No newline at end of file