From 9c3445dad8da818574b62e9f1fc693c0ac6cf325 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 25 May 2022 18:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
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 +
 .../processCenter/components/engineeringConfirmation.vue      | 2 +-
 jero-web/src/views/projectManagement/components/TaskList.vue  | 4 +++-
 .../views/projectManagement/components/responsibilityList.vue | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index bd6ea6376..576123a9f 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -892,4 +892,5 @@ module.exports = {
   notSelected:'Not selected',
   ExportReport:'Export Report',
   basicInformation:'Basic Information',
+  replyFromProjectContact:'Reply from project contact person',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 6dd6e00ee..aed7ce7f6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -897,4 +897,5 @@ module.exports = {
   notSelected:'未选择',
   ExportReport:'导出报告',
   basicInformation:'基础信息',
+  replyFromProjectContact:'工程接口人回复',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index cc42503a8..ab895aae0 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -251,7 +251,7 @@
           </a-row>
           <a-row :gutter="24" style="margin-bottom: 18px">
             <a-col :span="5">
-              <div class="text-field-left">{{$t('replyFromProjectContactPerson')}}:</div>
+              <div class="text-field-left">{{$t('replyFromProjectContact')}}:</div>
             </a-col>
             <a-col :span="19">
               <div class="text-field-right">
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 51a4d6989..35d961293 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -255,9 +255,11 @@
       }
     },
     mounted() {
+      if (this.areaOfResponsibility.dutyTerritory){
+        this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory
+      }
       this.getList()
       this.long = localStorage.getItem('language') || 'zh-cn'
-      console.log(this.areaOfResponsibility)
     },
     methods: {
       ...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue
index 7cda45c34..5a0faf9ef 100644
--- a/jero-web/src/views/projectManagement/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue
@@ -54,7 +54,7 @@
         columns: [
           {
             title: this.$t('areaOfResponsibility'),
-            dataIndex: 'dutyTerritory',
+            dataIndex: 'dutyTerritoryName',
             align: 'center',
             width: 400,
             ellipsis: true,