diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 711e22c22..bdd76c0e0 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -401,6 +401,7 @@ position: absolute; right: 330px; top: 50%; + font-size: 14px; transform: translate-Y(-50%); } @@ -411,12 +412,14 @@ position: absolute; right: 450px; top: 50%; + font-size: 14px; transform: translate-Y(-50%); } .text-text-right-text-One { width: 120px; height: 100%; + font-size: 14px; text-align: center; position: absolute; right: 210px; @@ -427,6 +430,7 @@ .text-text-right-text { width: 210px; height: 100%; + font-size: 14px; text-align: center; position: absolute; right: 0; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 387241d51..9648855e7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2026,7 +2026,7 @@ contentList[i].verifyFlowStatus == 'Duty Person Rejected' || contentList[i].designFlowStatus == 'Duty Person Rejected') { idList.push(contentList[i].id) - }else if(contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA'){ + } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') { detailedWarningList.push( < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } else { @@ -2382,15 +2382,19 @@ for (let i = 0; i < selectedRowKeysList.length; i++) { if ( (selectedRowKeysList[i].verifyFlowStatus == 'List to be released' || + selectedRowKeysList[i].verifyFlowStatus == 'List to be checked' || + selectedRowKeysList[i].verifyFlowStatus == 'Regulatory engineer returns' || + selectedRowKeysList[i].verifyFlowStatus == 'Duty Person Rejected' || + selectedRowKeysList[i].verifyFlowStatus == 'Termination of task' || selectedRowKeysList[i].verifyFlowStatus == 'Compliance' || - selectedRowKeysList[i].verifyFlowStatus == 'Non-Compliance' || - selectedRowKeysList[i].verifyFlowStatus == 'To be tracked' || selectedRowKeysList[i].verifyFlowStatus == 'NA') && (selectedRowKeysList[i].designFlowStatus == 'List to be released' || + selectedRowKeysList[i].designFlowStatus == 'List to be checked' || + selectedRowKeysList[i].designFlowStatus == 'Regulatory engineer returns' || + selectedRowKeysList[i].designFlowStatus == 'Duty Person Rejected' || + selectedRowKeysList[i].designFlowStatus == 'Termination of task' || selectedRowKeysList[i].designFlowStatus == 'Compliance' || - selectedRowKeysList[i].designFlowStatus == 'Non-Compliance' || - selectedRowKeysList[i].designFlowStatus == 'To be tracked' || selectedRowKeysList[i].designFlowStatus == 'NA')) { isTrue = true } else { @@ -2418,9 +2422,9 @@ }) } }) - }else{ + } else { this.$confirm({ - content: _this.$t('thereProcessInProgressDeletion')+'?', + content: _this.$t('thereProcessInProgressDeletion') + '?', onOk() { let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) postAction(_this.url.deleteBatch, { @@ -2456,15 +2460,19 @@ deleteLib(val) { let _this = this if ((val.verifyFlowStatus == 'List to be released' || + val.verifyFlowStatus == 'List to be checked' || + val.verifyFlowStatus == 'Regulatory engineer returns' || + val.verifyFlowStatus == 'Duty Person Rejected' || + val.verifyFlowStatus == 'Termination of task' || val.verifyFlowStatus == 'Compliance' || - val.verifyFlowStatus == 'Non-Compliance' || - val.verifyFlowStatus == 'To be tracked' || - val.verifyFlowStatus == 'NA')&& + val.verifyFlowStatus == 'NA') && (val.designFlowStatus == 'List to be released' || - val.designFlowStatus == 'Compliance' || - val.designFlowStatus == 'Non-Compliance' || - val.designFlowStatus == 'To be tracked' || - val.designFlowStatus == 'NA')){ + val.designFlowStatus == 'List to be checked' || + val.designFlowStatus == 'Regulatory engineer returns' || + val.designFlowStatus == 'Duty Person Rejected' || + val.designFlowStatus == 'Termination of task' || + val.designFlowStatus == 'Compliance' || + val.designFlowStatus == 'NA')) { this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { @@ -2478,9 +2486,9 @@ }) } }) - }else{ + } else { this.$confirm({ - content: _this.$t('thereProcessInProgressDeletion')+'?', + content: _this.$t('thereProcessInProgressDeletion') + '?', onOk() { deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => { if (res.success) { @@ -2950,10 +2958,10 @@ dataSource[i].designFlowStatus == 'Duty Person Rejected') { idList.push(dataSource[i].id) this.rowKeysSuccessList.push(dataSource[i]) - } else if(dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA'){ + } else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') { this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) - }else { + } else { this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } @@ -3035,7 +3043,7 @@ } // _this.startProcess(dataList[i], 2, this.requestsNum) } - }else if(dataList[i].designFlowStatus == 'NA'){ + } else if (dataList[i].designFlowStatus == 'NA') { _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } else { @@ -3056,7 +3064,7 @@ } // _this.startProcess(dataList[i], 4, this.requestsNum) } - }else if(dataList[i].verifyFlowStatus == 'NA'){ + } else if (dataList[i].verifyFlowStatus == 'NA') { _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } else {