diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 60a3b785c..8c523b79d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1978,5 +1978,5 @@ module.exports = { PlatformInformation:'Platform Information', Processdetails:'Process Details', matchempty:'The match is empty', - onlyDataProcessStatusDeleted:'Only data whose flow status is to be started can be deleted', + onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person', } \ 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 69c317448..5f96284a8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1551,7 +1551,7 @@ module.exports = { type: '类型', select: '选择', onlyDataWithProcessStatusDeleted: '只能删除流程状态为清单待发布和审查通过的数据', - onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起的数据', + onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起、审查通过和责任人拒绝的数据', complianceCertificationProgram: '合规认证计划', listPublishing: '清单发布', responsibilityConfirmation: '责任确认', diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue index 3d115990a..cb72fef94 100644 --- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue +++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue @@ -48,77 +48,79 @@ -
-
{{item.projectName}}
-
- - -
- {{$t('ProcessStatus')}} - +
+
+
{{item.projectName}}
+
+ + +
+ {{$t('ProcessStatus')}} + {{flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName}} -
-
- - -
- - -
- {{$t('Sponsor')}} - +
+
+ + +
+ + +
+ {{$t('Sponsor')}} + {{item.createBy}} -
-
- -
- {{$t('personLiable')}} - +
+
+ +
+ {{$t('personLiable')}} + {{flag == 'design'?item.designDutyIdName : item.verifyDutyIdName}} -
-
-
- - -
- {{$t('statisticalNodes')}} - +
+
+
+ + +
+ {{$t('statisticalNodes')}} + {{item.dutyDepart}} -
-
- -
- {{$t('areaOfResponsibility')}} - +
+
+ +
+ {{$t('areaOfResponsibility')}} + {{item.dutyTerritory_dictText}} -
-
-
- - - - - -
- {{$t('typeOfDeliverables')}} - +
+
+
+ + + + + +
+ {{$t('typeOfDeliverables')}} + {{flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName}} -
-
-
- - -
- {{$t('descriptionDeliverables')}} - +
+
+
+ + +
+ {{$t('descriptionDeliverables')}} + {{flag == 'design'?item.designRemark : item.verifyRemark}} -
-
-
+
+ + +
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue index 0bdd14ac0..e00a217bf 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue @@ -21,6 +21,7 @@
@@ -53,6 +54,7 @@
@@ -177,6 +179,7 @@ @@ -195,6 +198,7 @@
@@ -269,6 +275,7 @@
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue index e5c25409f..56fd57180 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue @@ -1500,7 +1500,7 @@ }, deleteLib(val) { let _this = this - if (val.flowStatus == 'List to be checked') { + if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Duty Person Rejected') { this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() {