#

atms-api/src/main/java/pwc/taxtech/atms/dto/previewData/CitEAMAssetsDisposalDto.java

@@ -2,8 +2,9 @@ package pwc.taxtech.atms.dto.previewData;
 
 import com.github.pagehelper.PageInfo;
 import pwc.taxtech.atms.dto.input.CamelPagingDto;
+import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
 
-public class CitEAMAssetsDisposalDto {
+public class CitEAMAssetsDisposalDto extends CitEAMAssetsDisposal {
     private CamelPagingDto pageInfo;
 
     public CamelPagingDto getPageInfo() {

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

@@ -7,6 +7,27 @@
         'use strict';
         $scope.listData = [];
 
+        var minDate = [1, vatSessionService.project.year];
+        // var minDate = moment().startOf('month').subtract(0, 'months');
+        var maxDate = [12, vatSessionService.project.year];
+        var setDate = [
+            [vatSessionService.month, vatSessionService.project.year],
+            [vatSessionService.month, vatSessionService.project.year]];
+
+        $scope.monthList = [$translate.instant('Month01'),
+            $translate.instant('Month02'),
+            $translate.instant('Month03'),
+            $translate.instant('Month04'),
+            $translate.instant('Month05'),
+            $translate.instant('Month06'),
+            $translate.instant('Month07'),
+            $translate.instant('Month08'),
+            $translate.instant('Month09'),
+            $translate.instant('Month10'),
+            $translate.instant('Month11'),
+            $translate.instant('Month12')
+        ];
+
  /*       $scope.formOptions = {
             formData: salaryData,
             colCount: 2,
@@ -114,7 +135,7 @@
         var initListData = function(){
             citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams).success(function (res) {
                 $scope.listData = commonWebService._index(res.list);
-                $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                $scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
                 //$scope.$apply();
             }).error(function (error) {
                 swal({
@@ -131,7 +152,7 @@
                 .success(function (res) {
                     if (res && res.list) {
                         $scope.listData =commonWebService._index(res.list);
-                        $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                        $scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
                     }else {
                         SweetAlert.error($translate.instant('SystemError'));
                     }
@@ -163,11 +184,7 @@
             };
             initAssetResultDxGrid();
             initListData();
-            if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
-                $('.periodInput')[0].style.left = "280px";
-            }else{
-                $('.periodInput')[0].style.left = "150px";
-            }
+
         })();
     }
 ]);
\ No newline at end of file

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

@@ -9,7 +9,7 @@
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;    width: 200px;" id="input-invoice-period-picker" />
         <span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
  <!--   <div class="widget-container">