diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b18a0b0e6..a9277aab8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1403,4 +1403,5 @@ module.exports = { missionAccepted:'Mission Accepted', missionRejection:'Mission Rejection', turnToDo:'Turn To Do', + initiateTask:'Initiate a Task', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d142c0cd5..8e64e06f5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1504,4 +1504,5 @@ module.exports = { missionAccepted:'任务接受', missionRejection:'任务拒绝', turnToDo:'转办', + initiateTask:'发起任务', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 296cb1747..bc1917952 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -34,7 +34,7 @@ v-if="textTitle === $t('certificationList') || textTitle === $t('listOfRegulations')" @click="roleSwitchingClick"> - {{$t('roleSwitching')}} + {{roleSwitchName}} @@ -59,12 +59,12 @@ {{$t('certificationList')}} - - - - - - + + + + + + @@ -127,6 +127,7 @@ @@ -134,7 +135,9 @@ - + @@ -187,8 +190,33 @@ historicalVersionUrl: '', queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId' }, + roleSwitchListCn: { + '0': 'studio工程师', + '1': '法规工程师', + '2': '认证工程师', + '4': '法规工程师/认证工程师', + '11': '领导角色', + '12': '系统管理员', + '13': 'Viewer', + '14': '品牌管理员', + '20': '接口人', + '21': '责任人' + }, + roleSwitchListEn: { + '0': 'R&H Studio', + '1': 'studio', + '2': 'homo', + '4': 'Regulatory Engineer/Certification Engineer', + '11': 'R&H Manager', + '12': 'admin', + '13': 'Viewer', + '14': 'BrandAdministrator', + '20': 'Interface person', + '21': 'Person liable' + }, areaOfResponsibility: {}, - engineeringInterfacePerson: '' + engineeringInterfacePerson: '', + roleSwitchName: '' } }, created() { @@ -360,6 +388,15 @@ } else { this.$refs.certificationListRef.roleSwitchingClick() } + }, + getRoleSwitch(value) { + console.log(value) + let long = localStorage.getItem('language') || 'zh-cn' + if (long == 'zh-cn'){ + this.roleSwitchName = this.roleSwitchListCn[value] + }else{ + this.roleSwitchName = this.roleSwitchListEn[value] + } } } } diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 75489baf1..8430cd4f2 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -208,7 +208,7 @@ this.disabled = true } } else { - if (val.roleCode == '2' || val.roleCode == '4') { + if (val.roleCode == '2') { this.disabled = false } else { this.disabled = true diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 98d16cee0..0f908d6a8 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -34,10 +34,10 @@ :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam.flowStatus"> - - {{ item.label }} + + {{ item.name }} @@ -67,67 +67,95 @@
+ +
{{ $t('export') }}
-
- + + +
+ {{ $t('preservation') }}
+ +
{{ $t('Transfer') }}
+ +
{{ $t('BatchSetting') }}
+ +
{{ $t('CertificationDirectory') }}
-
- + + +
+ {{ $t('changeSetting') }}
-
+ + +
{{ $t('referenceDeliverables') }}
+