From 7e8767f3c82fd556e1ed700e4de7dbd340ac8de3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Oct 2021 14:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/PreviewFile.vue           | 58 +++++++++++++++----
 src/views/MessagePage/MeetingDetailModal.vue  | 53 +++++++++++++----
 .../UploadMeetingCertificateModal.vue         |  1 +
 3 files changed, 88 insertions(+), 24 deletions(-)

diff --git a/src/components/jero/PreviewFile.vue b/src/components/jero/PreviewFile.vue
index bde3f7c..0863936 100644
--- a/src/components/jero/PreviewFile.vue
+++ b/src/components/jero/PreviewFile.vue
@@ -1,19 +1,24 @@
 <template>
   <!--  父组件的文件id如果是异步获取的 需要加上v-if判断-->
-  <div>
+  <div class="file-wrap">
     <!--  2021-10-09 author:zx 把span换成了div，实现多个文件显示换行-->
-    <div v-for="(item) of fileList" :key="item.id">{{ item.name + '  ' }}
-      <span class="m-l-4 color-blue" @click="handleDownLoad(item)">下载</span>
-      <span class="m-l-4 color-blue" @click="handlePreview(item)">查看</span>
+    <div v-for="(item) of fileList" :key="item.id" class="file-item">
+      <span class="file-name"><j-ellipsis :value="item.name" :length="20"></j-ellipsis></span>
+      <div class="file-btn">
+        <span class="color-blue" @click="handleDownLoad(item)">下载</span>
+        <span class="color-blue" @click="handlePreview(item)">查看</span>
+      </div>
     </div>
+
   </div>
 </template>
 
 <script>
 import Vue from 'vue'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { getFileInfo } from '@/api/api'
-import { downloadFile } from '@api/manage'
+import {ACCESS_TOKEN} from '@/store/mutation-types'
+import {getFileInfo} from '@/api/api'
+import {downloadFile} from '@api/manage'
+import JEllipsis from '@comp/jero/JEllipsis'
 // eslint-disable-next-line
 const Base64 = require('js-base64').Base64
 
@@ -29,6 +34,9 @@ export default {
       required: false
     }
   },
+  components: {
+    JEllipsis
+  },
   data() {
     return {
       fileInfo: {},
@@ -53,7 +61,7 @@ export default {
     getFileInfo(id) {
       return new Promise(resolve => {
         let result = {}
-        getFileInfo({ id: id }).then(res => {
+        getFileInfo({id: id}).then(res => {
           if (res.success) {
             result = res.result
           }
@@ -72,7 +80,7 @@ export default {
         for (let i = 0; i < arr.length; i++) {
           let fileObj = {}
           fileObj = await this.getFileInfo(arr[i])
-          fileList.push({ id: fileObj.id, name: fileObj.fileName })
+          fileList.push({id: fileObj.id, name: fileObj.fileName})
         }
         this.fileList = [...fileList]
       } else {
@@ -81,12 +89,12 @@ export default {
     },
     handleDownLoad(file) {
       console.log(file)
-      downloadFile(`sys/common/download/${ file.id }`, file.name)
+      downloadFile(`sys/common/download/${file.id}`, file.name)
     },
     handlePreview(file) {
       if (file && file.id) {
-        const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ file.id }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ file.name }`
-        let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(Base64.encode(fileFullUrl)) }`
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)
       }
@@ -104,4 +112,30 @@ export default {
 .m-l-4 {
   margin-left: 4px;
 }
+
+.file-wrap {
+
+  display: inline-block;
+}
+
+.file-item {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 5px;
+
+  .file-name {
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .file-btn {
+    width: 100px;
+
+    span:nth-child(1) {
+      margin: 0 20px 0 10px;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 1dd02f3..1688c73 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -9,7 +9,7 @@
     <!--会议信息begin-->
     <section class="base-info">
       <h3 class="title">会议信息</h3>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>会议名称：</label>
           <span><j-ellipsis :value="model.meetingName" :length="20"></j-ellipsis></span>
@@ -19,7 +19,7 @@
           <span><j-ellipsis :value="generateMeetingType(model.meetingType)" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>召开时间：</label>
           <span>{{model.startTime + '~' + model.endTime}}</span>
@@ -29,7 +29,7 @@
           <span><j-ellipsis :value="model.particularYear" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>召开地点：</label>
           <span><j-ellipsis :value="model.venue + '/' + model.address"></j-ellipsis></span>
@@ -39,17 +39,17 @@
           <span><j-ellipsis :value="model.directorName" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>报名截止时间：</label>
           <span><j-ellipsis :value="model.registerDeadline" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>会议通知：</label>
-          <span><preview-file style="display: inline-block" :file-id="model.meetingFiles"></preview-file></span>
+          <span><preview-file style="width: 80%" :file-id="model.meetingFiles"></preview-file></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="24">
           <label>会议内容：</label>
           <span><j-ellipsis :value="model.meetingContent" :length="20"></j-ellipsis></span>
@@ -60,14 +60,14 @@
     <!--报名信息begin-->
     <section class="base-info">
       <h3 class="title">报名信息</h3>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>参会单位：</label>
           <span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
         </a-col>
 
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>参会人：</label>
           <span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
@@ -77,7 +77,7 @@
           <span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
 <!--        需求沟通去掉性别-->
 <!--        <a-col :span="12">-->
 <!--          <label>性别：</label>-->
@@ -92,14 +92,14 @@
           <span><j-ellipsis :value="situationInfo.payMode_dictText" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>需要发票：</label>
           <span><j-ellipsis :value="situationInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
 <!--      缴费方式为打包时候 不显示 -->
-      <a-row :gutter="24" v-if="situationInfo.payMode !== 3">
+      <a-row :gutter="24" v-if="situationInfo.payMode !== 3" class="flex-col">
         <a-col :span="12">
           <label>发票邮寄地址：</label>
           <span><j-ellipsis :value="situationInfo.postContactAddress" :length="20"></j-ellipsis></span>
@@ -114,7 +114,7 @@
     <!--会议资料begin-->
     <section class="base-info">
       <h3 class="title">会议资料</h3>
-      <a-row :gutter="24">
+      <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>会议资料：</label>
           <span><preview-file :file-id="model.meetingData"></preview-file></span>
@@ -376,6 +376,34 @@ export default {
 </script>
 
 <style scoped lang="less">
+
+.info {
+  .ant-col {
+    span {
+      display: inline-block;
+      word-break: keep-all;
+      white-space: nowrap;
+      max-width: calc(100% - 100px);
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+//会议内容、备注的样式
+.info-textarea {
+  display: flex;
+
+  label {
+    flex-shrink: 0;
+  }
+}
+
+.flex-col {
+  .ant-col {
+    display: flex;
+  }
+}
 .ant-row {
   margin: 12px;
 }
@@ -385,6 +413,7 @@ h3 {
 }
 
 label {
+  min-width: 80px;
   color: #666;
 }
 
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index 15c3daf..ebb2f2e 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -290,6 +290,7 @@ export default {
     display: flex;
   }
 }
+
 .ant-row {
   margin: 12px;
 }