diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index fe99b00..a2a37b9 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -4,7 +4,7 @@ * data中url定义 list为查询列表 delete为删除单条记录 deleteBatch为批量删除 */ import {filterObj} from '@/utils/util' -import {getAction, downloadFile, getFileAccessHttpUrl} from '@/api/manage' +import {getAction, downloadFile, getFileAccessHttpUrl, postAction} from '@/api/manage' import Vue from 'vue' import {ACCESS_TOKEN, TENANT_ID} from '@/store/mutation-types' import store from '@/store' @@ -363,18 +363,29 @@ export const JeroListMixin = { * @author fac * */ releaseMeeing(record){ + const that = this if(this.url.releaseMeeingUrl){ + // 为什么是meetingIds 做的时候后端跟 分标委会议发布那样做了 就这样传参了 const param = { - id:record.id + meetingIds:[record.id] } - getAction(this.url.releaseMeeingUrl,param).then(res => { - if(res.success){ - this.$message.success(res.message) - this.loadData() - }else { - this.$message.warn(res.message) + + this.$confirm({ + title: '确认发布', + content: '确定要发布此会议吗?', + onOk: function () { + postAction(that.url.releaseMeeingUrl,param).then(res => { + if(res.success){ + that.$message.success('发布成功') + that.loadData() + }else { + that.$message.warn(res.message) + } + }) } }) + + }else { this.$message.warn('请设置url.releaseMeeingUrl') } diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index aa5c731..fd54d6c 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -133,8 +133,8 @@ - - 发布 + + 发布 会议纪要 上传文件 @@ -245,7 +245,7 @@ export default { { title: '发布状态', align: 'center', - dataIndex: 'release_dictText', + dataIndex: 'isRelease_dictText', scopedSlots: {customRender: 'text'}, width: 100, }, @@ -295,7 +295,7 @@ export default { edit: 'standardsMeeting:edit', delete: 'standardsMeeting:delete', uploadCouncil: 'standardsMeeting:uploadCouncil', - releaseMeeing:'', // 发布会议的按钮权限 + releaseMeeing:'standardsMeeting:release', // 发布会议的按钮权限 } } }, @@ -350,7 +350,7 @@ export default { delete: '/meeting/standardsMeeting/delete', deleteBatch: '/meeting/standardsMeeting/deleteBatch', exportXlsUrl: '/meeting/standardsMeeting/exportXls', - releaseMeeingUrl:'', // 发布会议的接口 + releaseMeeingUrl:'/meeting/standardsMeeting/release', // 发布会议的接口 } } else if (meetingType === '5') { // 分标委会议 diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue index d9e9c77..acb38a6 100644 --- a/src/views/projectManagement/InternationalSeminar.vue +++ b/src/views/projectManagement/InternationalSeminar.vue @@ -35,7 +35,7 @@ - + @@ -102,7 +102,7 @@ - 发布 + 发布 会议纪要 上传文件 @@ -200,7 +200,7 @@ export default { { title: '发布状态', align: 'center', - dataIndex: 'release_dictText', + dataIndex: 'isRelease_dictText', scopedSlots: {customRender: 'text'}, width: 120, }, @@ -228,7 +228,7 @@ export default { deleteBatch: '/meeting/internalMeeting/deleteBatch', exportXlsUrl: '/meeting/internalMeeting/exportXls', importExcelUrl: '/meeting/internalMeeting/importExcel', - releaseMeeingUrl:'', // 发布会议的接口 + releaseMeeingUrl:'/meeting/internalMeeting/release', // 发布会议的接口 }, disableMixinCreated:true } diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue index ec11d7a..ce60563 100644 --- a/src/views/projectManagement/OtherMeeting.vue +++ b/src/views/projectManagement/OtherMeeting.vue @@ -102,7 +102,7 @@ - 发布 + 发布 会议纪要 上传文件 @@ -199,7 +199,7 @@ name: 'OtherMeeting', { title: '发布状态', align: 'center', - dataIndex: 'release_dictText', + dataIndex: 'isRelease_dictText', scopedSlots: {customRender: 'text'}, width: 120, }, @@ -227,7 +227,7 @@ name: 'OtherMeeting', deleteBatch: '/meeting/otherMeeting/deleteBatch', exportXlsUrl: '/meeting/otherMeeting/exportXls', importExcelUrl: '/meeting/otherMeeting/importExcel', - releaseMeeingUrl:''// 发布会议的接口 + releaseMeeingUrl:'/meeting/otherMeeting/release'// 发布会议的接口 }, disableMixinCreated:true }