From 477df7ad1888f653f1d052094848e77519220629 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 2 Jun 2022 09:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  3 +-
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/TaskListModel.vue              | 54 +++++++++++--------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4cfb4cf44..955c97dc5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -911,5 +911,6 @@ module.exports = {
   SynchronizedLibrary: 'Synchronized to the upper reporting Library、',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
-  and: 'and'
+  and: 'and',
+  judge:'Judge',
 }
\ 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 4154aa50c..b63eab763 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -604,6 +604,7 @@ module.exports = {
   StandardImplementationDate: '标准实施日期',
   regulatoryEngineer: '法规工程师',
   certifiedEngineer: '认证工程师',
+  judge:'判断',
   engineeringInterfacePerson: '工程接口人',
   typeOfDeliverables: '交付物类型',
   deliverableTemplate: '交付物模板',
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index d081ac93b..eade65182 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -19,8 +19,8 @@
         <a-col :span="24" v-if="title == $t('CertificationProgress')">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
             </div>
             <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgress':''">
               <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
@@ -35,8 +35,8 @@
         <a-col :span="24" v-if="title == $t('CertificationProgress')">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('remarks')">{{$t('remarks')}}</span>
+                      <span class="title-text-text"
+                            :title="$t('remarks')">{{$t('remarks')}}</span>
             </div>
             <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgressRemark':''">
               <a-textarea
@@ -50,8 +50,8 @@
         <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+                      <span class="title-text-text"
+                            :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="conditionAssessment">
               <a-select
@@ -59,25 +59,25 @@
                 v-model="formInline.conditionAssessment"
                 :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
                 <a-select-option :value="'1'">
-                     <span style="display: inline-block;width: 100%">
-                            {{ $t('red') }}
-                     </span>
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
                 </a-select-option>
                 <a-select-option :value="'2'">
-                     <span style="display: inline-block;width: 100%">
-                            {{ $t('yellow') }}
-                     </span>
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
                 </a-select-option>
                 <a-select-option :value="'3'">
-                     <span style="display: inline-block;width: 100%">
-                            {{ $t('green') }}
-                     </span>
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
                 </a-select-option>
 
                 <a-select-option :value="'4'" disabled>
-                       <span style="display: inline-block;width: 100%">
-                             {{ $t('blue') }}
-                        </span>
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -87,8 +87,8 @@
         <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('remarks')">{{$t('remarks')}}</span>
+                      <span class="title-text-text"
+                            :title="$t('remarks')">{{$t('remarks')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="remark">
               <a-textarea
@@ -98,8 +98,18 @@
             </a-form-model-item>
           </div>
         </a-col>
-
-        <div v-for="item in studioList" v-if="title == $t('CurrentProjectStatusEvaluation') && formInline.roleCode == '0'">
+        <div v-for="item in studioList"
+             v-if="title == $t('CurrentProjectStatusEvaluation') && formInline.roleCode == '0'">
+          <div class="headerText"
+               v-if="item.roleCode == 1"
+               style="margin-top: 10px">
+            {{$t('regulatoryEngineer')+$t('judge')}}
+          </div>
+          <div class="headerText"
+               v-else-if="item.roleCode == 2"
+               style="margin-top: 10px">
+            {{$t('certifiedEngineer')+$t('judge')}}
+          </div>
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">