diff --git a/src/api/incomeMeetingApi.js b/src/api/incomeMeetingApi.js
index 4058d65..759f848 100644
--- a/src/api/incomeMeetingApi.js
+++ b/src/api/incomeMeetingApi.js
@@ -1,4 +1,4 @@
-import {getAction} from '@api/manage'
+import {getAction, postAction} from '@api/manage'
 
 // 通过用户id获取用户信息
 const getUserInfo = (params) => getAction('/sys/user/queryById',params)
@@ -8,10 +8,13 @@ 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)
 
 export {
   getUserInfo,
   getMeetInfoById,
   getAllWorkProjects,
-  getSingUpUserInfo
+  getSingUpUserInfo,
+  uploadMeetingFiles
 }
diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue
index 9abcec6..25338ff 100644
--- a/src/views/incomePayments/meetManage/MeetManageList.vue
+++ b/src/views/incomePayments/meetManage/MeetManageList.vue
@@ -221,8 +221,8 @@ export default {
     /*
     *  上传会议文件
     * */
-    handleUploadFile() {
-      this.$refs.modalForm.add({})
+    handleUploadFile(record) {
+      this.$refs.modalForm.edit(record)
     },
     /*
     *  报名信息
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index f243561..5d27e98 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -10,23 +10,27 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item label="会议文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload file-type-error-message="请上传会议文件" :multiple="false" :number="1"
+              <j-upload file-type-error-message="请上传会议文件" :multiple="true"
                         :return-id="true"
-                        v-decorator="['chargeNoticeFileId']"
+                        v-decorator="['fileIds']"
                         :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
         </a-row>
       </a-form>
     </a-spin>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+      <a-button @click="handleOk" type="primary" v-preventclick>确定</a-button>
+    </template>
   </j-modal>
 </template>
 
 <script>
-import {httpAction} from '@api/manage'
 import JUpload from '@comp/jero/JUpload'
+import {uploadMeetingFiles} from '@api/incomeMeetingApi'
 
 export default {
   name: 'UploadMeetFileModal',
@@ -43,22 +47,18 @@ export default {
       model: {},
       labelCol: {
         xs: {span: 24},
-        sm: {span: 10}
+        sm: {span: 6}
       },
       wrapperCol: {
         xs: {span: 24},
-        sm: {span: 14}
+        sm: {span: 18}
       },
+      // 会议id
+      meetingId:'',
+      // 已经上传的会议文件
+      meetingFileIds:'',
       validatorRules: {
-        directorId: {
-          rules: [{required: true, message: '请选择负责人'}],
-          validateTrigger: ['change', 'blur']
-        }
       },
-      url: {
-        add: '/jero/memberProject/add',
-        edit: '/jero/memberProject/edit',
-      }
     }
   },
   methods: {
@@ -67,8 +67,16 @@ export default {
     },
     edit(record) {
       this.form.resetFields()
-      this.model = Object.assign({}, record)
+      this.model = Object.assign({},record)
+      this.meetingId = record.id
       this.visible = true
+      // 拿到已经上传的会议文件进行回显
+      this.meetingFileIds = this.model.meetingData ? this.model.meetingData : ''
+      if(this.meetingFileIds && this.meetingFileIds !== ''){
+        this.$nextTick( () => {
+          this.form.setFieldsValue({'fileIds':this.meetingFileIds})
+        })
+      }
     },
     close() {
       this.$emit('close')
@@ -78,27 +86,20 @@ export default {
       const that = this
       // 触发表单验证
       this.form.validateFields((err, values) => {
-        if (!err) {
-          let httpurl = ''
-          let method = 'post'
-          if (!this.model.id) {
-            httpurl += this.url.add
-          } else {
-            httpurl += this.url.edit
+        if(!err && values.fileIds !== undefined){
+          const params = {
+            fileIds:values.fileIds,
+            id:that.meetingId
           }
-          const formData = Object.assign(this.model, values)
-          console.log('表单提交数据', formData)
-          httpAction(httpurl, formData, method).then((res) => {
-            if (res.success) {
+          uploadMeetingFiles(params).then(res => {
+            if(res.success){
               that.$message.success(res.message)
               that.$emit('ok')
               that.close()
-            } else {
-              that.$message.warning(res.message)
             }
-          }).finally(() => {
-            that.confirmLoading = false
           })
+        }else {
+          that.close()
         }
       })
     },