From a87317f920a27eb6d8efe38ceb5d864ab8855aa0 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 21 Sep 2022 17:38:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=82=B9?=
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/initiatingProcess.vue          | 16 ++++++++--
 .../components/documentDataComparison.vue     |  3 +-
 .../components/initiateComparison.vue         | 29 ++++++++++++++++++-
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 0b8a447f8..ec11969e7 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1300,4 +1300,5 @@ module.exports = {
   processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data',
   exportFileName:'Export file name',
   initiateSupplementaryProcess:'Initiate supplementary process',
+  whetherTheDisassemblySheetIncluded:'Whether the disassembly sheet is included',
 }
\ 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 ff0f048ef..7e5ff04b1 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1402,4 +1402,5 @@ module.exports = {
   processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据',
   exportFileName:'导出文件名称',
   initiateSupplementaryProcess:'发起补充流程',
+  whetherTheDisassemblySheetIncluded:'是否含有拆解单',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 3debb89f8..ba5d2a608 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -22,6 +22,12 @@
             :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
             :columns="columns"
           >
+           <span slot="whetherTheDisassemblySheetIncluded" slot-scope="text,record">
+                {{record.sarFileSplitInfoList && record.sarFileSplitInfoList.length > 0 ? '是':'否'}}
+           </span>
+            <span slot="whetherTheDisassemblySheetIncludedTitle" :title="$t('whetherTheDisassemblySheetIncluded')">
+                 {{$t('whetherTheDisassemblySheetIncluded')}}
+            </span>
           </a-table>
           <div class="page" v-if="dataSource && dataSource.length > 0">
             <a-pagination
@@ -332,6 +338,12 @@
             ellipsis: true,
             width: 170,
             dataIndex: 'corresponding_standard'
+          },
+          {
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'whetherTheDisassemblySheetIncluded',title:'whetherTheDisassemblySheetIncludedTitle' }
           }
         ]
       }
@@ -341,12 +353,12 @@
       this.getEvaluationMethodTree()
       if (this.$route.query.whetherTobring == '1') {
         this.formInline.whetherTobring = '1'
-        this.formInline = {...this.formInline}
+        this.formInline = { ...this.formInline }
         this.isTrue = true
       } else {
         this.isTrue = false
         this.formInline.whetherTobring = '2'
-        this.formInline = {...this.formInline}
+        this.formInline = { ...this.formInline }
       }
       if (this.$route.query.firstInitiation == '1') {
         this.whetherDisplay = true
diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
index 3446e276d..6a5255d8c 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
@@ -30,7 +30,8 @@
         <div class="detail-content" style="padding-bottom: 20px">
           <div style="width: 100%;height: auto;overflow: hidden">
             <div class="detail-content-left">
-              <div class="detail-content-left-header" :title="resultData.serialNumberLeft + resultData.fileNameLeft">
+              <div class="detail-content-left-header"
+                   :title="resultData.serialNumberLeft + resultData.fileNameLeft">
                 {{this.resultData.serialNumberLeft}}&nbsp;
                 {{this.resultData.fileNameLeft}}
               </div>
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
index 7eaec4003..f110bf30f 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
@@ -71,6 +71,7 @@
                      {{$t('selectedStandard')}}
                 </span>
                 <span class="box-button-standard-right"
+                      @click="selecLeftClick(selectedRowKeysLeftRecord[0])"
                       :title="selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')"
                       :class="{'box-button-standard-right-color':selectedRowKeysLeftRecord[0]}">
                       {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}}
@@ -136,6 +137,7 @@
                      {{$t('selectedStandard')}}
                 </span>
                 <span class="box-button-standard-right"
+                      @click="selecLeftClick(selectedRowKeysRightRecord[0])"
                       :title="selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')"
                       :class="{'box-button-standard-right-color':selectedRowKeysRightRecord[0]}">
                         {{selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')}}
@@ -169,7 +171,9 @@
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { getAction, postAction, deleteAction ,downloadFile} from '@/api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'initiateDocumentComparison',
@@ -191,6 +195,7 @@
         totalRight: 0,
         pageNoRight: 1,
         formInline: {},
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         rules: {
           remark: [
             {
@@ -248,6 +253,7 @@
       document.title = this.$t('DocumentComparison') + ' - ' + this.$t('initiateComparison')
     },
     methods: {
+      ...mapGetters(['userInfo']),
       Fallback() {
         this.$router.push({
           path: '/documentComparison'
@@ -371,6 +377,26 @@
           }
         })
       },
+      selecLeftClick(fileQuery){
+        if (fileQuery){
+          let fileName = fileQuery.fileName
+          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=' + fileQuery.fileId+'&userName='+this.userInfo().username))
+          } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+            let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.fileId + fileSuffix)
+            window.open(url, '_blank')
+          } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
+            || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+            let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.fileId + fileSuffix)
+            window.open(url, '_blank')
+          } else {
+            downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.fileId })
+          }
+        }
+      },
       getListRight() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParamRight))
         Object.keys(queryParam).forEach(val => {
@@ -580,5 +606,6 @@
 
   .box-button-standard-right-color {
     color: #040B29;
+    cursor: pointer;
   }
 </style>
\ No newline at end of file