From 469265a730ebed0e92e9588722787aeff9c99953 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 28 Dec 2022 14:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=88=A0=E9=99=A4=E5=A2=9E=E5=8A=A0=E6=9C=AA=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E7=8A=B6=E6=80=81=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                             | 2 +-
 jero-web/src/common/lang/zh-cn.js                             | 2 +-
 .../projectManagement/components/TaskParameterCollection.vue  | 4 ++--
 .../projectManagement/dialog/ProjectCollectionParameters.vue  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6c93a6b8e..13adbf197 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -752,7 +752,7 @@ module.exports = {
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
   NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
   theCurrent: 'The current status of this data is',
-  thisbuttonCompleted: 'This button can only be operated when the status is completed',
+  thisbuttonCompleted: 'You can operate this button only when the state is Completed or not Collected',
   Frozenstatus: 'Frozen status, can only be viewed',
   chinese: 'Chinese',
   integerOrDecimal: 'Integer Or Decimal',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 1b0874a40..575e30e6d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -768,7 +768,7 @@ module.exports = {
   Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
   NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查',
   theCurrent: '此数据当前状态为',
-  thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮',
+  thisbuttonCompleted: '当状态为"已完成或未收集"时，才可操作此按钮',
   Frozenstatus: '冻结状态,仅可以查看',
   chinese: '中文',
   integerOrDecimal: '整数或小数',
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index cc4d87d93..716bd1aec 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -294,7 +294,7 @@
         })
       },
       deleteLib(val) {
-        if (val.state === '已完成' || val.state === 'Finished') {
+        if (val.state === '已完成' || val.state === 'Finished' || val.state === '未收集' || val.state === 'Uncollected') {
           let _this = this
           this.$confirm({
             content: _this.$t('ConfirmDelete'),
@@ -389,7 +389,7 @@
         // 默认为0  可全部删除
         let flag = 1
         this.selectedRowKeysvalArray.forEach((item) => {
-          if (item.state !== '已完成' && item.state !== 'Finished') {
+          if (item.state !== '已完成' && item.state !== 'Finished' && item.state !== '未收集' && item.state !== 'Uncollected') {
             flag = 0
           }
         })
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index d6c03ca68..707d504ad 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -16,7 +16,7 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop='title'>
+              <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
                          :placeholder="$t('PleaseEnter')+$t('title')"
                          v-model='formData.title'/>