diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a9277aab8..947e48249 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1404,4 +1404,6 @@ module.exports = { missionRejection:'Mission Rejection', turnToDo:'Turn To Do', initiateTask:'Initiate a Task', + compliancereport:'Generate compliance report', + todocenter:'To-do center', } \ 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 8e64e06f5..e963170f8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1505,4 +1505,6 @@ module.exports = { missionRejection:'任务拒绝', turnToDo:'转办', initiateTask:'发起任务', + compliancereport:'生成合规报告', + todocenter:'待办中心', } \ 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 bc1917952..7b15b0029 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -11,18 +11,19 @@
+ + + + + + +
- - {{$t('comment')}} -
-
- - {{$t('historicalVersion')}} + @click="todocenterClick"> + + {{$t('todocenter')}}
{{$t('UpdateLog')}}
+
+ + {{$t('historicalVersion')}} +
@@ -308,6 +315,10 @@ text[i].classList.add('Virtual-detail-left-text-color') } } + }, + //待办中心跳转 + todocenterClick(){ + }, UpdateLogClick() { this.$refs.updateLogRef.getList({ projectLibraryId: this.$route.query.id }) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index cc0fad2d1..481f43746 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -228,30 +228,30 @@ - -
-
- * - {{$t('certifiedEngineer')}} -
- - - - - {{ item.name}} - - - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + +
@@ -277,7 +277,7 @@
- + @@ -295,23 +295,23 @@ - - - - - - - - - - - - - - - - - + + + +
+
+ {{$t('remarks')}} +
+ + + +
+
+
- -
-
- {{$t('Sponsor')}} -
- - - - - {{ item.name }} - - - - - - - - - - -
-
@@ -383,30 +353,77 @@
- -
{{$t('cutoffTime')}}
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + -  {{$t('PrehomoConfirmation')}} -
- - -
-
- {{$t('Sponsor')}} -
- - - - - {{ item.name }} - - - - - - - - - - -
-
- -
-
- {{$t('personLiable')}} -
- - - - - {{ item.name }} - - - - - - - - - - -
-
-
- - -
-
- {{$t('cutoffTime')}} -
- - - -
-
-
- - -
-
- {{$t('typeOfDeliverables')}} -
- - - - - - - - - -
-
- -
-
- {{$t('deliverableTemplate')}} -
- - - {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' - || - formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
-
-
- - -
-
- {{$t('descriptionDeliverables')}} -
- - - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
-
- {{$t('Sponsor')}} -
- - - - - {{ item.name }} - - - - - - - - - - -
-
@@ -711,12 +698,6 @@
- -
@@ -734,7 +715,44 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - {{$t('listConfirmationRejectionReason')}} -
+ + + -
- - -
-
- {{$t('rejectedBy')}} -
-
- {{item.createBy ? item.createBy : '--'}} -
-
-
- -
-
- {{$t('rejectionTime')}} -
-
- {{item.rejectTime ? item.rejectTime : '--'}} -
-
-
-
- - -
-
- {{$t('rejectReason')}} -
-
- {{item.rejectCause ? item.rejectCause : '--'}} -
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- {{$t('taskConfirmationRejectionReason')}} -
+ + + -
- - -
-
- {{$t('rejectedBy')}} -
-
- {{item.createBy ? item.createBy : '--'}} -
-
-
- -
-
- {{$t('rejectionTime')}} -
-
- {{item.rejectTime ? item.rejectTime : '--'}} -
-
-
-
- - -
-
- {{$t('rejectReason')}} -
-
- {{item.rejectCause ? item.rejectCause : '--'}} -
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 838e48027..c8871f899 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -97,7 +97,19 @@
-
+
+
+ + {{ $t('Transfer') }} +
+
+ + {{ $t('bringInRelevantPersonnel') }} +
+
+ + {{ $t('BatchSetting') }} +