From 734d7495ac84797d6e3d9fb2bc470645f53ccdff Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 8 Dec 2022 15:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88?=
 =?UTF-8?q?=20=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                          | 1 +
 jero-web/src/common/lang/zh-cn.js                          | 1 +
 .../components/ParameterItemCollectionList.vue             | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 26b9171b5..905dde08b 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -737,6 +737,7 @@ module.exports = {
   Attentionfreeze: 'Note: Note: The item can no longer be configured after its frozen. ',
   Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.',
   Datastatusis: 'Datastatusis',
+  Datastateexcept: 'Data state except',
   Dropdownradio: 'Drop Down Radio',
   Dropdownmultipleselection: 'Drop down multiple selection',
   a: '+',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2f30bda20..80ded9963 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -753,6 +753,7 @@ module.exports = {
   Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。',
   Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。',
   Datastatusis: '数据状态为',
+  Datastateexcept: '数据状态除了',
   Dropdownradio: '下拉单选',
   Dropdownmultipleselection: '下拉多选',
   a: '+',
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 2ffe1f42f..a6d64d3ac 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -425,7 +425,7 @@
           <!--          认证工程师-提示-->
           <div style='font-size: 16px;color: red;text-align: center' v-if='NoEngineer === 1'>
             {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
-            $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
+            $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}}
             <!--            下发收集时-->
             <span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
               '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
@@ -458,7 +458,7 @@
             </span>
             <!--            强制撤回-->
             <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
-              '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
+              '{{$t('SynchronizedLibrary')}}'{{$t('or')}}'{{$t('CollectionInitiated')}}'
             </span>
             <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning">
               {{$t('completed')}}
@@ -1077,7 +1077,8 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
+              console.log(item)
+              if (item.state == '已同步至上报库' || item.state == 'Synced to library' || item.state == '待发起收集' || item.state == 'To be collected') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'homoQZTH'
                 flag = 0