diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b5d1ddb5f..4b1d8cb60 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1743,4 +1743,5 @@ module.exports = { marketCertificationList:'Market Certification List', uploadedfilelarger:'The uploaded file is larger than', marketCertificationListDetails:'Market Certification List Details', + andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list', } \ 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 08346013d..787226665 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1846,4 +1846,5 @@ module.exports = { uploadedfilelarger:'文件大于50M', marketCertificationList:'市场认证清单', marketCertificationListDetails:'市场认证清单详情', + andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 673ce2d8c..4aa42f3e2 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1600,25 +1600,44 @@ } } for (let i = 0; i < content.length > 0; i++) { - if (content[i].verifyFlowStatus == 'List to be checked' || - content[i].designFlowStatus == 'List to be checked' || - content[i].verifyFlowStatus == 'Task to be confirmed' || - content[i].designFlowStatus == 'Task to be confirmed' || - content[i].verifyFlowStatus == 'Results to be submitted' || - content[i].designFlowStatus == 'Results to be submitted' || - content[i].verifyFlowStatus == 'Results to be reviewed' || - content[i].designFlowStatus == 'Results to be reviewed') { - this.questionIdList.push(content[i].id) - } else { - detailedWarningList.push(content[i].serialNumber) + if (this.roleSwitchingCode == 0) { + if (content[i].verifyFlowStatus == 'List to be checked' || + content[i].designFlowStatus == 'List to be checked' || + content[i].verifyFlowStatus == 'Task to be confirmed' || + content[i].designFlowStatus == 'Task to be confirmed' || + content[i].verifyFlowStatus == 'Results to be submitted' || + content[i].designFlowStatus == 'Results to be submitted' || + content[i].verifyFlowStatus == 'Results to be reviewed' || + content[i].designFlowStatus == 'Results to be reviewed') { + this.questionIdList.push(content[i].id) + } else { + detailedWarningList.push(content[i].serialNumber) + } + } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) { + if (content[i].verifyFlowStatus == 'Task to be confirmed' || + content[i].designFlowStatus == 'Task to be confirmed' || + content[i].verifyFlowStatus == 'Results to be submitted' || + content[i].designFlowStatus == 'Results to be submitted' || + content[i].verifyFlowStatus == 'Results to be reviewed' || + content[i].designFlowStatus == 'Results to be reviewed') { + this.questionIdList.push(content[i].id) + } else { + detailedWarningList.push(content[i].serialNumber) + } } } if (detailedWarningList && detailedWarningList.length > 0) { - this.questionWarning.push( - < div > { - detailedWarningList - .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') - } < /div>) + if (this.roleSwitchingCode == 0){ + this.questionWarning.push( + < div > { + detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + } < /div>) + }else if(this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30){ + this.questionWarning.push( + < div > { + detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')+this.$t('andTheProcessStatusTheList') + } < /div>) + } } if (this.questionIdList && this.questionIdList.length > 0) { this.visibleQuestion = true