diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index 6d214bb11..f393e74a7 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -1048,9 +1048,19 @@ export default { // 申请重新匹配 applyforrematch(){ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - let content = [] - console.log(this.selectedRowKeysRecord) - this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + let statusList = [] + this.selectedRowKeysRecord.forEach(item => { + if(item.status){ + statusList.push(item.status) + } + }) + const index = statusList.indexOf('locked'); + console.log(index) + if (index !== -1) { + this.$message.warning(this.$t('selectlocked')) + } else { + this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } } else { this.$message.warning(this.$t('selectLeastOne')) } @@ -1128,10 +1138,10 @@ export default { postAction('/ota/otaManageApplyEO/submit', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - if(res.msgList && res.msgList.length == 0){ + if(res.result.msgList && res.result.msgList.length == 0){ this.getList() }else{ - this.selectedRowKeysValue = res.msgList + this.selectedRowKeysValue = res.result.msgList this.visibleoperationFailed = true } } else {