diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue index 92905cb59..9fc29bdf5 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue @@ -804,9 +804,9 @@ if (value.dutyDepart && value.dutyDepart.length > 0) { this.getDutyTerritoryOne(value.dutyDepart.join(',')) } - if (value.dutyTerritory && value.dutyTerritory.length > 0) { - this.queryPersonByProject(value.dutyTerritory.join(',')) - } + // if (value.dutyTerritory && value.dutyTerritory.length > 0) { + // this.queryPersonByProject(value.dutyTerritory.join(',')) + // } this.getRegulationNo() this.title = this.$t('edit') this.$nextTick(() => { 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 56fd57180..2aee9c74d 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue @@ -1136,8 +1136,9 @@ let ids = [] let notConditions = [] for (let i = 0; i < this.selectedRowKeysList.length; i++) { - if (this.selectedRowKeysList[i].flowStatus == 'List to be released' || - this.selectedRowKeysList[i].flowStatus == 'Review and pass') { + if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || + this.selectedRowKeysList[i].flowStatus == 'Review and pass' || + this.selectedRowKeysList[i].flowStatus == 'Duty Person Rejected') { ids.push(this.selectedRowKeysList[i].id) } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) @@ -1145,7 +1146,7 @@ } let data = '' if (notConditions && notConditions.length > 0) { - data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithProcessStatusDeleted') + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataProcessStatusDeleted') } if (ids && ids.length > 0) { this.$confirm({