From 12ec9b71ba6241b121b00bb0a04f6293d7c508d0 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 20 Feb 2023 14:58:29 +0800
Subject: [PATCH] =?UTF-8?q?uat-58=E3=80=8161=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 @@
             </span>
             <!--        分配填写人  -->
             <span v-else-if='jurisdiction === "SDTFPTXRHOMO"' class="text-wraning">
-              '{{$t('completed')}}'
+              '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}'
             </span>
             <!--            引用参数-->
             <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
@@ -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,