Merge branch 'dev_wzk_phase1' into 'dev_mysql'

Dev wzk phase1新的一期分支第一次提交

See merge request root/atms!385

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 Integer period;
+    private String approvalStatus;
 
     @ExcelCell(index=10)
+    private String postedStatus;
+
+    @ExcelCell(index=11)
+    private Integer period;
+
+    @ExcelCell(index=12)
     private Date accountingDate;
 
-//    @ExcelCell(index=13)
-//    private String journalSource;
-//
-//    @ExcelCell(index=14)
-//    private String category;
+    @ExcelCell(index=13)
+    private String journalSource;
 
-    @ExcelCell(index=11)
+    @ExcelCell(index=14)
+    private String category;
+
+    @ExcelCell(index=15)
     private String name;
 
-    @ExcelCell(index=12)
+    @ExcelCell(index=16)
     private String voucherNum;
 
-    @ExcelCell(index=13)
+    @ExcelCell(index=17)
     private String description;
 
-    @ExcelCell(index=14)
+    @ExcelCell(index=18)
     private String segment1;
 
-    @ExcelCell(index=15)
+    @ExcelCell(index=19)
     private String segment2;
 
-    @ExcelCell(index=16)
+    @ExcelCell(index=20)
     private String segment3;
 
-    @ExcelCell(index=17)
+    @ExcelCell(index=21)
     private String segment4;
 
-    @ExcelCell(index=18)
+    @ExcelCell(index=22)
     private String segment5;
 
-    @ExcelCell(index=19)
+    @ExcelCell(index=23)
     private String segment6;
 
-    @ExcelCell(index=20)
+    @ExcelCell(index=24)
     private String segment7;
 
-    @ExcelCell(index=21)
+    @ExcelCell(index=25)
     private String segment8;
 
-    @ExcelCell(index=22)
+    @ExcelCell(index=26)
     private String segment9;
 
-    @ExcelCell(index=23)
+    @ExcelCell(index=27)
     private String segment10;
 
-    @ExcelCell(index=24)
+    @ExcelCell(index=28)
     private String segment1Name;
 
-    @ExcelCell(index=25)
+    @ExcelCell(index=29)
     private String segment2Name;
 
-    @ExcelCell(index=26)
+    @ExcelCell(index=30)
     private String segment3Name;
 
-    @ExcelCell(index=27)
+    @ExcelCell(index=31)
     private String segment4Name;
 
-    @ExcelCell(index=28)
+    @ExcelCell(index=32)
     private String segment5Name;
 
-    @ExcelCell(index=29)
+    @ExcelCell(index=33)
     private String segment6Name;
 
-    @ExcelCell(index=30)
+    @ExcelCell(index=34)
     private String segment7Name;
 
-    @ExcelCell(index=31)
+    @ExcelCell(index=35)
     private String segment8Name;
 
-    @ExcelCell(index=32)
+    @ExcelCell(index=36)
     private String segment9Name;
 
-    @ExcelCell(index=33)
+    @ExcelCell(index=37)
     private String segment10Name;
 
-    @ExcelCell(index=34)
+    @ExcelCell(index=38)
     private String journalCurrencyCode;
 
-    @ExcelCell(index=35)
+    @ExcelCell(index=39)
     private String sobCurrencyCode;
 
-    @ExcelCell(index=36)
+    @ExcelCell(index=40)
     private BigDecimal accountedDr;
 
-    @ExcelCell(index=37)
+    @ExcelCell(index=41)
     private BigDecimal accountedCr;
 
-    @ExcelCell(index=38)
+    @ExcelCell(index=42)
     private BigDecimal enteredDr;
 
-    @ExcelCell(index=39)
+    @ExcelCell(index=43)
     private BigDecimal enteredCr;
 
-    @ExcelCell(index=40)
+    @ExcelCell(index=44)
     private String cfItem;
 
-    @ExcelCell(index=41)
+    @ExcelCell(index=45)
     private String attribute1;
 
-    @ExcelCell(index=42)
+    @ExcelCell(index=46)
     private Date attribute2;
 
-    @ExcelCell(index=43)
+    @ExcelCell(index=47)
     private String attribute3;
 
-    @ExcelCell(index=44)
+    @ExcelCell(index=48)
     private String attribute4;
 
-    @ExcelCell(index=45)
+    @ExcelCell(index=49)
     private String attribute5;
 
-    @ExcelCell(index=46)
+    @ExcelCell(index=50)
     private String attribute6;
 
-    @ExcelCell(index=47)
+    @ExcelCell(index=51)
     private String attribute7;
 
-    @ExcelCell(index=48)
+    @ExcelCell(index=52)
     private String attribute8;
 
-    @ExcelCell(index=49)
+    @ExcelCell(index=53)
     private String attribute9;
 
-    @ExcelCell(index=50)
+    @ExcelCell(index=54)
     private String attribute10;
 
-    @ExcelCell(index=51)
+    @ExcelCell(index=55)
     private String attribute11;
 
-    @ExcelCell(index=52)
+    @ExcelCell(index=56)
     private String attribute12;
 
-    @ExcelCell(index=53)
+    @ExcelCell(index=57)
     private String attribute13;
 
-    @ExcelCell(index=54)
+    @ExcelCell(index=58)
     private String attribute14;
 
-    @ExcelCell(index=55)
+    @ExcelCell(index=59)
     private String attribute15;
 
-    @ExcelCell(index=56)
+    @ExcelCell(index=60)
     private String attribute16;
 
-    @ExcelCell(index=57)
+    @ExcelCell(index=61)
     private String createdBy;
 
-    @ExcelCell(index=58)
+    @ExcelCell(index=62)
     private Date createdDate;
 
-    @ExcelCell(index=59)
+    @ExcelCell(index=63)
     private String lateUpdatedBy;
 
-    @ExcelCell(index=60)
+    @ExcelCell(index=64)
     private Date lateUpdatedDate;
 
-    @ExcelCell(index=61)
+    @ExcelCell(index=65)
     private Integer tmsPeriod;
 
     private Date createTime;
@@ -491,6 +491,54 @@ 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
@@ -539,6 +587,54 @@ 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
@@ -1810,8 +1906,12 @@ 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/CitImportExcelServiceImpl.java

@@ -946,8 +946,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             citProfitPrcAdjustMapper.deleteByExample(example);
             updateImportLog(EnumCitImportType.ProfitPrcAdjust.getCode());
         }
-
-        int insertBatchNum = citProfitPrcAdjustMapper.insertBatch(citProfitPrcAdjustList);
+        int insertBatchNum = 0;
+        if(citProfitPrcAdjustList != null && citProfitPrcAdjustList.size()>0){
+            insertBatchNum = citProfitPrcAdjustMapper.insertBatch(citProfitPrcAdjustList);
+        }
         CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
                 EnumCitImportType.ProfitPrcAdjust.getCode(), period,
                 companyName, "利润表(单家PRC)", true);

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

@@ -938,20 +938,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-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -826,7 +826,7 @@
     "FinancialDataExtraction":"Financial Data Extraction",
     "InvoiceDataExtraction":"Invoice Data Extraction",
     "ImportDistribution":"Invoice Import Distribution",
-    "FinancialImportDistribution":"Financial Import Distribution",
+    "FinancialImportDistribution":"Finance Import Distribution",
     "CitImportDistribution":"CIT Import Distribution",
     "VATInvoiceRecord":"VAT Invoice Record",
     "CertifiedInvoicesList":"Certified Invoices List",

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

@@ -1166,6 +1166,7 @@
     "Segment1":"Segment1",
     "Segment1Description": "Segment1 Description",
     "Segment2":"Segment2",
-    "Segment2Description": "Segment2 Description"
-
+    "Segment2Description": "Segment2 Description",
+    "HistoryVersion": "History Version",
+    "ReportUploadDetail": "History Version Table"
 }
\ No newline at end of file

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

@@ -1220,5 +1220,7 @@
     "Segment1":"备用段",
     "Segment1Description": "备用段描述",
     "Segment2":"备用段",
-    "Segment2Description": "备用段描述"
+    "Segment2Description": "备用段描述",
+    "HistoryVersion": "历史版本",
+    "ReportUploadDetail": "历史版本计算表"
 }
\ No newline at end of file

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

@@ -994,7 +994,7 @@
     "IssuedVehicleListGd": "已开发票车辆事件列表 - GD View",
     "IssuingEntity": "开票机构",
     "IssuranceType": "开票类型",
-    "Item": "项",
+    "Item": "项目名称",
     "ItemIDParseErrorMsg": "{rows}存在非法分录号值！",
     "ItemIDParseErrorType": "分录号值非法",
     "ItemName": "Item名称",

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

@@ -112,7 +112,7 @@
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span
-                                                        class="">{{'OrganizationNameEn' | translate}}：{{selectCompany.englishName}}</span>
+                                                        class="">{{'OrganizationNameEn' | translate}}：{{selectCompany.englishName?selectCompany.englishName:'无'}}</span>
                                                 </div>
                                             </div>
                                             <div class="form-group" ng-show="!isInternational">
@@ -125,47 +125,47 @@
                                                 <div class="col-sm-12">
                                                     <span class="control-label">
                                                         {{'ArchitectureType' | translate}}：<span
-                                                            title="{{selectCompany.architectureType}}">{{selectCompany.architectureType}}</span></span>
+                                                            title="{{selectCompany.architectureType}}">{{selectCompany.architectureType?selectCompany.architectureType:'无'}}</span></span>
                                                 </div>
                                             </div>
                                             <div class="form-group" ng-show="!isInternational">
                                                 <div class="col-sm-12">
                                                     <span class="control-label">
                                                         {{'RegistrationAddress' | translate}}：<span
-                                                            title="{{selectCompany.registerAddress}}">{{selectCompany.registerAddress }}</span></span>
+                                                            title="{{selectCompany.registerAddress}}">{{selectCompany.registerAddress?selectCompany.registerAddress:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span class="control-label">
                                                         {{'RegistrationCapital' | translate}}：<span
-                                                            title="{{selectCompany.registrationCapital}}">{{selectCompany.registrationCapital }}</span></span>
+                                                            title="{{selectCompany.registrationCapital}}">{{selectCompany.registrationCapital?selectCompany.registrationCapital:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             <div class="form-group" ng-show="!isInternational">
                                                 <div class="col-sm-12">
                                                     <span class="control-label">
                                                         {{'NationalEconomicIndustry' | translate}}：<span
-                                                            title="{{selectCompany.nationalEconomicIndustry}}">{{selectCompany.nationalEconomicIndustryStr }}</span></span>
+                                                            title="{{selectCompany.nationalEconomicIndustry}}">{{selectCompany.nationalEconomicIndustryStr?selectCompany.nationalEconomicIndustryStr:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span
-                                                        class="">{{'LegalPersonName' | translate}}：{{selectCompany.legalPersonName}}</span>
+                                                        class="">{{'LegalPersonName' | translate}}：{{selectCompany.legalPersonName?selectCompany.legalPersonName:'无'}}</span>
                                                 </div>
                                             </div>
                                             <!-- 分公司数量 -->
                                             <div class="form-group" ng-show="!isInternational">
                                                 <div class="col-sm-12">
                                                     <span class="control-label"> {{'NumOfBranches' | translate}}：<span
-                                                            title="{{selectCompany.numOfBranches}}">{{selectCompany.numOfBranches }}</span></span>
+                                                            title="{{selectCompany.numOfBranches}}">{{selectCompany.numOfBranches?selectCompany.numOfBranches:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span class="control-label"> {{'BusinessScope' | translate}}：<span
-                                                            title="{{selectCompany.businessScope}}">{{selectCompany.businessScope }}</span></span>
+                                                            title="{{selectCompany.businessScope}}">{{selectCompany.businessScope?selectCompany.businessScope:'无' }}</span></span>
                                                 </div>
                                             </div>
                                            
@@ -188,7 +188,7 @@
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span class="control-label"> {{'RegStatus' | translate}}：<span
-                                                            title="{{selectCompany.regStatus}}">{{selectCompany.regStatus }}</span></span>
+                                                            title="{{selectCompany.regStatus}}">{{selectCompany.regStatus?selectCompany.regStatus:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             <!-- 公司代码 -->
@@ -203,7 +203,7 @@
                                                 <div class="col-sm-12">
                                                     <span class="control-label">
                                                         {{'RegistrationAddressEn' | translate}}：<span
-                                                            title="{{selectCompany.registrationLocationEn}}">{{selectCompany.registrationLocationEn }}</span></span>
+                                                            title="{{selectCompany.registrationLocationEn}}">{{selectCompany.registrationLocationEn?selectCompany.registrationLocationEn:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             
@@ -211,7 +211,7 @@
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span class="control-label"> {{'PaidInCapital' | translate}}：<span
-                                                            title="{{selectCompany.paidInCapital}}">{{selectCompany.paidInCapital }}</span></span>
+                                                            title="{{selectCompany.paidInCapital}}">{{selectCompany.paidInCapital?selectCompany.paidInCapital:'无' }}</span></span>
                                                 </div>
                                             </div>
                                             <!--从事国家限制或禁止行业-->
@@ -219,7 +219,7 @@
                                                 <div class="col-sm-12">
                                                     <span class="control-label">
                                                         {{'EngageNationalProhibitIndustry' | translate}}：<span
-                                                            title="{{selectCompany.engageNationalProhibitIndustry}}">{{selectCompany.engageNationalProhibitIndustryStr}}</span></span>
+                                                            title="{{selectCompany.engageNationalProhibitIndustry}}">{{selectCompany.engageNationalProhibitIndustryStr?selectCompany.engageNationalProhibitIndustryStr:'无'}}</span></span>
                                                 </div>
                                             </div>
                                             <!-- 成立日期 -->

atms-web/src/main/webapp/app/cit/report/cit-report-layout/cit-report-layout.html

@@ -24,9 +24,9 @@
             <ul class="nav nav-report">
                 <li>
                     <div class="group-section"  ng-click="uploadliShow=!uploadliShow;">
-                        <i class="fa toggle-group-icon" ng-class="'fa-chevron-down'"
+                        <i class="fa toggle-group-icon" ng-class="uploadliShow?'fa-chevron-down':'fa-chevron-right'"
                            aria-hidden="true"></i>
-                        <label class="tree-toggle nav-header" translate="">历史版本</label>
+                        <label class="tree-toggle nav-header" translate="">{{'HistoryVersion' | translate }}</label>
                     </div>
 
                     <div class="divider"></div>
@@ -34,7 +34,7 @@
                         <div class="li tree">
                             <a ng-class="'active'" ui-sref-active="active"
                                ui-sref=".reportUploadView()"
-                               class="active">历史版本计算表</a>
+                               class="active">{{'ReportUploadDetail' | translate }}</a>
                         </div>
                     </div>
                 </li>

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

@@ -261,7 +261,8 @@
 
                                         <!--公司代码-->
                                         <div class="form-group" ng-show="isLocal">
-                                            <label for="code" class="col-sm-3 control-label">{{'OrganizationCode' |
+                                            <label for="code" class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'OrganizationCode' |
                                                 translate}}：</label>
                                             <div class="col-sm-9"
                                                 ng-class="{'has-error':orgControlForm.code.$invalid && (orgControlForm.code.$dirty || orgControlForm.$submitted)}">

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

@@ -10,7 +10,7 @@
             },
             controller: 'importATController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'importBSController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -61,7 +61,7 @@
                         translate="TemplateBtn"
                         ng-click="downloadTemplate()"></button>
 
-                <button type="button"
+                <button style="display: none" type="button"
                         class="btn btn-vat-primary "
                         translate="AddImportBtn"
                         ng-click="doUploadCF(importEnum.AddImport)"></button>

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

@@ -11,7 +11,7 @@
             },
             controller: 'importCFController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'importCILController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitBalanceSheetPrcAdjustCon',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitDaftAccountMappingCon',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitEamAssetsDisposalCon',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitJournalAdjustController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitProfitPrcAdjustCon',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitSalaryAdvanceCon',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importCitTrialBalanceController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'importCPRController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -13,7 +13,7 @@
             },
             controller: 'importInvoiceDataController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'importIRController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'importPLController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'importRLITController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'extractFinancialDataController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -10,7 +10,7 @@
             },
             controller: 'extractInvoiceDataController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

@@ -4,16 +4,16 @@
         <div class="nav-header" translate="DataImportLogTitle"></div>
     </div>
     <div id="tab_total">
-        <div class="select-period" style="height: 10px;">
-            <span class="text-bold"style="float: left; margin-top: 5px;">{{'StartDateMao'|translate}}</span>
+        <div class="select-period" style="height: 10px;position: absolute">
+            <div class="text-bold input-group " style="float: left; margin-top: 5px;z-index: 9;">{{'StartDateMao'|translate}}</div>
             <div class="input-daterange input-group " style="float: left;width: 10%;">
                 <input type="text" id="startDate" class="input-sm form-control" name="startDate"
-                       ng-model="queryParams.startDate" style="width: 120px;margin-left: 50px;"/>
+                       ng-model="queryParams.startDate" style="width: 120px;margin-left: 10px;"/>
             </div>
-            <span class="text-bold"style="float: left; margin-left: 50px; margin-top: 5px;">{{'EndDateMao'|translate}}</span>
+            <div class="text-bold input-group " style="float: left; margin-top: 5px;z-index: 9;margin-left: 20px;">{{'EndDateMao'|translate}}</div>
             <div class="input-daterange input-group endDatepicker"style="float: left;width: 10%;">
                 <input type="text" id="endDate" class="input-sm form-control" name="endDate"
-                       ng-model="queryParams.endDate" style="width: 120px;margin-left: 50px;"/>
+                       ng-model="queryParams.endDate" style="width: 120px;margin-left: 10px;"/>
             </div>
         </div>
         <div class="dt-init-wrapper">

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

@@ -13,7 +13,7 @@
             },
             controller: 'importLogController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

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

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

@@ -4,16 +4,16 @@
         <div class="nav-header" translate="DataProcessLogTitle"></div>
     </div>
     <div id="tab_total">
-        <div class="select-period" style="height: 10px;">
-            <span class="text-bold"style="float: left; margin-top: 5px;">{{'StartDateMao'|translate}}</span>
+        <div class="select-period" style="height: 10px;position: absolute">
+            <div class="text-bold input-group " style="float: left; margin-top: 5px;z-index: 9;">{{'StartDateMao'|translate}}</div>
             <div class="input-daterange input-group startDatepicker" style="float: left;width: 10%;">
                 <input type="text" id="startDate" class="input-sm form-control" name="startDate"
-                       ng-model="queryParams.startDate" style="width: 120px;margin-left: 50px;"/>
+                       ng-model="queryParams.startDate" style="width: 120px;margin-left: 10px;"/>
             </div>
-            <span class="text-bold"style="float: left; margin-left: 50px; margin-top: 5px;">{{'EndDateMao'|translate}}</span>
+            <div class="text-bold input-group "style="float: left;margin-top: 5px;z-index: 9;margin-left: 20px;">{{'EndDateMao'|translate}}</div>
             <div class="input-daterange input-group endDatepicker"style="float: left;width: 10%;">
                 <input type="text" id="endDate" class="input-sm form-control" name="endDate"
-                       ng-model="queryParams.endDate" style="width: 120px;margin-left: 50px;"/>
+                       ng-model="queryParams.endDate" style="width: 120px;margin-left: 10px;"/>
             </div>
         </div>
         <div class="dt-init-wrapper">

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

@@ -13,7 +13,7 @@
             },
             controller: 'processLogController',
             link: function (scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

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

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

atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.js

@@ -8,7 +8,7 @@
             scope: {},
             controller: 'VatRevenueConfMappingController',
             link: function ($scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.js

@@ -8,7 +8,7 @@
             scope: {},
             controller: 'VatRevenueConfigController',
             link: function ($scope, element) {
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";

atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html

 <div id="app-data-import" class="app-data-import ">
     <nav class="navbar navbar-custom" role="navigation"
-         style="margin-bottom: 0; border-radius: 0px; height: 100%;width: 260px">
+         style="margin-bottom: 0; border-radius: 0px; height: 100%;width: 265px">
         <div class="sidebar navbarfix" role="navigation" style="height: 100%;">
-            <div class="sidebar-nav navbar-collapse" id="sidebar-area" style="height:100%;width: 260px">
+            <div class="sidebar-nav navbar-collapse" id="sidebar-area" style="height:100%;width: 265px">
                 <div class="app-data-import-side-bar" style="height: 100%">
                     <perfect-scrollbar class="scroller"
                                        wheel-propagation="true"

atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.js

@@ -12,7 +12,7 @@
             controller: 'appDataImportController',
             link: function (scope, element, attr) {
                 $('.nav-element-left a').removeClass('active');
-                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.width = "265px";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

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

@@ -8,7 +8,7 @@
     <div style="margin-bottom: 10px;margin-left: 20px;margin-top: 10px;">
         {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;
         {{'EnterpriseAccountSetCurrency' | translate }}：<span class="numAmount">{{ledgerCurrencyCodeFirst}}</span>&nbsp;&nbsp;&nbsp;
-        {{'IsCloseAccount' | translate }}：<span class="numAmount">{{ledgerStatusFirst}}</span>
+        {{'IsCloseAccount' | translate }}：<span class="numAmount">{{ledgerStatusFirst?(ledgerStatusFirst=='C'?'是':'否'):ledgerStatusFirst}}</span>
     </div>
 
     <div id="mainAreaDiv" class="main-area">

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

@@ -16,7 +16,7 @@
     <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}}</span>
+        {{'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>
 

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

@@ -16,7 +16,7 @@
     <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}}</span>
+        {{'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>
 

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

@@ -16,7 +16,7 @@
     <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}}</span>
+        {{'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>
 

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

@@ -16,7 +16,7 @@
     <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}}</span>
+        {{'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>
 

atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html

@@ -24,7 +24,7 @@
             <ul class="nav nav-report">
                 <li>
                     <div class="group-section"  ng-click="uploadliShow=!uploadliShow;">
-                        <i class="fa toggle-group-icon" ng-class="'fa-chevron-down'"
+                        <i class="fa toggle-group-icon" ng-class="uploadliShow?'fa-chevron-down':'fa-chevron-right'"
                            aria-hidden="true"></i>
                         <label class="tree-toggle nav-header" translate="">{{'HistoryVersion' | translate }}</label>
                     </div>