From 65aeb3a7d7742d26ba1233e6d79e1d95c1342e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 16:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BA=A4=E4=BB=98=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
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/certificationList/index.vue    | 24 +++++++++++++++----
 .../components/listOfRegulations.vue          |  8 +++----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9bf2aa79d..f0f071ceb 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1710,4 +1710,5 @@ module.exports = {
   implementationrecords:'Fault handling measures and emergency response implementation records',
   onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',
   implementationDateTwo:'Implementation Date',
+  reasonForReturn:'Reason For Return',
 }
\ 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 83a9c7fd1..eb33ab603 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1810,4 +1810,5 @@ module.exports = {
   implementationrecords:'故障处置措施和应急响应实施记录',
   onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据',
   implementationDateTwo:'实施日期',
+  reasonForReturn:'Reason For Return',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index ec076d2c6..ac9f8a11f 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -367,6 +367,14 @@
               {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}}
              </span>
         </div>
+        <span slot="deliverableTemplate" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.deliverableTemplate)"
+                      v-if="result.deliverableTemplate">
+                     {{$t('viewFile')}}
+                </span>
+                <span v-else>--</span>
+        </span>
       </a-table>
       <div class="page" v-if="dataSource.length > 0">
         <a-pagination
@@ -483,7 +491,7 @@
 
   export default {
     name: 'index',
-    props:['isDisplayNum'],
+    props: ['isDisplayNum'],
     components: {
       globalAdvancedQuery,
       ImportFile,
@@ -578,7 +586,7 @@
           AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit',
           saveBatch: '/project/projectCertificationInventoryEO/saveBatch',
           questionUrl: '/project/projectCertificationInventoryEO/expediting',
-          importZipUrl: '/project/projectCertificationInventoryEO/importData',
+          importZipUrl: '/project/projectCertificationInventoryEO/importData'
         },
         dataSource: [],
         roleSwitchingCode: '',
@@ -604,7 +612,7 @@
             dataIndex: 'category',
             width: 180,
             ellipsis: true,
-            fixed: 'left',
+            fixed: 'left'
           },
           {
             title: this.$t('inspectionItems'),
@@ -612,7 +620,7 @@
             dataIndex: 'inspectionItem',
             width: 180,
             ellipsis: true,
-            fixed: 'left',
+            fixed: 'left'
           },
           {
             title: this.$t('configurationItem'),
@@ -656,6 +664,14 @@
             width: 180,
             ellipsis: true
           },
+          {
+            title: this.$t('deliverableTemplate'),
+            align: 'left',
+            dataIndex: 'deliverableTemplate',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'deliverableTemplate' }
+          },
           {
             title: this.$t('typeOfDeliverables'),
             align: 'left',
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 1aa50845a..4a68009ff 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -405,7 +405,7 @@
       </a-spin>
     </a-modal>
     <a-modal
-      :title="$t('reasonsForRejection')"
+      :title="$t('reasonForReturn')"
       :width="500"
       :visible="visibleComment"
       :confirm-loading="confirmLoadingComment"
@@ -419,12 +419,12 @@
             <div class="box-title-text-index">
               <div class="title-text-Comment">
                 <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('reasonsForRejection')">{{ $t('reasonsForRejection') }}</span>
+                <span class="title-text-text" :title="$t('reasonForReturn')">{{ $t('reasonForReturn') }}</span>
               </div>
               <a-form-model-item class="itemModelComment" :prop="'commentContent'">
                 <a-textarea
                   style="width: 100%"
-                  :placeholder="$t('PleaseEnter')+$t('reasonsForRejection')"
+                  :placeholder="$t('PleaseEnter')+$t('reasonForReturn')"
                   :disabled="false"
                   v-model="formInlineComment.commentContent" :rows="4"/>
               </a-form-model-item>
@@ -768,7 +768,7 @@
           commentContent: [
             {
               required: true,
-              message: this.$t('reasonsForRejection') + this.$t('cannotEmpty'),
+              message: this.$t('reasonForReturn') + this.$t('cannotEmpty'),
               trigger: 'blur'
             }
           ]