merge 档案管理

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

 {
-  "DocumentAttr":"DocumentAttr",
-  "DocumentType":"DocumentType",
-  "DocumentName":"DocumentName",
+  "Document Attribute":"Document Attribute",
+  "Document Type":"Document Type",
+  "Document Name":"Document Name",
   "IsRequired":"Is Required",
   "PleaseChecksRequired":"Please Checks Required",
-  "BusinessLine":"BusinessLine",
-  "CorporationName":"CorporationName",
-  "AvailabilityDate":"AvailabilityDate",
-  "Duration":"Duration",
-  "DueDate":"DueDate",
-  "TaxType":"TaxType",
-  "EntityIndex":"EntityIndex",
-  "EntityStorageLocation":"EntityStorageLocation",
-  "EntityCustodian":"EntityCustodian",
-  "ApprovalStatus":"ApprovalStatus",
+  "Business Line":"Business Line",
+  "Company Name":"Company Name",
+  "Effective_Date":"Effective_Date",
+  "Period":"Period",
+  "Due Date":"Due Date",
+  "Tax Type":"Tax Type",
+  "Storage Index":"Storage Index",
+  "Storage Location":"Storage Location",
+  "Custodian":"Custodian",
+  "Approval Status":"Approval Status",
   "ApprovalPass":"ApprovalPass",
   "ApprovalReject":"ApprovalReject",
   "ApprovalStandby":"ApprovalStandby",
-  "UploadDate":"UploadDate",
+  "Upload Date":"Upload Date",
   "Creator":"Creator",
   "Remarks":"Remarks",
-  "MoreFields":"MoreFields",
-  "LessFields":"LessFields",
+  "More":"More",
+  "Less":"Less",
   "Search":"Search",
   "Reset":"Reset",
   "Preview":"Preview",
-  "DelRecord":"DelRecord",
-  "CreateRecord":"CreateRecord",
-  "ExportTable":"ExportTable",
-  "DownloadAttachment":"DownloadAttachment",
+  "Delete Record":"Delete Record",
+  "Create Record":"Create Record",
+  "Export Record":"Export Record",
+  "Download Attachment":"Download Attachment",
   "Log":"Log",
-  "MultiUpload":"MultiUpload",
+  "Multiple File Upload":"Multiple File Upload",
   "MultiUploadFailList":"MultiUploadFailList",
   "UnFile":"UnFile",
   "UnRecord":"UnRecord",
@@ -44,18 +44,20 @@
   "Edited":"Edited",
   "Created":"Created",
   "CoverConfirm":"CoverConfirm",
-  "NoData":"NoData",
-  "PleaseSelected":"PleaseSelected",
-  "PleaseType":"PleaseType",
+  "No Data":"No Data",
+  "Please Select":"Please Select",
+  "Please Type":"Please Type",
   "Tips":"Tips",
   "EntityStorageDescription":"EntityStorageDescription",
   "multiUpload":"multiUpload",
   "UploadAttach":"UploadAttach",
   "Edit":"Edit",
-  "DocumentPath":"DocumentPath",
+  "Document Path":"Document Path",
   "PreviewFile":"PreviewFile",
   "UploadSuccessCount":"UploadSuccessCount",
   "UploadFailCount":"UploadFailCount",
-  "DeleteConfirm":"DeleteConfirm",
-  "FileTimeDateRangeError":"FileTimeDateRangeError"
+  "Confirm delete":"Confirm delete",
+  "FileTimeDateRangeError":"FileTimeDateRangeError",
+  "Warning":"Warning",
+  "Page {0} of {1} ({2} items)":"Page {0} of {1} ({2} items)"
 }
\ No newline at end of file

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

 {
-  "DocumentAttr":"档案属性",
+  "Document Attribute":"档案属性",
   "Document":"档案",
   "IsRequired":"为必填字段，不能为空，请检查",
   "PleaseChecksRequired":"请检查必填字段",
-  "DocumentType":"档案类型",
-  "DocumentName":"档案名称",
-  "BusinessLine":"业务线",
-  "CorporationName":"公司名称",
-  "AvailabilityDate":"文件生效日期",
-  "Duration":"所属期间",
-  "DueDate":"到期日",
-  "TaxType":"税种",
-  "EntityIndex":"实物索引号",
-  "EntityStorageLocation":"实物存放地点",
-  "EntityCustodian":"保管人",
-  "ApprovalStatus":"审批状态",
+  "Document Type":"档案类型",
+  "Document Name":"档案名称",
+  "Business Line":"业务线",
+  "Company Name":"公司名称",
+  "Effective_Date":"文件生效日期",
+  "Period":"所属期间",
+  "Due Date":"到期日",
+  "Tax Type":"税种",
+  "Storage Index":"实物索引号",
+  "Storage Location":"实物存放地点",
+  "Custodian":"保管人",
+  "Approval Status":"审批状态",
   "ApprovalPass":"审批通过",
   "ApprovalReject":"拒绝审批",
   "ApprovalStandby":"待审批",
-  "UploadDate":"上传日期",
+  "Upload Date":"上传日期",
   "Creator":"创建人",
   "Remarks":"档案备注",
-  "MoreFields":"查看更多",
-  "LessFields":"收起",
+  "More":"查看更多",
+  "Less":"收起",
   "Search":"查询",
   "Reset":"重置",
   "Preview":"预览",
-  "DelRecord":"删除记录",
-  "CreateRecord":"新建记录",
-  "ExportTable":"导出列表",
-  "DownloadAttachment":"下载附件",
+  "Delete Record":"删除记录",
+  "Create Record":"新建记录",
+  "Export Record":"导出列表",
+  "Download Attachment":"下载附件",
   "Log":"日志",
-  "MultiUpload":"批量上传",
+  "Multiple File Upload":"批量上传",
   "MultiUploadFailList":"批量上传失败列表",
   "UnFile":"未支持的文件类型",
   "UnRecord":"当前记录没有附件信息",
@@ -46,17 +46,19 @@
   "Created":"新建成功",
   "CoverConfirm":"当前记录已经存在，是否进行覆盖？",
   "NoData":"当前无数据可下载",
-  "PleaseSelected":"请选择",
-  "PleaseType":"请输入",
+  "Please Select":"请选择",
+  "Please Type":"请输入",
   "Tips":"提示讯息",
   "EntityStorageDescription":"请将实物档案存放地址精确到某个档案柜",
   "multiUpload":"批量上传",
   "UploadAttach":"上传附件",
   "Edit":"编辑",
-  "DocumentPath":"档案路径",
+  "Document Path":"档案路径",
   "PreviewFile":"预览文件",
   "UploadSuccessCount":"个档案上传成功:",
   "UploadFailCount":"个档案上传失败:",
-  "DeleteConfirm":"是否确认删除记录？",
-  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'"
+  "Confirm delete":"是否确认删除记录？",
+  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'",
+  "Warning":"提示",
+  "Page {0} of {1} ({2} items)":"当前 {0}页 /共 {1}页 ({2} 项)"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js

@@ -78,7 +78,7 @@ frameworkModule.controller('appUsrOperateLogController',
                     },
                     pager: {
                         allowedPageSizes: 5,
-                        infoText: "当前 {0}页 /共 {1}页 ({2} 项)",
+                        infoText:$translate.instant('Page {0} of {1} ({2} items)'),
                         showInfo: true,
                         showNavigationButtons: true,
                         showPageSizeSelector: true,

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.html

@@ -40,7 +40,7 @@
 
                             <button class="btn log-export-btn" ng-click="exportTableData()">
                                 <i class="fa fa-file-excel-o"></i>
-                                <span translate="ExportTable"></span>
+                                <span translate="Export Record"></span>
                             </button>
                             <div dx-data-grid="dataGridOptions"></div>
                         </div>