Merge branch 'dev_wzk' into 'dev_mysql'

1、VAT数据预览导出模板优化；2、查看报表-手工输入的数值允许输入千分位格式数值；3、EBS抽取针对先走callback再走responsebug ；4、导入分发各个模板优化；5、CIT试算平衡表导入时页面的展示及提示 ；6、导入分发导入文件后取消文件名；7、数据日志记录分页

See merge request root/atms!360

atms-api/src/main/java/pwc/taxtech/atms/common/CommonConstants.java

@@ -32,6 +32,8 @@ public class CommonConstants {
 
     public static final Integer REGION_LEVELTYPE_CITY = 2;
 
+    public static final Integer REGION_LEVELTYPE_DISTRICT= 3;
+
     public static final Boolean ACTIVE_STATUS = true;
 
     public static final Boolean DEACTIVE_STATUS = false;

atms-api/src/main/java/pwc/taxtech/atms/controller/AreaRegionController.java

@@ -58,4 +58,12 @@ public class AreaRegionController {
         logger.info("/api/v1/areaRegion/getCities");
         return areaRegionService.getProvinces();
     }
+
+//    @ApiOperation(value = "Get Provinces")
+    @RequestMapping(value = "getDistricts", method = RequestMethod.GET)
+    public @ResponseBody
+    List<AreaRegionDto> getDistricts(@RequestParam(name = "parentID") String parentId) {
+        logger.info("/api/v1/areaRegion/getDistricts");
+        return areaRegionService.getDistricts(parentId);
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/dd/JournalEntryExportDto.java

@@ -219,6 +219,14 @@ public class JournalEntryExportDto {
 
     private Date updateTime;
 
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.id

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

@@ -246,6 +246,14 @@ public class AreaRegionServiceImpl {
 
     }
 
+    public List<AreaRegionDto> getDistricts(String parentId) {
+        List<AreaRegionDto> districts = getRegions(CommonConstants.REGION_LEVELTYPE_DISTRICT);
+        List<AreaRegionDto> query = districts.stream().filter(s -> s.getRegionParentId().equals(parentId))
+                .collect(Collectors.toList());
+        return query;
+
+    }
+
     private List<AreaRegionDto> getRegions(int levelType) {
         RegionExample regionExample = new RegionExample();
         regionExample.createCriteria().andIsActiveEqualTo(CommonConstants.ACTIVE_STATUS).andLevelTypeEqualTo(levelType);

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

@@ -804,8 +804,13 @@ public class CitImportExcelServiceImpl extends BaseService {
             citBSPrcAdjustMapper.deleteByExample(example);
             updateImportLog(EnumCitImportType.BalanceSheetPrcAdjust.getCode());
         }
-
-        int insertBatchNum = citBSPrcAdjustMapper.insertBatch(citBSPrcAdjustList);
+        saveResult.setResultMsg("导入成功");
+        int insertBatchNum = 0;
+        if(citBSPrcAdjustList != null && citBSPrcAdjustList.size()>0){
+            insertBatchNum = citBSPrcAdjustMapper.insertBatch(citBSPrcAdjustList);
+        }else{
+            saveResult.setResultMsg("导入失败");
+        }
         CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
                 EnumCitImportType.BalanceSheetPrcAdjust.getCode(), period,
                 companyName, "资产负债表(单家PRC)", true);
@@ -815,7 +820,6 @@ public class CitImportExcelServiceImpl extends BaseService {
         addDataImportLog(citDataImportLogList);
         saveResult.setResult(true);
         saveResult.setData(insertBatchNum);
-        saveResult.setResultMsg("导入成功");
         return saveResult;
     }
 

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

@@ -1766,11 +1766,8 @@ public class DataImportService extends BaseService {
             if (!"".equals(value)) {
                 rlit.setRedLetterInvoiceInfoTableNum(new BigDecimal(value.toString()).toPlainString());
             }
-            rlit.setPeriod(periodDate);
-            try{
-                rlit.setFillInDate(row.getCell(1).getDateCellValue());
-            }catch (Exception e){
-            }
+            rlit.setPeriod(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
+            rlit.setFillInDate(row.getCell(3).getDateCellValue());
             rlit.setSalesTaxNumber(getCellStringValue(row.getCell(4)));
             rlit.setSalespersonName(getCellStringValue(row.getCell(5)));
             rlit.setTotalAmount(getCellBigDecimalValue(row.getCell(6),evaluator));
@@ -2199,7 +2196,6 @@ public class DataImportService extends BaseService {
 
         DataImportLogExample example = new DataImportLogExample();
         DataImportLogExample.Criteria criteria = example.createCriteria();
-        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
         List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
         //财务数据抽取展示抽取记录除了admin能查看所有操作人员的操作，其余人员只能看到本身的
         String uid = authUserHelper.getCurrentUserId();
@@ -2210,6 +2206,7 @@ public class DataImportService extends BaseService {
             criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate).andOperatorEqualTo(authUserHelper.getCurrentAuditor().get());
         }
         example.setOrderByClause("update_time desc");
+        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
         PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream()
                 .map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList()));
         pageInfo.setTotal(page.getTotal());

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

@@ -810,6 +810,31 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     @Override
     public void changeCallBackStatus(EbsCallBackDto ebsCallBackDto) {
+        //当调用EBS接口失败之后，由于EBS调用callback和EBS返回response时间上几乎没有差异，
+        // 但callback的执行代码依赖于response返回后的插入代码，那就存在程序会先执行response还是先执行callback的问题，
+        // 在此做出判断先查一下数据库并给出查询次数限制防止一直查询数据库 create by zhikai.z.wei 20190505 17:08 start
+        //循环次数
+        int loopTimes = 0;
+        while(loopTimes < 3){
+            DataImportLog byPrimaryKey = dataImportLogMapper.selectByPrimaryKey(ebsCallBackDto.getTaskId());
+            if (byPrimaryKey == null){
+                try {
+                    logger.info(String.format("EBS Callback 未查询到抽取记录，沉睡2S taskId = [%s]",ebsCallBackDto.getTaskId()));
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    logger.error(String.format("EBS CallBack 线程沉睡异常 taskId = [%s]",ebsCallBackDto.getTaskId()));
+                }
+            } else {
+                break;
+            }
+            if(loopTimes==2){
+                logger.error(String.format("循环三次仍未查询到抽取记录 taskId = [%s]",ebsCallBackDto.getTaskId()));
+                break;
+            }
+            loopTimes++;
+        }
+        // 在此做出判断先查一下数据库并给出查询次数限制防止一直查询数据库 create by zhikai.z.wei 20190505 17:08 end
         DataImportLog dataImportLog = new DataImportLog();
         dataImportLog.setId(ebsCallBackDto.getTaskId());
         dataImportLog.setImportResult("S".equals(ebsCallBackDto.getTaskStatus())?true:false);

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -201,6 +201,7 @@
                 $scope.detail.inputValue = "0";
             }
 
+            $scope.detail.inputValue = $scope.detail.inputValue.replace(/[,]/g, "");
 
             if ($scope.detail.inputValue && ((isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))
                 || parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999)) {

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -612,6 +612,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.CityList = defaultData;
             $scope.ProvinceList = defaultData;
             $scope.selectProvince = defaultData;
+            $scope.selectCity = defaultData;
             $scope.selectRegionID = defaultData;
         };
 
@@ -694,9 +695,43 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 areaRegionService.getCities(regionID).success(function (data) {
                     if (data && data.length > 0) {
                         $scope.CityList = data;
+                        $scope.selectCity = _.find($scope.CityList, function (num) {
+                            return num.regionID === $scope.selectProvince.regionID || num.regionID === $scope.editOrgModel.parentRegionID;
+                        });
+
+                        if ($scope.selectCity) {
+                            $scope.selectCityID = $scope.selectCity.regionID;
+
+                            $scope.selectProvince = _.find($scope.ProvinceList, function (num) {
+                                return num.regionID === $scope.selectCity.parentRegionID;
+                            });
+
+                            loadDistrictList($scope.selectCity.regionID);
+
+                        }else{
+                            $scope.selectCityID = data[0].regionID;
+                        }
+
+                    } else {
+                        data = null;
+                        $scope.CityList = data;
+                        $scope.selectCity = data;
+                    }
 
-                        var target = _.find($scope.CityList, function (num) {
-                            return num.regionID === $scope.editOrgModel.regionID;
+                });
+            }
+        };
+
+        // 加载区县信息
+        var loadDistrictList = function (regionID) {
+
+            if (regionID !== undefined && regionID !== null) {
+                areaRegionService.getDistricts(regionID).success(function (data) {
+                    if (data && data.length > 0) {
+                        $scope.DistrictList = data;
+
+                        var target = _.find($scope.DistrictList, function (num) {
+                            return num.regionID === $scope.selectCity;
                         });
 
                         if (target) {
@@ -707,7 +742,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
 
                     } else {
                         data = null;
-                        $scope.CityList = data;
+                        $scope.DistrictList = data;
                         $scope.selectRegionID = null;
                     }
                 });
@@ -1184,6 +1219,12 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             loadCityList(regionID);
         };
 
+        // 市改变时联动区
+        $scope.populateDistricts = function () {
+            var regionID = $scope.selectCity && $scope.selectCity.regionID;
+            loadDistrictList(regionID);
+        };
+
         // 验证是否为时间段
         var validateDate = function (from, to) {
             var fromDate = new Date(from + '-01');

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -452,15 +452,27 @@
                                                 <div class="col-sm-5" style="padding-left: 10px;"
                                                     ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}">
                                                     <select class="form-control localRequired" name="selectCity"
-                                                        id="selectCity" style="width: 119px; "
+                                                            style="width: 120px; " ng-change="populateDistricts()"
+                                                            ng-model="selectCity"
+                                                            ng-options="x.regionName for x in CityList">
+                                                        <option value="">{{pleaseSelect}}</option>
+                                                    </select>
+                                                    <p ng-show="orgControlForm.selectCity.$error.required && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)"
+                                                        class="has-error label" style="margin-left: 30px">
+                                                        {{resources.OrganizationMsgCityRequired}}</p>
+                                                </div>
+                                                <div class="col-sm-5" style="padding-left: 10px;"
+                                                    ng-class="{'has-error':orgControlForm.selectDistrict.$invalid && (orgControlForm.selectDistrict.$dirty || orgControlForm.$submitted)}">
+                                                    <select class="form-control localRequired" name="selectDistrict"
+                                                        id="selectDistrict" style="width: 119px; "
                                                         ng-model="selectRegionID">
                                                         <option value="">{{pleaseSelect}}</option>
-                                                        <option ng-repeat="x in CityList" value="{{x.regionID}}"
+                                                        <option ng-repeat="x in DistrictList" value="{{x.regionID}}"
                                                             title="{{x.regionName}}">{{x.regionName |
                                                             limitString:10}}
                                                         </option>
                                                     </select>
-                                                    <p ng-show="orgControlForm.selectCity.$error.required && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)"
+                                                    <p ng-show="orgControlForm.selectDistrict.$error.required && (orgControlForm.selectDistrict.$dirty || orgControlForm.$submitted)"
                                                         class="has-error label" style="margin-left: 30px">
                                                         {{resources.OrganizationMsgCityRequired}}</p>
                                                 </div>

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js

@@ -767,6 +767,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js

@@ -741,6 +741,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js

@@ -744,6 +744,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js

@@ -186,6 +186,7 @@
             }).then(function(resp) {
                 var ret = resp.data;
                 $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js

@@ -169,6 +169,8 @@
                 withCredentials: true
             }).then(function (data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js

@@ -161,6 +161,8 @@
                 withCredentials: true
             }).then(function(data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js

@@ -160,6 +160,8 @@
                 withCredentials: true
             }).then(function(data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

@@ -173,7 +173,8 @@
                 withCredentials: true
             }).then(function(data) {
                 var resp = data.data;
-
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (resp.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

@@ -169,6 +169,8 @@
                 withCredentials: true
             }).then(function(data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

@@ -192,9 +192,9 @@
                 __RequestVerificationToken: token,
                 withCredentials: true
             }).then(function(data) {
-                    $scope.importExcelFile = null;
-                    $scope.fileName = null;
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -171,7 +171,8 @@
                 __RequestVerificationToken: token,
                 withCredentials: true
             }).then(function(data) {
-                    $scope.fileNameShow=false;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     var resp = data.data;
                     deferred.resolve();

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -42,7 +42,7 @@
                             <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                         </div>
                     </div>
-                    <div ng-show="fileNameShow" style="display:inline-block">
+                    <div ng-show="fileName" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <div class="form-group">

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js

@@ -209,6 +209,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js

@@ -166,6 +166,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js

@@ -192,7 +192,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
-
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js

@@ -195,6 +195,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js

@@ -194,6 +194,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -197,6 +197,7 @@
                 $scope.detail.inputValue = "0";
             }
 
+            $scope.detail.inputValue = $scope.detail.inputValue.replace(/[,]/g, "");
 
             if ($scope.detail.inputValue && ((isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))
                 || parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999)) {

atms-web/src/main/webapp/app/common/webservices/areaRegion.svc.js

@@ -15,6 +15,10 @@ function ($http, apiConfig, httpCacheService) {
             //return $http.get('/areaRegion/getCities?parentID=' + parentID, apiConfig.create());
             return httpCacheService.get('/areaRegion/getCities?parentID=' + parentID);
         },
+        getDistricts: function (parentID) {
+            //return $http.get('/areaRegion/getCities?parentID=' + parentID, apiConfig.create());
+            return httpCacheService.get('/areaRegion/getDistricts?parentID=' + parentID);
+        },
 
         update: function (model) {
             return $http.post('/areaRegion/update', model, apiConfig.create());

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js

@@ -154,7 +154,6 @@
                     width: 518,
                     visible: true
                 },
-                height: '99%',
                 headerFilter: {
                     visible: false,
                     texts: {

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.html

@@ -20,10 +20,10 @@
             <div id="importLogGridContainer" dx-data-grid="importLogGridOptions"
                  style="margin-top: 30px;">
             </div>
-            <!--<div class="page-footer">
+            <div class="page-footer">
                 <ack-pagination page-options="pagingOptions"
                                 refresh-table="refreshConfigGrid()"></ack-pagination>
-            </div>-->
+            </div>
         </div>
     </div>
 </div>

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.less

@@ -175,6 +175,7 @@
         }
 
         .dt-init-wrapper {
+            margin: 60px 0;
             max-width: 99%;
             height: calc(100% - 200px);
             position: relative;

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

@@ -280,27 +280,29 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('InvoiceNoCol'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
+                 { name: $translate.instant('InvoiceNoCol'),width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
                  // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('InvoiceCode'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}<span></div>' },
-                 { name: $translate.instant('InvoiceNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNum}}</span></div>' },
-                 { name: $translate.instant('BillingDate'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('SalesTaxNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salesTaxNum}}</span></div>' },
-                 { name: $translate.instant('SalesTaxName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salespersonName}}</span></div>' },
+                 { name: $translate.instant('InvoiceCode'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}<span></div>' },
+                 { name: $translate.instant('InvoiceNum'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNum}}</span></div>' },
+                 { name: $translate.instant('BillingDate'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('SalesTaxNum'), width: 300,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salesTaxNum}}</span></div>' },
+                 { name: $translate.instant('SalesTaxName'), width: 300,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salespersonName}}</span></div>' },
                  {
                      name: $translate.instant('Amount'),
+                     width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount | number:2}}</span></div>'
                  },
                  {
                      name: $translate.instant('TaxAmount'),
+                     width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.taxAmount | number:2}}</span></div>'
                  },
-                 { name: $translate.instant('VerificationMethod'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.verificationMethod}}</span></div>' },
-                 { name: $translate.instant('ConfirmDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certifiedDate | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('InvoiceType'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceType}}</span></div>' },
-                 { name: $translate.instant('InvoiceStatus'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' }
+                 { name: $translate.instant('VerificationMethod'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.verificationMethod}}</span></div>' },
+                 { name: $translate.instant('ConfirmDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certifiedDate | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('InvoiceType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceType}}</span></div>' },
+                 { name: $translate.instant('InvoiceStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' }
                  ]
             };
 

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

@@ -294,12 +294,12 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('VatInvoiceRecordNoCol'),width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
+                 { name: $translate.instant('VatInvoiceRecordNoCol'),width: 100,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
                  // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('BillingBody'),width: 200,   cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingBody }}<span></div>' },
+                 { name: $translate.instant('BillingBody'),width: 300,   cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingBody }}<span></div>' },
                  { name: $translate.instant('CustomerCompanyName'),width: 200,   cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.customerCompanyName}}</span></div>' },
                  { name: $translate.instant('InvoiceType'),width: 200,   cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.invoiceType}}</span></div>' },
-                 { name: $translate.instant('BillingContent'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.billingContent}}</span></div>' },
+                 { name: $translate.instant('BillingContent'), width: 300,  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.billingContent}}</span></div>' },
                  {
                      name: $translate.instant('InvoiceAmount'),
                      headerCellClass:'rightHeader',
@@ -312,13 +312,13 @@
                  {
                      name: $translate.instant('ContractAmount'),
                      headerCellClass:'rightHeader',
-                     width: 200,
+                     width: 160,
                      cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.contractAmount | number:2}}</span></div>'
                  },
-                 { name: $translate.instant('Department'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.department}}</span></div>' },
+                 { name: $translate.instant('Department'), width: 340, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.department}}</span></div>' },
                  { name: $translate.instant('ApplicationDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDate| date:"yyyy-MM-dd"}}</span></div>' },
                  { name: $translate.instant('BillingDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate| date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('BillingMonth'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingMonth| date:"MM"}}</span></div>' },
+                 { name: $translate.instant('BillingMonth'), width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingMonth| date:"MM"}}</span></div>' },
                  { name: $translate.instant('invoiceCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
                  { name: $translate.instant('InvoiceNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNum}}</span></div>' },
                  { name: $translate.instant('InvoicePaperNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoicesAmount}}</span></div>' },

atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.ctrl.js

@@ -294,27 +294,36 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('SubjectNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectNum}}<span></div>' },
+                 { name: $translate.instant('SubjectNum'), width: 150,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectNum}}<span></div>' },
                  // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('SubjectName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectName}}<span></div>' },
-                 { name: $translate.instant('RedLetterInvoiceInfoTableNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.redLetterInvoiceInfoTableNum}}</span></div>' },
-                 { name: $translate.instant('FillInDate'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fillInDate | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('RedLetterInfoSalesTaxNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.salesTaxNumber}}</span></div>' },
-                 { name: $translate.instant('SalespersonName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.salespersonName}}</span></div>' },
+                 {
+                     name: $translate.instant('SubjectName'),
+                     width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectName}}<span></div>'
+                },
+                 { name: $translate.instant('RedLetterInvoiceInfoTableNum'),  width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.redLetterInvoiceInfoTableNum}}</span></div>' },
+                 { name: $translate.instant('FillInDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fillInDate | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('RedLetterInfoSalesTaxNum'),  width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.salesTaxNumber}}</span></div>' },
+                 { name: $translate.instant('SalespersonName'),  width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.salespersonName}}</span></div>' },
                  {
                      name: $translate.instant('RedLetterInfoTotalAmount'),
+                     width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalAmount | number:2}}</span></div>'
                  },
                  {
-                     name: $translate.instant('RedLetterInfoTotalTaxAmount'),
+                     name: $translate.instant('RedLetterInfoTotalTaxAmount'),width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalTaxAmount | number:2}}</span></div>'
                  },
-                 { name: $translate.instant('ApplicationSelectionDescription'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDescription}}</span></div>' },
-                 { name: $translate.instant('ApplicantsManager'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicantManager }}</span></div>' },
-                 { name: $translate.instant('InvoiceCode'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
-                 { name: $translate.instant('RedLetterInfoInvoiceNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNumber}}</span></div>' }
+                 { name: $translate.instant('ApplicationSelectionDescription'),width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDescription}}</span></div>' },
+                 { name: $translate.instant('ApplicantsManager'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicantManager }}</span></div>' },
+                 { name: $translate.instant('InvoiceCode'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
+                 { name: $translate.instant('RedLetterInfoInvoiceNum'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNumber}}</span></div>' }
                  ]
             };