From b2a78e8abca2c7949117b43e131a49105afa37c4 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sat, 9 Oct 2021 20:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomeMeetingApi.js                   |  6 ++--
 .../modules/UploadMeetFileModal.vue           | 36 +++++++++++++++++--
 .../projectManagement/CommitteeMeeting.vue    |  2 +-
 .../ConferenceMaintenance.vue                 |  2 +-
 src/views/projectManagement/OtherMeeting.vue  | 10 +++---
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/api/incomeMeetingApi.js b/src/api/incomeMeetingApi.js
index dca7949..d546f17 100644
--- a/src/api/incomeMeetingApi.js
+++ b/src/api/incomeMeetingApi.js
@@ -1,4 +1,4 @@
-import {getAction, postAction} from '@api/manage'
+import {getAction} from '@api/manage'
 
 // 通过用户id获取用户信息
 const getUserInfo = (params) => getAction('/sys/user/queryById',params)
@@ -8,8 +8,7 @@ const getMeetInfoById = (params) => getAction('/meeting/payMeeting/queryById',pa
 const getAllWorkProjects = () => getAction('/project/payWorkingGroup/listAll')
 // 通过id获取参会人详细信息
 const getSingUpUserInfo = (params) => getAction('/meeting/payMeetingSituation/queryById',params)
-// 会议管理上传会议资料
-const  uploadMeetingFiles = (params) => postAction('/meeting/payMeeting/uploadFile',params)
+
 // 生成会议二维码
 const createQcCode = (params) => getAction('/meeting/payMeeting/createBase64',params)
 // 收入合同的新增会员项目的查询
@@ -20,7 +19,6 @@ export {
   getMeetInfoById,
   getAllWorkProjects,
   getSingUpUserInfo,
-  uploadMeetingFiles,
   createQcCode,
   queryContractMemberProject
 }
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 5d27e98..10edb7b 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -30,7 +30,7 @@
 
 <script>
 import JUpload from '@comp/jero/JUpload'
-import {uploadMeetingFiles} from '@api/incomeMeetingApi'
+import {httpAction} from '@api/manage'
 
 export default {
   name: 'UploadMeetFileModal',
@@ -59,6 +59,7 @@ export default {
       meetingFileIds:'',
       validatorRules: {
       },
+      url:{}
     }
   },
   methods: {
@@ -68,6 +69,8 @@ export default {
     edit(record) {
       this.form.resetFields()
       this.model = Object.assign({},record)
+      // 根据会议类型返回不同的url
+      this.url = Object.assign({},this.createUrlByMeetingType(record.meetingType +''))
       this.meetingId = record.id
       this.visible = true
       // 拿到已经上传的会议文件进行回显
@@ -82,6 +85,35 @@ export default {
       this.$emit('close')
       this.visible = false
     },
+    createUrlByMeetingType(meetingType) {
+      switch (String(meetingType)) {
+        // 工作组会议
+        case '1':
+          return {
+            uploadFile: '/meeting/workGroupMeeting/uploadFile',
+          }
+        // 标协会议
+        case '2':
+          return {
+            uploadFile: '/meeting/standardsMeeting/uploadFile',
+          }
+        // 国际研讨会
+        case '3':
+          return {
+            uploadFile: '/meeting/internalMeeting/uploadFile',
+          }
+        // 其他会议
+        case '4':
+          return {
+            uploadFile: '/meeting/otherMeeting/uploadFile',
+          }
+        // 分标委会议
+        case '5':
+          return {
+            uploadFile: '/meeting/committeeMeeting/uploadFile',
+          }
+      }
+    },
     handleOk() {
       const that = this
       // 触发表单验证
@@ -91,7 +123,7 @@ export default {
             fileIds:values.fileIds,
             id:that.meetingId
           }
-          uploadMeetingFiles(params).then(res => {
+          httpAction(this.url.uploadFile,params,'post').then(res => {
             if(res.success){
               that.$message.success(res.message)
               that.$emit('ok')
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 0c8cd9a..bb79a94 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -74,7 +74,7 @@
       <!--    操作按钮区域-->
       <div class="table-operator">
         <a-button type="primary" icon="plus" @click="handleAdd" v-has:[authorCode.add]="'committeeMeeting:add'">新增</a-button>
-        <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')" v-has:[authorCode.search]="'committeeMeeting:export'">导出</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('会议维护')" v-has:[authorCode.search]="'committeeMeeting:export'">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has:[authorCode.batchDel]="'committeeMeeting:batchDel'">批量删除</a-button>
         <!--只有工作会议与分标委会议才有-->
         <a-button type="primary" @click="publishRemind" v-if="meetingType === '5' " v-has="'committeeMeeting:publish'">发布</a-button>
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index eb4885e..161d4b0 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -79,7 +79,7 @@
     <!--    操作按钮区域-->
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workGroupMeeting:add'" v-if="canOperate">新增</a-button>
-      <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')"
+      <a-button type="primary" icon="export" @click="handleExportXls('工作组会议')"
                 v-has="'workGroupMeeting:export'">导出
       </a-button>
       <a-button type="danger" icon="delete" @click="batchDel" v-has="'workGroupMeeting:batchDel'" v-if="canOperate">批量删除</a-button>
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 8941a55..59fadc5 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -64,7 +64,7 @@
       <!-- 操作按钮区域 -->
       <div class="table-operator">
         <a-button @click="handleAdd" type="primary" icon="plus" v-has="'otherMeeting:add'">新增</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls('会议管理')" v-has="'otherMeeting:export'">导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('其他会议')" v-has="'otherMeeting:export'">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'otherMeeting:batchDel'">批量删除</a-button>
       </div>
 
@@ -204,10 +204,10 @@ name: 'OtherMeeting',
       },
       url: {
         list: '/meeting/otherMeeting/page',
-        delete: '/meeting/otherMeeting/page/delete',
-        deleteBatch: '/meeting/otherMeeting/page/deleteBatch',
-        exportXlsUrl: '/meeting/otherMeeting/page/exportXls',
-        importExcelUrl: '/meeting/otherMeeting/page/importExcel',
+        delete: '/meeting/otherMeeting/delete',
+        deleteBatch: '/meeting/otherMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/otherMeeting/exportXls',
+        importExcelUrl: '/meeting/otherMeeting/importExcel',
       },
       disableMixinCreated:true
     }