From 3482181646ed311cef42350624d6a927902f09f0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 19 Apr 2022 10:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 60 ++++++++++++-------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 0d93a4bcf..c6c9d9d4d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -10,8 +10,8 @@
             <div class="title-text" :title="$t('standard')">
               <span>{{$t('standard')}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.serialNumber"></a-input>
+            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                     v-model="queryParam.serialNumber"></j-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
@@ -19,8 +19,8 @@
             <div class="title-text" :title="$t('title')">
               <span>{{$t('title')}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                     v-model="queryParam.title"></a-input>
+            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                     v-model="queryParam.title"></j-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
@@ -28,8 +28,8 @@
             <div class="title-text" style="width: 44px" :title="$t('subtitle')">
               <span>{{$t('subtitle')}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
-                     v-model="queryParam.subtitle"></a-input>
+            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
+                     v-model="queryParam.subtitle"></j-input>
           </div>
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -90,11 +90,11 @@
       </div>
       <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 19px">
         <div class="operator-text" @click="submitClick(0)">
-          <a-icon type="setting"/>
+          <a-icon type="check-circle" />
           {{$t('submit')}}
         </div>
         <div class="operator-text" @click="submitClick(1)">
-          <a-icon type="setting"/>
+          <a-icon type="close-circle" />
           {{$t('overrule')}}
         </div>
         <div class="operator-text" @click="batSettingClick">
@@ -121,31 +121,32 @@
         <span slot="designDeliverableTemplateName" slot-scope="text,record">
           <span>{{record.designDeliverableType_dictText}}</span><br>
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
-              @click="pdfPreview(record)">>
-             {{record.designDeliverableTemplate}}
+              @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
+             {{record.designDeliverableTemplateName}}
            </a>
-           <a v-else-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
+           <a v-else-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length > 1"
               @click="clickButtonToUpload(record.designDeliverableTemplate)">{{$t('viewFile')}}</a>
-           <a v-else>--</a>
+           <span v-else>--</span>
         </span>
         <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
            <span>{{record.prehomoDeliverableType_dictText}}</span><br>
-           <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1">
-             {{record.prehomoDeliverableTemplate}}
+           <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
+              @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
+             {{record.prehomoDeliverableTemplateName}}
            </a>
-           <a v-else-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
+           <a v-else-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length > 1"
               @click="clickButtonToUpload(record.prehomoDeliverableTemplate)">{{$t('viewFile')}}</a>
-           <a v-else>--</a>
+           <span v-else>--</span>
         </span>
-        <span slot="verificationAndConformityconfirmation" slot-scope="text,record">
+        <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
           <span>{{record.verifyDeliverableType_dictText}}</span><br>
            <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
-              @click="pdfPreview(record)">>
-             {{record.verifyDeliverableTemplate}}
+              @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
+             {{record.verifyDeliverableTemplateName}}
            </a>
-           <a v-else-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
+           <a v-else-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length > 1"
               @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{$t('viewFile')}}</a>
-           <a v-else>--</a>
+           <span v-else>--</span>
         </span>
       </a-table>
     </div>
@@ -702,6 +703,23 @@
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
       },
+      pdfPreviewClick(name, id) {
+        let fileName = name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix == '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id))
+        } else if (fileSuffix == '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', name, { id: id })
+        }
+      },
       download(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id })
       },