From 559f9496455244f57d68bb35b0176ea6831c36c1 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 5 Aug 2022 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AdjustareaSofrespon/index.vue  |  6 ++---
 .../src/components/tableCollection/index.vue  |  2 +-
 .../ParameterItemCollectionList.vue           | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue
index 05beafa9c..f88517b41 100644
--- a/jero-web/src/components/AdjustareaSofrespon/index.vue
+++ b/jero-web/src/components/AdjustareaSofrespon/index.vue
@@ -11,10 +11,10 @@
       >
         <a-row :gutter='24'>
           <a-col :span="24">
-            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='dutyTerritory'>
+            <a-form-model-item ref='region' :label="$t('NareaOfResponsibility')" prop='dutyTerritory'>
               <j-dict-select-tag class="box-input" v-model="form.dutyTerritory"
                                  @input="handleInput('dutyTerritory')"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
             </a-form-model-item>
@@ -98,7 +98,7 @@ export default {
       form: {},
       rules: {
         dutyTerritory:[
-          { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' }
+          { required: true, message: this.$t('PleaseSelect')+this.$t('NareaOfResponsibility'), trigger: 'change' }
         ]
       },
       areaTable: [],
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index f29c53e4e..df0a4ef53 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -46,7 +46,7 @@
            <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
            <span
-             v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "Wait Collect" || record.state == "Sdt Back"'>
              <span :title='record.dataValue'
                @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
            </span>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index b767cba40..ca4ca84d0 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -17,19 +17,19 @@
                 <a-row :gutter="24" style='margin-left: -90px;'>
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('newNiONumber')">
-                        <span>{{$t('newNiONumber')}}</span>
+                      <div class="title-text" :title="$t('NNiONumber')">
+                        <span>{{$t('NNiONumber')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NNiONumber')"
                                v-model="formInline.nioNumber"></j-input>
                     </div>
                   </a-col>
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('ParameterName')">
-                        <span>{{$t('ParameterName')}}</span>
+                      <div class="title-text" :title="$t('NParameterName')">
+                        <span>{{$t('NParameterName')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
                                v-model="formInline.paramsName"></j-input>
                     </div>
                   </a-col>
@@ -46,21 +46,21 @@
 <!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('areaOfResponsibility')">
-                        <span>{{$t('areaOfResponsibility')}}</span>
+                      <div class="title-text" :title="$t('NareaOfResponsibility')">
+                        <span>{{$t('NareaOfResponsibility')}}</span>
                       </div>
                       <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                         :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
                                          :type="'select'"
                                          :triggerChange="false" :dictCode="'duty_territory'"/>
                     </div>
                   </a-col>
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('completedBy')">
-                        <span>{{$t('completedBy')}}</span>
+                      <div class="title-text" :title="$t('dre')">
+                        <span>{{$t('dre')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
                                v-model="formInline.dre"></j-input>
                     </div>
                   </a-col>