From 2948acf637aed37864aad36393153ea67808166a Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 17 Jul 2023 16:00:20 +0800
Subject: [PATCH] =?UTF-8?q?[update]-=E5=98=89=E5=AE=BE=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6=E5=90=8E=20=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E6=96=B9=E6=B3=95=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=9B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=87=E4=BB=B6=E6=96=B9=E5=BC=8F=E7=94=B1=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=B8=AA=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9=E6=88=90?=
 =?UTF-8?q?ids=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                                     |  5 ++++-
 src/components/detailPage/MeetingList.vue          |  8 ++++----
 src/views/MessagePage/modules/FileTable.vue        | 14 +++++++-------
 src/views/meetingActivity/MeetingActivity.vue      |  7 ++++---
 .../standardsAssociation/BasicInfoFromIncome.vue   | 10 +++++-----
 .../standardsAssociation/meeting/MeetingList.vue   |  7 ++++---
 6 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index f8abb7f..17ec9bf 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -93,6 +93,8 @@ const getUserNoticeInfo= (params)=>getAction('/sys/sysAnnouncementSend/getMyAnno
 const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
 // 通过文件的id获取文件的相应信息
 const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params)
+// 通过多个文件的ids 获取文件的相应信息
+const getFileInfoByIds = (params) => getAction('/sys/oss/file/queryByIds', params)
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -156,7 +158,8 @@ export {
   queryMyDepartTreeList,
   getUserNoticeInfo,
   getDictItemsFromCache,
-  getFileInfo
+  getFileInfo,
+  getFileInfoByIds
 }
 
 
diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue
index bf1ccb5..701ddd9 100644
--- a/src/components/detailPage/MeetingList.vue
+++ b/src/components/detailPage/MeetingList.vue
@@ -214,7 +214,7 @@ export default {
   },
   methods: {
     compareCurrentTime,
-    loadData(arg, callback) {
+    loadData(arg, callback, situationId) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
         return
@@ -238,7 +238,7 @@ export default {
           } else {
             this.ipagination.total = 0
           }
-          callback && callback()
+          callback && callback(situationId)
           //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
         }
         if (res.code === 510) {
@@ -286,15 +286,15 @@ export default {
     // 嘉宾上传会议资料后的回调函数
     fileRefreshData(situationId) {
       const callback = (situationId) => {
+        if (!situationId) return
         let item = this.dataSource.find(item => item.situationId === situationId)
         item && this.openMeetingDetail(item)
       }
       // 重新请求数据，并执行打开弹窗的回调函数
-      this.loadData(null, callback(situationId))
+      this.loadData(null, callback, situationId)
     }
   },
   created() {
-    console.log('***************')
     this.loadData(1)
   }
 }
diff --git a/src/views/MessagePage/modules/FileTable.vue b/src/views/MessagePage/modules/FileTable.vue
index 5aa401d..86952a4 100644
--- a/src/views/MessagePage/modules/FileTable.vue
+++ b/src/views/MessagePage/modules/FileTable.vue
@@ -22,7 +22,7 @@
 <script>
 import Vue from 'vue'
 import {ACCESS_TOKEN} from '@/store/mutation-types'
-import {getFileInfo} from '@/api/api'
+import {getFileInfoByIds} from '@/api/api'
 import {downloadFile} from '@api/manage'
 const columns = [
   {
@@ -96,10 +96,10 @@ export default {
     /*
     * 通过文件id获取文件的相关信息
     * */
-    getFileInfo(id) {
+    getFileInfo(ids) {
       return new Promise(resolve => {
         let result = {}
-        getFileInfo({id: id}).then(res => {
+        getFileInfoByIds({ids: ids}).then(res => {
           if (res.success) {
             result = res.result
           }
@@ -114,10 +114,10 @@ export default {
     async initFileList(fileIds) {
       if (fileIds) {
         const fileList = []
-        let arr = fileIds.split(',')
-        for (let i = 0; i < arr.length; i++) {
-          let fileObj = {}
-          fileObj = await this.getFileInfo(arr[i])
+        const fileObjArr = await this.getFileInfo(fileIds)
+        // let arr = fileIds.split(',')
+        for (let i = 0; i < fileObjArr.length; i++) {
+          let fileObj = fileObjArr[i]
           fileList.push({id: fileObj.id, name: fileObj.fileName, createTime: fileObj.createTime})
         }
         this.fileList = [...fileList]
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 6d4795f..f8309d2 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -365,7 +365,7 @@ export default {
     /*
     * 初始化加载数据
     * */
-    initData(arg, callback) {
+    initData(arg, callback, situationId) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
         return
@@ -397,7 +397,7 @@ export default {
           } else {
             this.total = 0
           }
-          callback && callback()
+          callback && callback(situationId)
         }
         if (res.code === 510) {
           this.$message.warning(res.message)
@@ -482,11 +482,12 @@ export default {
     // 嘉宾上传会议资料后的回调函数
     fileRefreshData(situationId) {
       const callback = (situationId) => {
+        if (!situationId) return
         let item = this.tableData.find(item => item.situationId === situationId)
         item && this.openMeetingDetail(item)
       }
       // 重新请求数据，并执行打开弹窗的回调函数
-      this.initData(null, callback(situationId))
+      this.initData(null, callback, situationId)
     }
   }
 }
diff --git a/src/views/standardsAssociation/BasicInfoFromIncome.vue b/src/views/standardsAssociation/BasicInfoFromIncome.vue
index 07a6e1a..ff3ae8f 100644
--- a/src/views/standardsAssociation/BasicInfoFromIncome.vue
+++ b/src/views/standardsAssociation/BasicInfoFromIncome.vue
@@ -41,7 +41,7 @@
             <span class="value-span">{{ memberInfo.companyName|| loginUserInfo.companyName }}</span>
           </div>
           <div class="info-row">
-            <span class="value-span">如若需要注册企业会员，请前往<a :href="memberRegisterUrl" target="_blank">网站</a>注册</span>
+            <span class="value-span">如若需要注册标协会员，请前往<a :href="memberRegisterUrl" target="_blank">网站</a>注册</span>
           </div>
 
         </div>
@@ -66,10 +66,10 @@ export default {
       isLoading: false,
       // 秘书处信息
       secretariatInfo: {
-        address: '东丽区', // 地址
-        contactPerson: '郭某某', // 联系人
-        contactPhone: '022-5907252', // 联系人电话
-        contactMail: '113222222222222@qq.c113222222222222113222222222222113222222222222113222222222222113222222222222113222222222222113222222222222om' // 联系人邮箱
+        address: '', // 地址
+        contactPerson: '', // 联系人
+        contactPhone: '', // 联系人电话
+        contactMail: '' // 联系人邮箱
       },
       // 本企业信息
       memberInfo: {
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index 9cfbea6..2ae08ae 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -341,7 +341,7 @@ export default {
     /*
     * 初始化加载数据
     * */
-    initData(arg, callback) {
+    initData(arg, callback, situationId) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
         return
@@ -373,7 +373,7 @@ export default {
           } else {
             this.total = 0
           }
-          callback && callback()
+          callback && callback(situationId)
         }
         if (res.code === 510) {
           this.$message.warning(res.message)
@@ -426,11 +426,12 @@ export default {
     // 嘉宾上传会议资料后的回调函数
     fileRefreshData(situationId) {
       const callback = (situationId) => {
+        if (!situationId) return
         let item = this.tableData.find(item => item.situationId === situationId)
         item && this.openMeetingDetail(item)
       }
       // 重新请求数据，并执行打开弹窗的回调函数
-      this.initData(null, callback(situationId))
+      this.initData(null, callback, situationId)
     }
   }
 }