Merge branch 'dev_wzk' into 'dev_mysql'

1、导入分发细致划分；2、各个预览页面重置按钮不刷新数据；3、VAT科目余额查询条件bug修改；4、CIT预提查询条件bug；5、VAT日记账数据预览改变Grid防止水平滚轮滚动导致一些列会出现短暂空白	 1、导入分发页面条件框对齐；2、日记账预览去掉多余的列；3、财务数据抽取列的宽度；4、机构展示基本信息时展示出公司代码；5、VAT日记账预览导出去掉多余列 另导入分发细致划分功能需要更改数据库数据，不改变结构

See merge request root/atms!368

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

@@ -20,12 +20,32 @@ public class TrialBalanceParam {
 
     private String segment3Name;
 
+    private String segment5;
+
+    private String segment5Name;
+
     private String segment6;
 
     private String segment6Name;
 
     private Boolean containsAdjustmentTable;
 
+    public String getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5;
+    }
+
+    public String getSegment5Name() {
+        return segment5Name;
+    }
+
+    public void setSegment5Name(String segment5Name) {
+        this.segment5Name = segment5Name;
+    }
+
     public Integer getPeriodStart() {
         return periodStart;
     }

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

@@ -44,175 +44,175 @@ public class JournalEntryExportDto {
     @ExcelCell(index=8)
     private String lineNum;
 
-    @ExcelCell(index=9)
-    private String approvalStatus;
-
-    @ExcelCell(index=10)
-    private String postedStatus;
+//    @ExcelCell(index=9)
+//    private String approvalStatus;
+//
+//    @ExcelCell(index=10)
+//    private String postedStatus;
 
-    @ExcelCell(index=11)
+    @ExcelCell(index=9)
     private Integer period;
 
-    @ExcelCell(index=12)
+    @ExcelCell(index=10)
     private Date accountingDate;
 
-    @ExcelCell(index=13)
-    private String journalSource;
+//    @ExcelCell(index=13)
+//    private String journalSource;
+//
+//    @ExcelCell(index=14)
+//    private String category;
 
-    @ExcelCell(index=14)
-    private String category;
-
-    @ExcelCell(index=15)
+    @ExcelCell(index=11)
     private String name;
 
-    @ExcelCell(index=16)
+    @ExcelCell(index=12)
     private String voucherNum;
 
-    @ExcelCell(index=17)
+    @ExcelCell(index=13)
     private String description;
 
-    @ExcelCell(index=18)
+    @ExcelCell(index=14)
     private String segment1;
 
-    @ExcelCell(index=19)
+    @ExcelCell(index=15)
     private String segment2;
 
-    @ExcelCell(index=20)
+    @ExcelCell(index=16)
     private String segment3;
 
-    @ExcelCell(index=21)
+    @ExcelCell(index=17)
     private String segment4;
 
-    @ExcelCell(index=22)
+    @ExcelCell(index=18)
     private String segment5;
 
-    @ExcelCell(index=23)
+    @ExcelCell(index=19)
     private String segment6;
 
-    @ExcelCell(index=24)
+    @ExcelCell(index=20)
     private String segment7;
 
-    @ExcelCell(index=25)
+    @ExcelCell(index=21)
     private String segment8;
 
-    @ExcelCell(index=26)
+    @ExcelCell(index=22)
     private String segment9;
 
-    @ExcelCell(index=27)
+    @ExcelCell(index=23)
     private String segment10;
 
-    @ExcelCell(index=28)
+    @ExcelCell(index=24)
     private String segment1Name;
 
-    @ExcelCell(index=29)
+    @ExcelCell(index=25)
     private String segment2Name;
 
-    @ExcelCell(index=30)
+    @ExcelCell(index=26)
     private String segment3Name;
 
-    @ExcelCell(index=31)
+    @ExcelCell(index=27)
     private String segment4Name;
 
-    @ExcelCell(index=32)
+    @ExcelCell(index=28)
     private String segment5Name;
 
-    @ExcelCell(index=33)
+    @ExcelCell(index=29)
     private String segment6Name;
 
-    @ExcelCell(index=34)
+    @ExcelCell(index=30)
     private String segment7Name;
 
-    @ExcelCell(index=35)
+    @ExcelCell(index=31)
     private String segment8Name;
 
-    @ExcelCell(index=36)
+    @ExcelCell(index=32)
     private String segment9Name;
 
-    @ExcelCell(index=37)
+    @ExcelCell(index=33)
     private String segment10Name;
 
-    @ExcelCell(index=38)
+    @ExcelCell(index=34)
     private String journalCurrencyCode;
 
-    @ExcelCell(index=39)
+    @ExcelCell(index=35)
     private String sobCurrencyCode;
 
-    @ExcelCell(index=40)
+    @ExcelCell(index=36)
     private BigDecimal accountedDr;
 
-    @ExcelCell(index=41)
+    @ExcelCell(index=37)
     private BigDecimal accountedCr;
 
-    @ExcelCell(index=42)
+    @ExcelCell(index=38)
     private BigDecimal enteredDr;
 
-    @ExcelCell(index=43)
+    @ExcelCell(index=39)
     private BigDecimal enteredCr;
 
-    @ExcelCell(index=44)
+    @ExcelCell(index=40)
     private String cfItem;
 
-    @ExcelCell(index=45)
+    @ExcelCell(index=41)
     private String attribute1;
 
-    @ExcelCell(index=46)
+    @ExcelCell(index=42)
     private Date attribute2;
 
-    @ExcelCell(index=47)
+    @ExcelCell(index=43)
     private String attribute3;
 
-    @ExcelCell(index=48)
+    @ExcelCell(index=44)
     private String attribute4;
 
-    @ExcelCell(index=49)
+    @ExcelCell(index=45)
     private String attribute5;
 
-    @ExcelCell(index=50)
+    @ExcelCell(index=46)
     private String attribute6;
 
-    @ExcelCell(index=51)
+    @ExcelCell(index=47)
     private String attribute7;
 
-    @ExcelCell(index=52)
+    @ExcelCell(index=48)
     private String attribute8;
 
-    @ExcelCell(index=53)
+    @ExcelCell(index=49)
     private String attribute9;
 
-    @ExcelCell(index=54)
+    @ExcelCell(index=50)
     private String attribute10;
 
-    @ExcelCell(index=55)
+    @ExcelCell(index=51)
     private String attribute11;
 
-    @ExcelCell(index=56)
+    @ExcelCell(index=52)
     private String attribute12;
 
-    @ExcelCell(index=57)
+    @ExcelCell(index=53)
     private String attribute13;
 
-    @ExcelCell(index=58)
+    @ExcelCell(index=54)
     private String attribute14;
 
-    @ExcelCell(index=59)
+    @ExcelCell(index=55)
     private String attribute15;
 
-    @ExcelCell(index=60)
+    @ExcelCell(index=56)
     private String attribute16;
 
-    @ExcelCell(index=61)
+    @ExcelCell(index=57)
     private String createdBy;
 
-    @ExcelCell(index=62)
+    @ExcelCell(index=58)
     private Date createdDate;
 
-    @ExcelCell(index=63)
+    @ExcelCell(index=59)
     private String lateUpdatedBy;
 
-    @ExcelCell(index=64)
+    @ExcelCell(index=60)
     private Date lateUpdatedDate;
 
-    @ExcelCell(index=65)
+    @ExcelCell(index=61)
     private Integer tmsPeriod;
 
     private Date createTime;
@@ -491,54 +491,6 @@ public class JournalEntryExportDto {
         this.lineNum = lineNum == null ? null : lineNum.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.approval_status
-     *
-     * @return the value of journal_entry.approval_status
-     *
-     * @mbg.generated
-     */
-    public String getApprovalStatus() {
-        return approvalStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.approval_status
-     *
-     * @param approvalStatus the value for journal_entry.approval_status
-     *
-     * @mbg.generated
-     */
-    public void setApprovalStatus(String approvalStatus) {
-        this.approvalStatus = approvalStatus == null ? null : approvalStatus.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.posted_status
-     *
-     * @return the value of journal_entry.posted_status
-     *
-     * @mbg.generated
-     */
-    public String getPostedStatus() {
-        return postedStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.posted_status
-     *
-     * @param postedStatus the value for journal_entry.posted_status
-     *
-     * @mbg.generated
-     */
-    public void setPostedStatus(String postedStatus) {
-        this.postedStatus = postedStatus == null ? null : postedStatus.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.period
@@ -587,54 +539,6 @@ public class JournalEntryExportDto {
         this.accountingDate = accountingDate;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.journal_source
-     *
-     * @return the value of journal_entry.journal_source
-     *
-     * @mbg.generated
-     */
-    public String getJournalSource() {
-        return journalSource;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.journal_source
-     *
-     * @param journalSource the value for journal_entry.journal_source
-     *
-     * @mbg.generated
-     */
-    public void setJournalSource(String journalSource) {
-        this.journalSource = journalSource == null ? null : journalSource.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.category
-     *
-     * @return the value of journal_entry.category
-     *
-     * @mbg.generated
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.category
-     *
-     * @param category the value for journal_entry.category
-     *
-     * @mbg.generated
-     */
-    public void setCategory(String category) {
-        this.category = category == null ? null : category.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.name
@@ -1906,12 +1810,8 @@ public class JournalEntryExportDto {
         sb.append(", status=").append(status);
         sb.append(", headerId=").append(headerId);
         sb.append(", lineNum=").append(lineNum);
-        sb.append(", approvalStatus=").append(approvalStatus);
-        sb.append(", postedStatus=").append(postedStatus);
         sb.append(", period=").append(period);
         sb.append(", accountingDate=").append(accountingDate);
-        sb.append(", journalSource=").append(journalSource);
-        sb.append(", category=").append(category);
         sb.append(", name=").append(name);
         sb.append(", voucherNum=").append(voucherNum);
         sb.append(", description=").append(description);

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

@@ -73,6 +73,11 @@ public class DataPreviewSerivceImpl extends BaseService {
     @Resource
     private CommonDocumentHelper commonDocumentHelper;
 
+    /**
+     * 查询科目余额表
+     * @param param
+     * @return
+     */
     public PageInfo<TrialBalanceDto> getTBDataForDisplay(TrialBalanceParam param) {
 
         TrialBalanceCondition condition = beanUtil.copyProperties(param, new TrialBalanceCondition());
@@ -94,6 +99,11 @@ public class DataPreviewSerivceImpl extends BaseService {
         return pageInfo;
     }
 
+    /**
+     * 查询利润表PRC
+     * @param param
+     * @return
+     */
     public PageInfo<ProfitLossStatementDto> getPLDataForDisplay(ProfitLossStatementParam param) {
 
         ProfitLossStatementCondition condition = beanUtil.copyProperties(param, new ProfitLossStatementCondition());
@@ -616,20 +626,20 @@ public class DataPreviewSerivceImpl extends BaseService {
     private Map<String, String> generalJEHeader() {
         Map<String, String> header = new LinkedHashMap<>();
         header.put("Date","数据日期");
-        header.put("Source","来源");
+//        header.put("Source","来源");
         header.put("LedgerId","账套ID");
         header.put("LedgerName","账套名称");
         header.put("CurrencyCode","账套币种");
         header.put("Status","关账标识");
         header.put("HeaderId","日记账头ID");
         header.put("LineNum","日记账行号");
-        header.put("ApprovalStatus","审批状态");
-        header.put("PostedStatus","过账");
+//        header.put("ApprovalStatus","审批状态");
+//        header.put("PostedStatus","过账");
 
         header.put("Period","会计期间");
         header.put("AccountingDate","凭证日期");
         header.put("JournalSource","日记账来源");
-        header.put("Category","日记账类别");
+//        header.put("Category","日记账类别");
         header.put("Name","日记账名称");
         header.put("VoucherNum","凭证编号");
         header.put("Description","摘要");

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/TrialBalanceCondition.java

@@ -24,8 +24,28 @@ public class TrialBalanceCondition {
 
     private String segment6Name;
 
+    private String segment5;
+
+    private String segment5Name;
+
     private Boolean containsAdjustmentTable;
 
+    public String getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5;
+    }
+
+    public String getSegment5Name() {
+        return segment5Name;
+    }
+
+    public void setSegment5Name(String segment5Name) {
+        this.segment5Name = segment5Name;
+    }
+
     public Integer getPeriodStart() {
         return periodStart;
     }

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceMapper.xml

@@ -19,6 +19,18 @@
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment3Name)">
       AND segment3_name= #{tbCondition.segment3Name,jdbcType=VARCHAR}
     </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment2)">
+      AND segment2= #{tbCondition.segment2,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment2Name)">
+      AND segment2_name= #{tbCondition.segment2Name,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment5)">
+      AND segment5= #{tbCondition.segment5,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment5Name)">
+      AND segment5_name= #{tbCondition.segment5Name,jdbcType=VARCHAR}
+    </if>
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment6)">
       AND segment6= #{tbCondition.segment6,jdbcType=VARCHAR}
     </if>

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -825,7 +825,9 @@
     "InputRollOutConfiguration":"Input RollOut Config",
     "FinancialDataExtraction":"Financial Data Extraction",
     "InvoiceDataExtraction":"Invoice Data Extraction",
-    "ImportDistribution":"Import Distribution",
+    "ImportDistribution":"Invoice Import Distribution",
+    "FinancialImportDistribution":"Financial Import Distribution",
+    "CitImportDistribution":"CIT Import Distribution",
     "VATInvoiceRecord":"VAT Invoice Record",
     "CertifiedInvoicesList":"Certified Invoices List",
     "RedLetterVATSpecialInvoiceInfo":"Red Letter Invoice Info",

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

@@ -869,7 +869,9 @@
     "InputRollOutConfiguration":"进项转出配置",
     "FinancialDataExtraction":"财务数据抽取",
     "InvoiceDataExtraction":"发票数据抽取",
-    "ImportDistribution":"导入分发",
+    "ImportDistribution":"发票导入分发",
+    "FinancialImportDistribution":"财务导入分发",
+    "CitImportDistribution":"CIT导入分发",
     "VATInvoiceRecord":"已开增值税发票记录",
     "CertifiedInvoicesList":"已认证发票清单",
     "RedLetterVATSpecialInvoiceInfo":"红字增值税专用发票信息表",

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -195,7 +195,7 @@
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span class="control-label"> {{'OrganizationCode' | translate}}：<span
-                                                            title="{{selectCompany.OrganizationCode}}">{{selectCompany.OrganizationCode }}</span></span>
+                                                            title="{{selectCompany.code}}">{{selectCompany.code }}</span></span>
                                                 </div>
                                             </div>
                                             <!-- 注册地英文地址 -->

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

@@ -315,7 +315,6 @@
 
         //根据分类获取数据
         function getAssetResultList(assetType) {
-            debugger;
             $scope.citAssetsListDto.assetType = assetType;
             $scope.citAssetsListDto.pageInfo = {
                 pageIndex: $scope.pagingOptions.pageIndex,
@@ -328,7 +327,6 @@
             $scope.TotalTaxCurrentYearDepreciationAmount = 0;
             $scope.TotalYearDifferenceAmount = 0;
             assetListService.getAssetResultListPage($scope.citAssetsListDto).success(function (assetListData) {
-                debugger;
                 var data = assetListData.data.list;
                 $('.filter-button').popover("hide");
                 if (data) {
@@ -1259,10 +1257,11 @@
 
             // initParamFilter();
             $scope.citAssetsListDto.taxAccountCompare = 2;
+            $scope.taxAccountDifferenceOptions.value = 2;
             $scope.citAssetsListDto.assetGroupName = null;
             $scope.citAssetsListDto.depreciationPeriod = null;
             $scope.citAssetsListDto.taxGroupType = null;
-            getAssetResultList($scope.citAssetsListDto.assetType);
+            // getAssetResultList($scope.citAssetsListDto.assetType);
 
         };
 

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

@@ -123,7 +123,7 @@
             $scope.queryParams.period = vatSessionService.year;
             $scope.queryParams.compensationSaleAmount = null;
             $scope.queryParams.assetLabelNumber = null;
-            $scope.refreshConfigGrid();
+            // $scope.refreshConfigGrid();
         }
         $scope.doSearch = function () {
             $scope.refreshConfigGrid();

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

@@ -106,8 +106,8 @@
             };
             $scope.queryParams.periodStart = vatSessionService.year * 100 + 1;
             $scope.queryParams.periodEnd = vatSessionService.year * 100 + 12;
-            loadJournalEntryDataFromDB();
-            $('.filter-button').popover("hide");
+            // loadJournalEntryDataFromDB();
+            // $('.filter-button').popover("hide");
         };
 
         var prepareSummary = function () {
@@ -223,12 +223,12 @@
                     dataSource: 'gridDataSource'
                 },
                 columns: [
-                    {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
-                    {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
+                    // {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
+                    // {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
                     {caption: $translate.instant('AccountingPeriod'), dataField: "accountPeriod",width: 80},
                     {caption: $translate.instant('DocumentDate'), dataField: "accountingDate", dataType: "date", format: "yyyy-MM-dd",width: 100},
-                    {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
-                    {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
+                    // {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
+                    // {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
                     {caption: $translate.instant('JournalName'), dataField: "name",width: 200},
                     {caption: $translate.instant('DocumentNo'), dataField: "voucherNum",width: 200},
                     {caption: $translate.instant('Summary'), dataField: "description",width: 200},
@@ -254,7 +254,7 @@
                     {caption: $translate.instant('Alternate1Description'), dataField: "segment9Name",width: 200},
                     {caption: $translate.instant('Alternate2Description'), dataField: "segment10Name",width: 200},
                     {caption: $translate.instant('currency'), dataField: "journalCurrencyCode",width: 200},
-                    {caption: $translate.instant('LocalCurrency'), dataField: "sobCurrencyCode",width: 200},
+                    {caption: $translate.instant('LocalCurrency'), dataField: "currencyCode",width: 200},
                     {
                         caption: $translate.instant('JournalDebitAmount'),
                         dataField: "accountedDr",
@@ -312,6 +312,7 @@
                 //         $scope.totalCount = totalCount;
                 //     }
                 // },
+                allowColumnResizing: true,
                 loadPanel: {
                     enabled: true
                 },

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

@@ -132,7 +132,7 @@
         $scope.doDataReset = function () {
             $scope.queryParams.period = vatSessionService.year;
             $scope.queryParams.poSubjectName = null;
-            $scope.refreshConfigGrid();
+            // $scope.refreshConfigGrid();
         }
         $scope.doSearch = function () {
             $scope.refreshConfigGrid();

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

@@ -59,7 +59,6 @@
 
         $scope.getDataFromDatabase = function (queryParams){
             citPreviewService.getTbGeneVerData(queryParams).success(function (data) {
-                debugger;
                 if (data) {
                     // minDate = data.
                     var index = 1;
@@ -91,8 +90,8 @@
             };
             $scope.queryParams.periodStart = $scope.startMonth;
             $scope.queryParams.periodEnd = $scope.endMonth;
-            loadJournalEntryDataFromDB();
-            $('.filter-button').popover("hide");
+            // loadJournalEntryDataFromDB();
+            // $('.filter-button').popover("hide");
         };
 
         var prepareSummary = function () {
@@ -235,6 +234,7 @@
                 paging: {
                     pageSize: 50,
                 },
+                allowColumnResizing: true,
                 showBorders: true,
                 hoverStateEnabled: true,
                 height: '99%',

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

@@ -95,8 +95,8 @@
             };
             $scope.queryParams.periodStart = $scope.startMonth;
             $scope.queryParams.periodEnd = $scope.endMonth;
-            loadJournalEntryDataFromDB();
-            $('.filter-button').popover("hide");
+            // loadJournalEntryDataFromDB();
+            // $('.filter-button').popover("hide");
         };
 
         var prepareSummary = function () {
@@ -241,6 +241,7 @@
                 paging: {
                     pageSize: 50,
                 },
+                allowColumnResizing: true,
                 showBorders: true,
                 hoverStateEnabled: true,
                 height: '99%',

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

@@ -12,7 +12,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
             <div class="form-group">
                 <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
             </div>
             <!--  <span class="text-bold" translate="SelectedOrganization"></span>:
               <div class="dropdown" style="margin-left:10px">

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

@@ -12,7 +12,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
             <div class="form-group">
                 <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
             </div>
             <div class="form-group">
                 <!--  <span class="text-bold" translate="SelectedOrganization"></span>:

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

@@ -11,7 +11,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
                         <div class="form-group">
                             <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                            <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                            <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
                         </div>
                          <!--   <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">

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

@@ -11,7 +11,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
                        <div class="form-group">
                            <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                           <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                           <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
                        </div>
                       <!--  <div class="col-sm-6 col-xs-6  col-lg-6 leftNav" style="width: 60%;">
                             <span class="text-bold" translate="SelectedOrganization"></span>:

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

@@ -68,7 +68,7 @@
         <form class="form-inline" style="margin-top: 10px;">
                     <div class="form-group">
                         <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                        <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                        <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
                     </div>
                       <!--  <span class="text-bold" translate="SelectedOrganization"></span>:
                         <div class="dropdown" style="margin-left:10px">

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

@@ -8,6 +8,7 @@ webservices.factory('citPreviewDataService', ['$http', 'apiConfig', function ($h
                     pageInfo : params.pagingOptions,
                     periodStart : params.periodStart,
                     periodEnd : params.periodEnd,
+                    poSubjectName : params.poSubjectName,
                     period  : params.period,
                     projectId: params.projectId
                 }, apiConfig.createVat());

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -137,31 +137,32 @@
                 columns: [{
                     dataField: "id",
                     allowHeaderFiltering: false,
+                    width: '70px',
                     caption: $translate.instant('ExtractTaskId')
                 }, {
                     dataField: "taxpayerIdNum",
-                    width: '15%',
+                    width: '150px',
                     allowHeaderFiltering: false,
                     caption: $translate.instant('TaxpayerIdNum')
                 }, {
                     dataField: "companyCode",
                     allowHeaderFiltering: false,
                     caption: $translate.instant('CompanyCode'),
-                    width: '13%'
+                    width: '75px'
                 }, {
                     dataField: "companyName",
                     allowHeaderFiltering: false,
-                    width: '20%',
+                    width: '230px',
                     caption: $translate.instant('CompanyName')
                 }, {
                     dataField: "fileType",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '140px',
                     caption: $translate.instant('ExtractFile')
                 }, {
                     dataField: "periodYear",
                     allowHeaderFiltering: false,
-                    width: '8%',
+                    width: '60px',
                     caption: $translate.instant('YearPeriod')
                 },
                     /*{
@@ -173,27 +174,27 @@
                     {
                     dataField: "periodMonth",
                     allowHeaderFiltering: false,
-                    width: '8%',
+                    width: '75px',
                     caption: $translate.instant('Period')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
-                    width: '10%',
+                    width: '75px',
                     caption: $translate.instant('RecordSize')
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '20%',
+                    width: '350px',
                     caption: $translate.instant('Status')
                 }, {
                         dataField: "operator",
                         allowHeaderFiltering: false,
-                        width: '10%',
+                        width: '100px',
                         caption: $translate.instant('LogOperationUser')
                     }, {
                         dataField: "operateTime",
                         allowHeaderFiltering: false,
-                        width: '18%',
+                        width: '150px',
                         caption: $translate.instant('LogOperationTime'),
                         calculateCellValue: function(data) {
                             return new Date(data.operateTime).formatDateTime('yyyy-MM-dd HH:mm:ss');
@@ -216,14 +217,15 @@
                 paging: {
                     pageSize: 100,
                 },
-                scrolling: {
-                    mode: "virtual"
-                },
+
+                // scrolling: {
+                //     mode: "virtual"
+                // },
                 grouping: {
                     autoExpandAll: false
                 },
                 allowColumnResizing: true,
-                columnAutoWidth: true,
+                // columnAutoWidth: true,
                 showRowLines: true,
                 showColumnLines: true,
                 rowAlternationEnabled: true,  //单双行颜色

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

@@ -39,8 +39,7 @@
     </div>
 
     <div id="mainAreaDiv" class="main-area">
-        <div class="inputInvoiceGrid" ui-grid="gridOptions">
-            <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
+        <div id="journalEntryGridContainer" dx-data-grid="gridOptions">
         </div>
         <div class="pagination-container">
             <span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>

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

@@ -93,6 +93,10 @@
             z-index: 1000;
         }
 
+        #journalEntryGridContainer{
+            height: 460px;
+        }
+
         .inputInvoiceGrid {
             width: 100%;
             height: calc(~'100% - 158px');

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

@@ -9,7 +9,7 @@
         $scope.endMonth = vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
-        $scope.pageSize = constant.vatPagesize;
+        $scope.pageSize = constant.page.pageSizeArrary[3];
 
         var minDate = [1, vatSessionService.project.year];
         // var minDate = moment().startOf('month').subtract(0, 'months');
@@ -105,7 +105,7 @@
                     $scope.ledgerName = data.list[0].ledgerName;
                     $scope.currencyCode = data.list[0].ledgerCurrencyCode;
                     $scope.status = data.list[0].status;
-                    $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
+                    $scope.importDate = $filter('date')(data.list[0].createTime, "yyyy-MM-dd HH:mm:ss");
                 }
             });
         };
@@ -167,7 +167,7 @@
                 pageInfo: {
                     totalCount: -1,
                     pageIndex: 1,
-                    pageSize: constant.pagesize,
+                    pageSize: constant.page.pageSizeArrary[3],
                     totalPage: 0,
                 }
             }
@@ -533,7 +533,7 @@
                 rowHeight: constant.UIGrid.rowHeight,
                 selectionRowHeaderWidth: constant.UIGrid.rowHeight,
                 // expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
-                virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
+                virtualizationThreshold: 100,//默认加载50条数据，避免在数据展示时，只显示前面4条
                 enableSorting: false,
                 enableColumnMenus: false,
                 enableHorizontalScrollbar : 1,

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

@@ -17,7 +17,7 @@
         {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
         {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
         {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
-        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd HH:mm:ss'}}</span>
     </div>
 
     <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">

atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance-search.html

@@ -17,16 +17,28 @@
                 </tr>
                 <tr>
                     <td>
-                        <span translate="ProfitCenterCode"></span>
+                        <span translate="CostCenter"></span>
                         <input class="form-control input-width-middle" type="text" id="segment2" ng-model="queryParams.segment2" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span translate="ProfitCenterName"></span>
+                        <span translate="CostCenterDescription"></span>
                         <input class="form-control input-width-middle" type="text" id="segment2Name" ng-model="queryParams.segment2Name" />
                     </td>
                 </tr>
+                <tr>
+                    <td>
+                        <span translate="ProfitCenter"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.segment5" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="ProfitCenterDescription"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment5Name" ng-model="queryParams.segment5Name" />
+                    </td>
+                </tr>
                 <tr>
                     <td>
                         <span translate="ProductCode"></span>

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.year+''+vatSessionService.month;
-        $scope.endMonth = vatSessionService.year+''+vatSessionService.month;
+        $scope.startMonth =vatSessionService.year * 100 + vatSessionService.month;
+        $scope.endMonth = vatSessionService.year * 100 + vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
         $scope.pageSize = constant.vatPagesize;
@@ -46,6 +46,8 @@
                 segment3Name : null,
                 segment2 : null,
                 segment2Name : null,
+                segment5 : null,
+                segment5Name : null,
                 segment6 : null,
                 segment6Name : null,
                 containsAdjustmentTable : null
@@ -84,7 +86,7 @@
                     $scope.ledgerName = data.list[0].ledgerName;
                     $scope.currencyCode = data.list[0].currencyCode;
                     $scope.status = data.list[0].status;
-                    $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
+                    $scope.importDate = $filter('date')(data.list[0].createTime, "yyyy-MM-dd HH:mm:ss");
                 }
             });
         };
@@ -178,6 +180,12 @@
                     if ($scope.queryParams.segment2Name === null) {
                         $scope.queryParams.segment2Name = '';
                     }
+                    if ($scope.queryParams.segment5 === null) {
+                        $scope.queryParams.segment5 = '';
+                    }
+                    if ($scope.queryParams.segment5Name === null) {
+                        $scope.queryParams.segment5Name = '';
+                    }
                     if ($scope.queryParams.segment6 === null) {
                         $scope.queryParams.segment6 = '';
                     }
@@ -200,13 +208,13 @@
         var doDataFilterReset = function () {
             $scope.queryParams = {
                 pageInfo: {},
-                periodStart: '',
-                periodEnd: '',
                 orgId:'',
                 segment3 : null,
                 segment3Name : null,
                 segment2 : null,
                 segment2Name : null,
+                segment5 : null,
+                segment5Name : null,
                 segment6 : null,
                 segment6Name : null,
                 containsAdjustmentTable : null
@@ -214,8 +222,8 @@
             $scope.queryParams.periodStart = $scope.startMonth;
             $scope.queryParams.periodEnd = $scope.endMonth;
             $scope.queryParams.orgId = vatSessionService.project.organizationID;
-            loadTrialBalanceDataFromDB(1);
-            $('.filter-button').popover("hide");
+            // loadTrialBalanceDataFromDB(1);
+            // $('.filter-button').popover("hide");
         };
 
         var prepareSummary = function () {