Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period
# Conflicts: # jero-web/src/components/tableCollection/index1.vue # jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue # jero-web/src/views/documentManage/collection/index.vue # jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue # jero-web/src/views/projectManagement/components/listOfRegulations.vue # jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue # jero-web/src/views/projectManagement/projectStatusBoard/index.vue
This commit is contained in:
@@ -101,6 +101,7 @@ module.exports = {
|
||||
RoleCode: '角色编码',
|
||||
createTime: '创建时间',
|
||||
userName: '用户名称',
|
||||
userManual:'用户手册',
|
||||
selectOneRule: '请选择一个角色!',
|
||||
setAttribute: '请设置url.list2属性!',
|
||||
setDelAttribute: '请设置url.delete2 属性!',
|
||||
@@ -431,6 +432,7 @@ module.exports = {
|
||||
MessageType: '消息类型',
|
||||
NotificationTime: '通知时间',
|
||||
MessageNotification: '消息通知',
|
||||
MessageCenter:'消息中心',
|
||||
SeeMore: '查看更多',
|
||||
OperationSuccessful: '操作成功',
|
||||
Intheexport: '导出中...',
|
||||
@@ -1004,9 +1006,9 @@ module.exports = {
|
||||
taskConfirmationResponsiblePerson: '责任人任务确认',
|
||||
or: '或',
|
||||
warningTime: '预警时间',
|
||||
RegulationMonthlyManagement: '法规月报管理',
|
||||
RegulationMonthlyFill: '法规月报填写',
|
||||
RegulationMonthlyName: '法规月报名称',
|
||||
RegulationMonthlyManagement: '月报管理',
|
||||
RegulationMonthlyFill: '月报填写',
|
||||
RegulationMonthlyName: '月报名称',
|
||||
monthlyLanguage: '月报语种',
|
||||
releaseStatus: '发布状态',
|
||||
uploadedBy: '上传人',
|
||||
@@ -1178,6 +1180,7 @@ module.exports = {
|
||||
RemarkInfo: '备注信息',
|
||||
initiateDocumentComparison: '发起文档对比',
|
||||
comparativeComments: '对比评论',
|
||||
Comparisonofarticles:'条款对比评论',
|
||||
viewTheComparisonResults: '查看对比结果',
|
||||
addFullTextComment: '添加全文评论',
|
||||
turnOffAutomaticMatching: '关闭自动匹配',
|
||||
|
||||
Reference in New Issue
Block a user