查询重置问题

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

@@ -330,6 +330,7 @@
             assetListService.getAssetResultListPage($scope.citAssetsListDto).success(function (assetListData) {
                 debugger;
                 var data = assetListData.data.list;
+                $('.filter-button').popover("hide");
                 if (data) {
                     var index = 1;
                     // data.forEach(function (v) {
@@ -355,6 +356,7 @@
                 $scope.TotalCount = assetListData.data.total;
                 $scope.pagingOptions.totalItems = assetListData.data.total;
                 $scope.pageOptions.totalItems = assetListData.data.total;
+
             });
         }
 
@@ -1266,7 +1268,7 @@
 
         //开始
         (function initialize() {
-debugger;
+
             /**************************************** function start*************************************************/
             $scope.displayType = 2;
             $scope.saveGroupType = 1;

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.year + vatSessionService.month;
-        $scope.endMonth = vatSessionService.year + vatSessionService.month;
+        $scope.startMonth = vatSessionService.year + '' + vatSessionService.month;
+        $scope.endMonth = vatSessionService.year + '' + vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
         $scope.pageSize = constant.vatPagesize;
@@ -205,6 +205,7 @@
                 pageInfo: {},
                 periodStart: '',
                 periodEnd: '',
+                orgId: '',
                 segment3: null,
                 segment3Name: null,
                 segment5: null,
@@ -216,6 +217,7 @@
             };
             $scope.queryParams.periodStart = $scope.startMonth;
             $scope.queryParams.periodEnd = $scope.endMonth;
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
             loadJournalEntryDataFromDB(1);
             $('.filter-button').popover("hide");
         };

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 =vatExportService.year+vatSessionService.month;
-        $scope.endMonth = vatExportService.year+vatSessionService.month;
+        $scope.startMonth =vatSessionService.year+''+vatSessionService.month;
+        $scope.endMonth = vatSessionService.year+''+vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
         $scope.pageSize = constant.vatPagesize;
@@ -202,6 +202,7 @@
                 pageInfo: {},
                 periodStart: '',
                 periodEnd: '',
+                orgId:'',
                 segment3 : null,
                 segment3Name : null,
                 segment2 : null,
@@ -212,6 +213,7 @@
             };
             $scope.queryParams.periodStart = $scope.startMonth;
             $scope.queryParams.periodEnd = $scope.endMonth;
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
             loadTrialBalanceDataFromDB(1);
             $('.filter-button').popover("hide");
         };