Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into sam_p1

atms-api/src/main/java/pwc/taxtech/atms/constant/ExportTemplatePathConstant.java

@@ -18,4 +18,10 @@ public final class ExportTemplatePathConstant {
     public static final String BALANCE_SHEET_PRC_MANUAL="/vat_excel_template/balance_sheet_prc_manual.xlsx";
     public static final String CASH_FLOW_MANUAL = "/vat_excel_template/cash_flow_manual.xlsx";
 
+    /**
+     * 截止本期科目余额表动态模板，只有路劲
+     * trial_balance_period_i
+     */
+    public static final String TRIAL_BALANCE_PERIOD = "/vat_excel_template/tb_period/trial_balance_period_";
+
 }

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

@@ -32,6 +32,12 @@ public class DataPreviewController extends BaseController {
         return dataPreviewSerivceImpl.getTBDataForDisplay(param);
     }
 
+    @PostMapping("getTBEndPeriodDataForDisplay")
+    public PageInfo<TrialBalanceDto> getTBEndPeriodDataForDisplay(@RequestBody TrialBalanceParam param) {
+        logger.debug(String.format("截至本期科目余额查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getTBEndPeriodDataForDisplay(param);
+    }
+
     @PostMapping("getPLDataForDisplay")
     public PageInfo<ProfitLossStatementDto> getPLDataForDisplay(@RequestBody ProfitLossStatementParam param) {
         logger.debug(String.format("利润表PRC查询 Condition:%s", JSON.toJSONString(param)));
@@ -149,6 +155,13 @@ public class DataPreviewController extends BaseController {
         dataPreviewSerivceImpl.exportBalanceSheetPrcManualList(response, param, fileName);
     }
 
+    @RequestMapping(value = "exportTBEndPeriodData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void downloadTBEndPeriodQueryData(@RequestBody TrialBalanceParam param, HttpServletResponse response) {
+        logger.debug("enter downloadTBEndPeriodQueryData");
+        String fileName="testFile";
+        dataPreviewSerivceImpl.exportTBEndPeriodList(response, param, fileName);
+    }
+
     @RequestMapping(value = "exportTBData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void downloadTBQueryData(@RequestBody TrialBalanceParam paras, HttpServletResponse response) {
         response.setContentType("application/vnd.ms-excel;charset=utf-8");

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

@@ -6,6 +6,7 @@ import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Map;
 
 /**
  *
@@ -127,6 +128,134 @@ public class TrialBalanceDto implements Serializable {
 
     private Date updateTime;
 
+    private BigDecimal monthBalance1;
+    private BigDecimal monthBalance2;
+    private BigDecimal monthBalance3;
+    private BigDecimal monthBalance4;
+    private BigDecimal monthBalance5;
+    private BigDecimal monthBalance6;
+    private BigDecimal monthBalance7;
+    private BigDecimal monthBalance8;
+    private BigDecimal monthBalance9;
+    private BigDecimal monthBalance10;
+    private BigDecimal monthBalance11;
+    private BigDecimal monthBalance12;
+    private BigDecimal monthBalance13;
+
+    private Map<Integer,BigDecimal> periodMap;
+
+    public Map<Integer, BigDecimal> getPeriodMap() {
+        return periodMap;
+    }
+
+    public void setPeriodMap(Map<Integer, BigDecimal> periodMap) {
+        this.periodMap = periodMap;
+    }
+
+    public BigDecimal getMonthBalance1() {
+        return monthBalance1;
+    }
+
+    public void setMonthBalance1(BigDecimal monthBalance1) {
+        this.monthBalance1 = monthBalance1;
+    }
+
+    public BigDecimal getMonthBalance2() {
+        return monthBalance2;
+    }
+
+    public void setMonthBalance2(BigDecimal monthBalance2) {
+        this.monthBalance2 = monthBalance2;
+    }
+
+    public BigDecimal getMonthBalance3() {
+        return monthBalance3;
+    }
+
+    public void setMonthBalance3(BigDecimal monthBalance3) {
+        this.monthBalance3 = monthBalance3;
+    }
+
+    public BigDecimal getMonthBalance4() {
+        return monthBalance4;
+    }
+
+    public void setMonthBalance4(BigDecimal monthBalance4) {
+        this.monthBalance4 = monthBalance4;
+    }
+
+    public BigDecimal getMonthBalance5() {
+        return monthBalance5;
+    }
+
+    public void setMonthBalance5(BigDecimal monthBalance5) {
+        this.monthBalance5 = monthBalance5;
+    }
+
+    public BigDecimal getMonthBalance6() {
+        return monthBalance6;
+    }
+
+    public void setMonthBalance6(BigDecimal monthBalance6) {
+        this.monthBalance6 = monthBalance6;
+    }
+
+    public BigDecimal getMonthBalance7() {
+        return monthBalance7;
+    }
+
+    public void setMonthBalance7(BigDecimal monthBalance7) {
+        this.monthBalance7 = monthBalance7;
+    }
+
+    public BigDecimal getMonthBalance8() {
+        return monthBalance8;
+    }
+
+    public void setMonthBalance8(BigDecimal monthBalance8) {
+        this.monthBalance8 = monthBalance8;
+    }
+
+    public BigDecimal getMonthBalance9() {
+        return monthBalance9;
+    }
+
+    public void setMonthBalance9(BigDecimal monthBalance9) {
+        this.monthBalance9 = monthBalance9;
+    }
+
+    public BigDecimal getMonthBalance10() {
+        return monthBalance10;
+    }
+
+    public void setMonthBalance10(BigDecimal monthBalance10) {
+        this.monthBalance10 = monthBalance10;
+    }
+
+    public BigDecimal getMonthBalance11() {
+        return monthBalance11;
+    }
+
+    public void setMonthBalance11(BigDecimal monthBalance11) {
+        this.monthBalance11 = monthBalance11;
+    }
+
+    public BigDecimal getMonthBalance12() {
+        return monthBalance12;
+    }
+
+    public void setMonthBalance12(BigDecimal monthBalance12) {
+        this.monthBalance12 = monthBalance12;
+    }
+
+    public BigDecimal getMonthBalance13() {
+        return monthBalance13;
+    }
+
+    public void setMonthBalance13(BigDecimal monthBalance13) {
+        this.monthBalance13 = monthBalance13;
+    }
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table trial_balance

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

+package pwc.taxtech.atms.dto.vatdto.excelheader;
+
+public class TrialBalanceHeader {
+    private String companyNameCn ;
+    private Integer periodStart;
+    private Integer periodEnd;
+    //账套名称
+    private String ledgerName;
+    //账套币种
+    private String ledgerCurrencyCode;
+    private Integer periodYear;
+
+    public Integer getPeriodYear() {
+        return periodYear;
+    }
+
+    public void setPeriodYear(Integer periodYear) {
+        this.periodYear = periodYear;
+    }
+
+    public String getCompanyNameCn() {
+        return companyNameCn;
+    }
+
+    public void setCompanyNameCn(String companyNameCn) {
+        this.companyNameCn = companyNameCn;
+    }
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
+    public String getLedgerName() {
+        return ledgerName;
+    }
+
+    public void setLedgerName(String ledgerName) {
+        this.ledgerName = ledgerName;
+    }
+
+    public String getLedgerCurrencyCode() {
+        return ledgerCurrencyCode;
+    }
+
+    public void setLedgerCurrencyCode(String ledgerCurrencyCode) {
+        this.ledgerCurrencyCode = ledgerCurrencyCode;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/TrialBalanceMapper.java

@@ -110,4 +110,18 @@ public interface TrialBalanceMapper extends MyVatMapper {
 
     List<TrialBalance> selectByCondition(@Param("tbCondition") TrialBalanceCondition condition);
 
+    /**
+     * 根据segment1-segment10十个字段为唯一组建分组
+     * @param condition
+     * @return
+     */
+    List<TrialBalance> selectByConditionGroupTen(@Param("tbCondition") TrialBalanceCondition condition);
+
+    /**
+     * 单组查询
+     * @param condition
+     * @return
+     */
+    List<TrialBalance> selectByGroupCondition(@Param("tbCondition") TrialBalanceCondition condition);
+
 }
\ No newline at end of file

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

@@ -30,6 +30,61 @@ public class TrialBalanceCondition {
 
     private Boolean containsAdjustmentTable;
 
+    private String segment1;
+    private String segment4;
+    private String segment7;
+    private String segment8;
+    private String segment9;
+    private String segment10;
+
+    public String getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(String segment1) {
+        this.segment1 = segment1;
+    }
+
+    public String getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(String segment4) {
+        this.segment4 = segment4;
+    }
+
+    public String getSegment7() {
+        return segment7;
+    }
+
+    public void setSegment7(String segment7) {
+        this.segment7 = segment7;
+    }
+
+    public String getSegment8() {
+        return segment8;
+    }
+
+    public void setSegment8(String segment8) {
+        this.segment8 = segment8;
+    }
+
+    public String getSegment9() {
+        return segment9;
+    }
+
+    public void setSegment9(String segment9) {
+        this.segment9 = segment9;
+    }
+
+    public String getSegment10() {
+        return segment10;
+    }
+
+    public void setSegment10(String segment10) {
+        this.segment10 = segment10;
+    }
+
     public String getSegment5() {
         return segment5;
     }

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

@@ -57,4 +57,111 @@
     <include refid="QueryCondition"/>
   </select>
 
+
+  <sql id="QueryConditionTen">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.orgId)">
+      AND organization_id= #{tbCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment3)">
+      AND segment3= #{tbCondition.segment3,jdbcType=VARCHAR}
+    </if>
+    <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.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>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment6Name)">
+      AND segment6_name= #{tbCondition.segment6Name,jdbcType=VARCHAR}
+    </if>
+    <if test="tbCondition.periodStart!=null">
+      AND period &gt;= #{tbCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    <if test="tbCondition.periodEnd!=null">
+      AND period &lt;= #{tbCondition.periodEnd,jdbcType=INTEGER}
+    </if>
+    group by segment1,segment2,segment3,segment4,segment5,segment6,segment7,segment8,segment9,segment10
+    order by update_time1 desc
+  </sql>
+  <select id="selectByConditionGroupTen" parameterType="pwc.taxtech.atms.vat.dpo.TrialBalanceCondition" resultMap="BaseResultMap">
+    SELECT
+    segment1,segment2,segment3,segment4,segment5,segment6,segment7,segment8,segment9,segment10,
+    MAX(update_time) as update_time1
+    FROM
+    trial_balance tb
+    WHERE
+    <include refid="QueryConditionTen"/>
+  </select>
+
+  <sql id="QueryGroupCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.orgId)">
+      AND organization_id= #{tbCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment3)">
+      AND segment3= #{tbCondition.segment3,jdbcType=VARCHAR}
+    </if>
+    <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.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>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment6Name)">
+      AND segment6_name= #{tbCondition.segment6Name,jdbcType=VARCHAR}
+    </if>
+    <if test="tbCondition.periodStart!=null">
+      AND period &gt;= #{tbCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    <if test="tbCondition.periodEnd!=null">
+      AND period &lt;= #{tbCondition.periodEnd,jdbcType=INTEGER}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment1)">
+      AND segment1= #{tbCondition.segment1,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.segment4)">
+      AND segment4= #{tbCondition.segment4,jdbcType=VARCHAR}
+    </if>
+
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment7)">
+      AND segment7= #{tbCondition.segment7,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment8)">
+      AND segment8= #{tbCondition.segment8,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment9)">
+      AND segment9= #{tbCondition.segment9,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment10)">
+      AND segment10= #{tbCondition.segment10,jdbcType=VARCHAR}
+    </if>
+    order by update_time desc
+  </sql>
+  <select id="selectByGroupCondition" parameterType="pwc.taxtech.atms.vat.dpo.TrialBalanceCondition" resultMap="BaseResultMap">
+    SELECT
+    tb.*
+    FROM
+    trial_balance tb
+    WHERE
+    <include refid="QueryGroupCondition"/>
+  </select>
+
+
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -936,6 +936,24 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 				deepStateRedirect: true,
 				sticky: true
 			});
+
+			$stateProvider.state({
+				name: 'vat.previewData.trialBalanceEndPeriod',
+				url: '/trialBalanceEndPeriod',
+				views: {
+					'@vat.previewData': {
+						controller: ['$scope', '$stateParams', 'appTranslation',
+							function ($scope, $stateParams, appTranslation) {
+								appTranslation.load([appTranslation.vat]);
+							}],
+						template: '<vat-preview-trial-balance-end-period></vat-preview-trial-balance-end-period>'
+					}
+				},
+				resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
+				deepStateRedirect: true,
+				sticky: true
+			});
+			
 			$stateProvider.state({
 				name: 'vat.previewData.cashFlow',
 				url: '/cashFlow',

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

@@ -1795,6 +1795,7 @@
   "otherItem3": "Other Item3",
   "otherItem3Amount": "Other Item3 Amount",
   "trialBalance": "Trial balance",
+  "trialBalanceEndPeriod": "Trial balance end period",
   "TrialBalanceDDTitle": "Trial balance",
   "BegBalBeq": "Beg bal beq",
   "EndBalBeq": "End bal beq",

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

@@ -1850,6 +1850,7 @@
     "wronglyDistributedExpenseOrCostsDesc": "业务招待费和广告及宣传费未列支在正确的科目下",
 
     "trialBalance": "科目余额表",
+    "trialBalanceEndPeriod": "截止本期科目余额表",
     "TrialBalanceDDTitle": "科目余额表",
     "cashFlow":"现金流量表",
     "CashFlowDDTitle":"现金流量表",

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -510,6 +510,9 @@ constant.vatPermission = {
         },
         profitTable: {
             queryCode: '02.002.024'
+        },
+        trialBalanceEndPeriod: {
+            queryCode: '02.002.025'
         }
     },
     dataManage: {

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

@@ -186,6 +186,18 @@
         initExportTBData: function (queryParams) {
             return $http.post('/dataPreview/exportTBData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
         },
+        getTBEndPeriodDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getTBEndPeriodDataForDisplay', queryParams, apiConfig.createVat());
+        },
+        //服务器导出
+        initExportTBEndPeriodData: function (queryParm, fileName) {
+            var thisConfig = apiConfig.create();
+            thisConfig.responseType = "arraybuffer";
+            return $http.post('/dataPreview/exportTBEndPeriodData/get', queryParm, thisConfig).then(function (response) {
+                var data = new Blob([response.data], {type: response.headers('Content-Type')});
+                FileSaver.saveAs(data,fileName + '_'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
+            });
+        },
         getCFDataForDisplay: function (queryParams) {
             return $http.post('/dataPreview/getCFDataForDisplay', queryParams, apiConfig.createVat());
         },

atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js

@@ -23,6 +23,10 @@
                     name: 'trialBalance', permission: constant.vatPermission.dataPreview.trialBalance.queryCode,
                     text: $translate.instant('trialBalance'), icon: 'fa fa-file-text-o', show: true
                 },
+                {
+                    name: 'trialBalanceEndPeriod', permission: constant.vatPermission.dataPreview.trialBalanceEndPeriod.queryCode,
+                    text: $translate.instant('trialBalanceEndPeriod'), icon: 'fa fa-file-text-o', show: true
+                },
                 {
                     name: 'profitLoss', permission: constant.vatPermission.dataPreview.profitLoss.queryCode,
                     text: $translate.instant('profitLossPRC'), icon: 'fa fa-file-text-o', show: true

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

+<div class="popover">
+    <div class="arrow"></div>
+    <div class="popover-content">
+        <div>
+            <table class="table table-responsive">
+                <tr>
+                    <td>
+                        <span translate="TBAccountCode"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment3" ng-model="queryParams.segment3" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="AccountName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment3Name" ng-model="queryParams.segment3Name" />
+                    </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>
+                        <input class="form-control input-width-middle" type="text" id="segment6" ng-model="queryParams.segment6" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="TBProductName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment6Name" ng-model="queryParams.segment6Name" />
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div class="row">
+            <div style="float:right;margin-right:10px;">
+                <button class="btn btn-default btn-primary" ng-click="doDataFilter('')">
+                    <span class="fa fa-chevron-down" aria-hidden="true"> </span> <span translate="Confirm"></span>
+                </button>
+                <button class="btn btn-default margin-right10" ng-click="doDataFilterReset()">
+                    <span class="fa fa-times" aria-hidden="true"> </span> <span translate="Reset"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>

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

+<div class="vat-preview-trial-balance-end-period" id="mainPreviewDiv">
+    <div class="top-area-wrapper" style="margin-top: 10px">
+        <button class="filter-button"
+                atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
+                popover-container="body" popover-auto-hide="true" data-overwrite="true"
+                use-optimized-placement-algorithm="true"
+                data-placement="bottom"
+                data-templateurl="/app/vat/preview/vat-preview-trial-balance-end-period/vat-preview-trial-balance-end-period-search.html">
+            <i class="fa fa-filter" aria-hidden="true"></i>
+        </button>
+        <span translate="trialBalanceEndPeriod" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
+        <span class="dropdown">
+            <select class="form-control"
+                ng-change='changeMonth()'
+                ng-model="monthEnd"
+                ng-options="x for x in monthList" required 
+                style="position: relative; top: -30px; left: 230px;width: 70px;">
+            </select>
+        </span>
+        <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 style="margin-bottom: 8px;margin-left: 30px">
+        {{'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?(status=='C'?'是':'否'):status}}</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">
+        <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:
+        <span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+        <span ng-if="criteriaList.length>6"><br /></span>
+        <span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
+        <span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+    </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>
+        <div class="pagination-container">
+            <span>本页{{curPageItemCount}}条记录，共{{queryTrialBalanceResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

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

+vatModule.directive('vatPreviewTrialBalanceEndPeriod', ['$log', 'browserService', '$translate', 'region', '$timeout',
+    function ($log, browserService, $translate, region, $timeout) {
+        $log.debug('vatPreviewTrialBalanceEndPeriod.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/vat/preview/vat-preview-trial-balance-end-period/vat-preview-trial-balance-end-period.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'VatPreviewTrialBalanceEndPeriodController',
+            link: function ($scope, element) {
+
+            }
+        }
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance-end-period/vat-preview-trial-balance-end-period.less

+@import "~/app-resources/less/theme.less";
+
+.vat-preview-trial-balance-end-period {
+    background-color: white;
+    height: 100%;
+
+    .numAmount {
+        padding: 0 3px;
+        height: 21px;
+        margin-left: 5px;
+        /* font-family: 'Arial'; */
+        font-weight: 600;
+        border-radius: 2px;
+        font-style: normal;
+        outline: none;
+        border: none;
+        min-width: 20px;
+        background-color: #DDDDDD;
+        color: #AA0000;
+    }
+
+    .top-area-wrapper {
+        height: 60px;
+        width: 98%;
+        margin: 0 20px;
+
+        .filter-button {
+            width: 30px;
+            margin-top: 16px;
+        }
+
+        .operation-wrapper {
+            margin: 15px 25px 10px 10px;
+
+            span {
+                cursor: pointer;
+            }
+        }
+    }
+
+    .filter-popup-wrapper {
+        display: none;
+    }
+
+
+
+    .margin-left20 {
+        margin-left: 20px;
+    }
+    /*******************************************/
+    /*Filter Criteria tags:*/
+    .tag {
+        font-size: 12px;
+        padding: .3em .4em .4em;
+        margin: 0 .1em;
+
+        a {
+            color: #bbb;
+            cursor: pointer;
+            opacity: 0.6;
+            margin: 0 0 0 .3em;
+
+
+            &:hover {
+                opacity: 1.0;
+            }
+
+            .glyphicon-white {
+                color: #fff;
+                margin-bottom: 2px;
+            }
+        }
+
+        .remove {
+            vertical-align: bottom;
+            top: 0;
+        }
+    }
+    /*Filter Criteria tags:*/
+    /*******************************************/
+    .main-area {
+        height: 100%;
+        margin: 0 20px;
+
+        .watermark {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            opacity: .25;
+            font-size: 3em;
+            width: 100%;
+            text-align: center;
+            z-index: 1000;
+        }
+
+        .inputInvoiceGrid {
+            width: 100%;
+            height: calc(~'100% - 158px');
+
+            .ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
+                height: 40px;
+
+                i {
+                    display: none;
+                }
+            }
+        }
+    }
+
+
+    .form-control {
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}
+
+.rightHeader{
+    text-align: right;
+}
+
+.popover {
+    min-width: 370px;
+    left: 119px !important;
+
+    .arrow {
+        left: 5% !important;
+    }
+}
+
+.popover-content {
+    td {
+        text-align: right;
+        padding: 6px;
+
+        span {
+            float: left;
+        }
+    }
+
+    .form-control {
+        display: inline-block;
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-small {
+        width: 100px;
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}