From 6e7ec4b80033dfd28bf79d52b9f63cf0db77d5e5 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 27 Jun 2022 14:13:29 +0800
Subject: [PATCH] [update]

---
 .../components/SynchronousSubmissionLibrary/index.vue    | 4 ++--
 jero-web/src/components/tableCollection/index.vue        | 9 +++++++--
 .../components/TaskParameterCollection.vue               | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue
index 41fe4c090..7edd7ad05 100644
--- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue
+++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue
@@ -111,11 +111,11 @@ export default {
         .then( (res) =>{
           console.log(res,'res')
           if (res.data.success) {
-            _this.$message.success(res.data.message)
+            _this.$message.success(_this.$t('OperationSuccessful'))
             this.$emit('areaVisibsynchronous', false)
             this.$emit('GetgetTableList')
           }else{
-            _this.$message.warning(res.data.message)
+            _this.$message.warning(_this.$t('operationFailed'))
           }
         })
         .catch( (error) =>{
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 1f7548d3c..335cbdc16 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -477,6 +477,9 @@
             this.dataSource = res.result
             this.total = res.result.total
             this.selectedRowKeys = []
+            this.selectedRowrowValue = []
+            this.$emit('value', this.selectedRowKeys)
+            this.$emit('rowValue', this.selectedRowrowValue)
             this.loading = false
           } else {
             this.loading = false
@@ -486,10 +489,12 @@
       onChange(page, pageSize) {
       },
       onSelectChange(value, rowValue) {
+        this.selectedRowKeys = []
+        this.selectedRowrowValue = []
         this.selectedRowKeys = value
         this.selectedRowrowValue = rowValue
-        this.$emit('value', value)
-        this.$emit('rowValue', rowValue)
+        this.$emit('value', this.selectedRowKeys)
+        this.$emit('rowValue', this.selectedRowrowValue)
       },
       OperationClick(ol, item) {
         // this.$emit(ol.ClickEvent, item)
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index d36609392..7d6145e2d 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -286,7 +286,7 @@
           this.$message.warning(_this.$t('pleaseSelectData'))
         }else if(this.selectedRowKeys.length > 1){
           this.$message.warning(_this.$t('OnlyOneSelected'))
-        } else if(this.selectedRowKeysvalArray[0].state === '已完成'){
+        } else if(this.selectedRowKeysvalArray[0].state === '已完成'|| this.selectedRowKeysvalArray[0].state ==='Finished'){
           getAction(_this.url.changeExtension, { id: this.selectedRowKeys[0] }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))