diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index d0789a960..d27179eb0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -463,7 +463,7 @@ - '{{$t('completed')}}' + '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}' @@ -1200,7 +1200,7 @@ } else { this.selectedRowKeysValue.forEach((item, index) => { console.log(item.state) - if (item.state !== '待填写' && item.state !== 'To be filled') { + if (item.state !== '待填写' && item.state !== 'To be filled' && item.state !== '填写人退回' && item.state !== 'Rejected by the applicant' && item.state !== '认证工程师退回' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1665,15 +1665,20 @@ this.returnData() } else if (homoJurisdictionReturn == 0) { this.visibleoperationFailed = true + this.returnData() } }, // 退回 returnData() { // todo 退回没有选择数据 let _array = [] + this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted') this.selectedRowKeysValue.forEach((item, index) => { _array.push(item.id) }) + if(_array.length == 0){ + return + } let _this = this let param = { ids: _array.join(','), currentPersonRole: this.currentPersonRole,