Merge branch 'dev_third_stage'

# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js
2022-07-05 15:34:57 +08:00
parent c3c3baefe5 89424f793f
commit 7ddac7eb75
100 changed files with 2523 additions and 352 deletions
@@ -176,6 +176,8 @@ module.exports = {
  MenuType: 'Menu type',
  menu: 'Menu',
  ButtonsPermissions: 'Buttons / permissions',
+  ConventionalExport:'Conventional export',
+  CustomExport:'Custom export',
  assembly: 'Assembly',
  route: 'Route',
  AddSubmenu: 'Add submenu',
@@ -385,6 +387,7 @@ module.exports = {
  StandardDetails: 'Standard Details',
  whole: 'Whole',
  DocumentLibrary: 'Document Library',
+  GeneralExportInformation:'General export information',
  DocumentComparisonLibrary: 'Document comparison Library',
  weekly: 'Weekly',
  SyncLibrary: 'Sync to doc. library',
@@ -727,6 +730,7 @@ module.exports = {
  // 参数收集开始
  MaintainConfigureInfo: 'Maintain configuration information',
  ParameteItemCollectionList: 'Parameter item collection list',
+  ParameterViewPage:'Parameter View page',
  Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
  Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
  NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
@@ -757,6 +761,7 @@ module.exports = {
  operatethisbutton: 'You do not have permission to operate this button',
  ParameterLibrary: 'Parameter Library',
  referenceparameter: 'Reference Parameter',
+  tempSave: 'Temp Save',
  Assignedby: 'Assignedby',
  CompulsoryWithdrawal: 'CompulsoryWithdrawal',
  SynchronousReportLibrary: 'Synchronous Report Library',
@@ -791,6 +796,10 @@ module.exports = {
  releaseVersion: 'Release Version',
  parameterTemplate: 'Parameter Template',
  contentDescription: 'Content Description',
+  WhetherMergeParameters:'Whether to merge parameters',
+  merge:'merge',
+  nonjoinder:'nonjoinder',
+  MergeSeparator:'Merge separator',
  parameterTemplateExportName: 'Parameter List',
  parameterDataExport: 'Parameter Export Data',
  // 参数收集结束
@@ -941,14 +950,14 @@ module.exports = {
  reportNotUploaded: 'Report not uploaded',
  position: 'position',
 //  认证权限状态
-  CollectionInitiated: 'Collection to be initiated',
-  handledInterface: 'To be handled by the project interface',
-  ReturnedPerson: 'Returned by project contact person',
-  completed: 'To be completed',
-  Filledreturn: 'Filled by return',
-  Submitted: 'Submitted',
-  ReturnedEngineer: 'Returned by Certification Engineer',
-  SynchronizedLibrary: 'Synchronized to the upper reporting Library',
+  CollectionInitiated: 'Wait Collect',
+  handledInterface: 'Wait Sdt',
+  ReturnedPerson: 'Sdt Back',
+  completed: 'Wait Fill',
+  Filledreturn: 'Dre Back',
+  Submitted: 'Submit',
+  ReturnedEngineer: 'Cert Back',
+  SynchronizedLibrary: 'Sync Report',
  Statusis: 'Statusis',
  toHavePermission: 'To Have Permission',
  and: 'and',
@@ -1055,7 +1064,7 @@ module.exports = {
  Ftext: 'Text+Pull single+File',
  Nnothing: 'Null',
  Nchinese: 'Chinese',
-  NpositiveInteger: 'Positive integer',
+  NpositiveInteger: 'Integer',
  NPositivefloatingpointnumber: 'Positive float',
  NintegerOrDecimal: 'Integer decimal',
  NOneDecimalPlace: 'Decimal one',
@@ -1073,4 +1082,9 @@ module.exports = {
  pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
  TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
  theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank',
+  bringInTheProjectInterface:'Bring in the project interface',
+  theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
+  defaultTemplate:'Default template',
+  newRequestCommentListTemplate:'New request for comment list template',
+  NewReleasedStandardTemplate:'New released standard template',
 }
@@ -178,6 +178,8 @@ module.exports = {
  MenuType: '菜单类型',
  menu: '菜单',
  ButtonsPermissions: '按钮/权限',
+  ConventionalExport:'常规导出',
+  CustomExport:'自定义导出',
  assembly: '组件',
  route: '路径',
  AddSubmenu: '添加子菜单',
@@ -280,7 +282,7 @@ module.exports = {
  enterMenuTitle: '请输入菜单标题',
  enterAuthorizationPolicy: '请输入授权策略',
  AuthorizationIDExists: '授权标识已存在',
-  enterPositiveInteger: '请输入正整数',
+  enterPositiveInteger: '请输入整数',
  RuleName: '规则名称',
  enterRuleName: '请输入规则名称',
  RuleField: '规则字段',
@@ -390,6 +392,7 @@ module.exports = {
  StandardDetails: '标准详情',
  whole: '全部',
  DocumentLibrary: '文档库',
+  GeneralExportInformation:'常规导出信息',
  DocumentComparisonLibrary: '文档对比库',
  weekly: '周报',
  SyncLibrary: '同步至文档库',
@@ -693,7 +696,7 @@ module.exports = {
  confirmOverrule: '确认驳回？',
  The: '第',
  submitted: '条数据已提交不能重复提交',
-  incorrectsubmitted: '状态有误；只能提交状态为待确认的数据',
+  incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据',
  basicInformationOfParameters: '项目基本信息',
  regulatoryCertificationTaskPlan: '法规/认证任务计划',
  bringInRelevantPersonnel: '带入相关人员',
@@ -742,6 +745,7 @@ module.exports = {
  // 参数收集
  MaintainConfigureInfo: '维护配置信息',
  ParameteItemCollectionList: '参数项收集清单',
+  ParameterViewPage:'参数项查看页',
  Areyousureparameteritems: '确认提交所选参数项嘛?',
  Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
  NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查',
@@ -772,6 +776,7 @@ module.exports = {
  operatethisbutton: '没有权限操作此按钮',
  ParameterLibrary: '参数库',
  referenceparameter: '引用参数',
+  tempSave: '暂存',
  Assignedby: '分配填写人',
  CompulsoryWithdrawal: '强制撤回',
  SynchronousReportLibrary: '同步上报库',
@@ -806,6 +811,10 @@ module.exports = {
  releaseVersion: '发布版本',
  parameterTemplate: '参数模板',
  contentDescription: '内容说明',
+  WhetherMergeParameters:'是否合并参数',
+  merge:'合并',
+  nonjoinder:'不合并',
+  MergeSeparator:'合并分隔符',
  parameterTemplateExportName: '参数项列表',
  parameterDataExport: '参数项导出数据',
  // 参数收集结束
@@ -1064,7 +1073,7 @@ module.exports = {
  Ftext: '文本+下拉单选+附件',
  Nnothing: '无',
  Nchinese: '中文',
-  NpositiveInteger: '正整数',
+  NpositiveInteger: '整数',
  NPositivefloatingpointnumber: '正浮点数',
  NintegerOrDecimal: '整数或小数',
  NOneDecimalPlace: '一位小数',
@@ -1077,4 +1086,9 @@ module.exports = {
  English:'英文',
  requiredParametersEmpty:'必填参数不能为空',
  theResponsiblePersonAndDeadlineClank:'的责任人、截止时间不能为空',
+  bringInTheProjectInterface:'带入工程接口人',
+  theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存',
+  defaultTemplate:'默认模板',
+  newRequestCommentListTemplate:'新征求意见清单模板',
+  NewReleasedStandardTemplate:'新发布标准模板',
 }