【修改】其他会议 国际研讨会 标协会议 会议发布调整为页面级按钮
This commit is contained in:
@@ -362,17 +362,27 @@ export const JeroListMixin = {
|
|||||||
* @Date 2021-12-29
|
* @Date 2021-12-29
|
||||||
* @author fac
|
* @author fac
|
||||||
* */
|
* */
|
||||||
releaseMeeing(record){
|
releaseMeeing(){
|
||||||
|
if(this.selectedRowKeys.length === 0){
|
||||||
|
this.$message.warn('请至少选中一个会议')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 判断选中的会议是否已经发布
|
||||||
|
let flag = this.selectionRows.some(item => {
|
||||||
|
return item.isRelease === 1
|
||||||
|
})
|
||||||
|
if(flag){
|
||||||
|
this.$message.warn('请选择未发布的会议')
|
||||||
|
return
|
||||||
|
}
|
||||||
const that = this
|
const that = this
|
||||||
if(this.url.releaseMeeingUrl){
|
if(this.url.releaseMeeingUrl){
|
||||||
// 为什么是meetingIds 做的时候后端跟 分标委会议发布那样做了 就这样传参了
|
|
||||||
const param = {
|
const param = {
|
||||||
meetingIds:[record.id]
|
meetingIds:this.selectedRowKeys
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$confirm({
|
this.$confirm({
|
||||||
title: '确认发布',
|
title: '确认发布',
|
||||||
content: '确定要发布此会议吗?',
|
content: '确定要发布选中的会议吗?',
|
||||||
onOk: function () {
|
onOk: function () {
|
||||||
postAction(that.url.releaseMeeingUrl,param).then(res => {
|
postAction(that.url.releaseMeeingUrl,param).then(res => {
|
||||||
if(res.success){
|
if(res.success){
|
||||||
|
|||||||
@@ -102,6 +102,8 @@
|
|||||||
<a-button type="primary" @click="publishRemind" v-if="meetingType === '5' " v-has="'committeeMeeting:publish'">
|
<a-button type="primary" @click="publishRemind" v-if="meetingType === '5' " v-has="'committeeMeeting:publish'">
|
||||||
发布
|
发布
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<!-- 标协会议的发布 与分标委的发布不一样 -->
|
||||||
|
<a-button @click="releaseMeeing" type="primary" v-has="'standardsMeeting:release'" v-if="$route.query.meetingType === '2' ">发布</a-button>
|
||||||
</div>
|
</div>
|
||||||
<!-- /操作按钮区域-end-->
|
<!-- /操作按钮区域-end-->
|
||||||
|
|
||||||
@@ -133,8 +135,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<span slot="action" class="action-span-cell" slot-scope="text, record">
|
<span slot="action" class="action-span-cell" slot-scope="text, record">
|
||||||
<!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 标协会议显示 -->
|
|
||||||
<a @click="releaseMeeing(record)" v-has:[authorCode.releaseMeeing]="'committeeMeeting:upload'" :disabled="record.isRelease === 1 " v-if="$route.query.meetingType === '2' ">发布</a>
|
<!-- <a @click="releaseMeeing(record)" v-has:[authorCode.releaseMeeing]="'committeeMeeting:upload'"-->
|
||||||
|
<!-- :disabled="record.isRelease === 1 " >发布</a>-->
|
||||||
<a @click="uploadFile(record,'1')" v-has:[authorCode.uploadCouncil]="'committeeMeeting:upload'">会议纪要</a>
|
<a @click="uploadFile(record,'1')" v-has:[authorCode.uploadCouncil]="'committeeMeeting:upload'">会议纪要</a>
|
||||||
<a @click="uploadFile(record,'2')" v-has:[authorCode.upload]="'committeeMeeting:upload'">上传文件</a>
|
<a @click="uploadFile(record,'2')" v-has:[authorCode.upload]="'committeeMeeting:upload'">上传文件</a>
|
||||||
<!-- <a @click="applyMsg">报名信息</a>-->
|
<!-- <a @click="applyMsg">报名信息</a>-->
|
||||||
@@ -295,7 +298,7 @@ export default {
|
|||||||
edit: 'standardsMeeting:edit',
|
edit: 'standardsMeeting:edit',
|
||||||
delete: 'standardsMeeting:delete',
|
delete: 'standardsMeeting:delete',
|
||||||
uploadCouncil: 'standardsMeeting:uploadCouncil',
|
uploadCouncil: 'standardsMeeting:uploadCouncil',
|
||||||
releaseMeeing:'standardsMeeting:release', // 发布会议的按钮权限
|
releaseMeeing: 'standardsMeeting:release', // 发布会议的按钮权限
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -318,9 +321,8 @@ export default {
|
|||||||
this.newColumns = this.newColumns.filter(item => item.dataIndex !== 'remind_dictText')
|
this.newColumns = this.newColumns.filter(item => item.dataIndex !== 'remind_dictText')
|
||||||
} else {
|
} else {
|
||||||
// 分标委会议 列表表头 去掉可发布列
|
// 分标委会议 列表表头 去掉可发布列
|
||||||
|
|
||||||
this.newColumns = [...this.columns]
|
this.newColumns = [...this.columns]
|
||||||
this.newColumns = this.newColumns.filter(item => item.dataIndex !== 'release_dictText')
|
this.newColumns = this.newColumns.filter(item => item.dataIndex !== 'isRelease_dictText')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@@ -350,7 +352,7 @@ export default {
|
|||||||
delete: '/meeting/standardsMeeting/delete',
|
delete: '/meeting/standardsMeeting/delete',
|
||||||
deleteBatch: '/meeting/standardsMeeting/deleteBatch',
|
deleteBatch: '/meeting/standardsMeeting/deleteBatch',
|
||||||
exportXlsUrl: '/meeting/standardsMeeting/exportXls',
|
exportXlsUrl: '/meeting/standardsMeeting/exportXls',
|
||||||
releaseMeeingUrl:'/meeting/standardsMeeting/release', // 发布会议的接口
|
releaseMeeingUrl: '/meeting/standardsMeeting/release', // 发布会议的接口
|
||||||
}
|
}
|
||||||
} else if (meetingType === '5') {
|
} else if (meetingType === '5') {
|
||||||
// 分标委会议
|
// 分标委会议
|
||||||
|
|||||||
@@ -71,6 +71,7 @@
|
|||||||
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'internalMeeting:add'">新增</a-button>
|
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'internalMeeting:add'">新增</a-button>
|
||||||
<a-button type="primary" icon="download" @click="handleExportXls('国际研讨会')" v-has="'internalMeeting:export'">导出</a-button>
|
<a-button type="primary" icon="download" @click="handleExportXls('国际研讨会')" v-has="'internalMeeting:export'">导出</a-button>
|
||||||
<a-button type="danger" icon="delete" @click="batchDel" v-has="'internalMeeting:batchDel'">批量删除</a-button>
|
<a-button type="danger" icon="delete" @click="batchDel" v-has="'internalMeeting:batchDel'">批量删除</a-button>
|
||||||
|
<a-button @click="releaseMeeing" type="primary" v-has="'internalMeeting:release'">发布</a-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- table区域-begin -->
|
<!-- table区域-begin -->
|
||||||
@@ -102,7 +103,7 @@
|
|||||||
|
|
||||||
<span slot="action" slot-scope="text, record" class="action-span-cell">
|
<span slot="action" slot-scope="text, record" class="action-span-cell">
|
||||||
<!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
|
<!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
|
||||||
<a @click="releaseMeeing(record)" v-has=" 'internalMeeting:release' " :disabled="record.isRelease === 1 ">发布</a>
|
<!-- <a @click="releaseMeeing(record)" v-has=" 'internalMeeting:release' " :disabled="record.isRelease === 1 ">发布</a>-->
|
||||||
<a @click="handleUploadFile(record,'1')" v-has=" 'internalMeeting:uploadCouncil' ">会议纪要</a>
|
<a @click="handleUploadFile(record,'1')" v-has=" 'internalMeeting:uploadCouncil' ">会议纪要</a>
|
||||||
<a @click="handleUploadFile(record,'2')" v-has="'internalMeeting:upload'">上传文件</a>
|
<a @click="handleUploadFile(record,'2')" v-has="'internalMeeting:upload'">上传文件</a>
|
||||||
<!-- <a @click="handleSignup(record)">报名信息</a>-->
|
<!-- <a @click="handleSignup(record)">报名信息</a>-->
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
|
|
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||||
<a-form-item label="发布状态">
|
<a-form-item label="发布状态">
|
||||||
<j-dict-select-tag placeholder="请选择发布状态" dict-code="release" v-model="queryParam.isRelease"></j-dict-select-tag>
|
<j-dict-select-tag placeholder="请选择发布状态" dict-code="release"
|
||||||
|
v-model="queryParam.isRelease"></j-dict-select-tag>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xl="10" :lg="11" :md="12" :sm="24">
|
<a-col :xl="10" :lg="11" :md="12" :sm="24">
|
||||||
@@ -70,8 +71,10 @@
|
|||||||
<!-- 操作按钮区域 -->
|
<!-- 操作按钮区域 -->
|
||||||
<div class="table-operator">
|
<div class="table-operator">
|
||||||
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'otherMeeting:add'">新增</a-button>
|
<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>
|
<a-button type="danger" icon="delete" @click="batchDel" v-has="'otherMeeting:batchDel'">批量删除</a-button>
|
||||||
|
<a-button @click="releaseMeeing" type="primary" v-has="'otherMeeting:release'">发布</a-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- table区域-begin -->
|
<!-- table区域-begin -->
|
||||||
@@ -92,7 +95,8 @@
|
|||||||
@change="handleTableChange">
|
@change="handleTableChange">
|
||||||
|
|
||||||
<template slot="htmlSlot" slot-scope="text,record">
|
<template slot="htmlSlot" slot-scope="text,record">
|
||||||
<j-ellipsis v-if="text" class="primary-color" @click="toAttendance(record)" :value="text" :length="20"></j-ellipsis>
|
<j-ellipsis v-if="text" class="primary-color" @click="toAttendance(record)" :value="text"
|
||||||
|
:length="20"></j-ellipsis>
|
||||||
<span v-else></span>
|
<span v-else></span>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -102,10 +106,11 @@
|
|||||||
</template>
|
</template>
|
||||||
<span slot="action" slot-scope="text, record" class="action-span-cell">
|
<span slot="action" slot-scope="text, record" class="action-span-cell">
|
||||||
<!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
|
<!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
|
||||||
<a @click="releaseMeeing(record)" v-has=" 'otherMeeting:release' " :disabled="record.isRelease === 1 ">发布</a>
|
<!--调整为页面级按钮-->
|
||||||
|
<!-- <a @click="releaseMeeing(record)" v-has=" '' " :disabled="record.isRelease === 1 ">发布</a>-->
|
||||||
<a @click="handleUploadFile(record,'1')" v-has="'otherMeeting:uploadCouncil'">会议纪要</a>
|
<a @click="handleUploadFile(record,'1')" v-has="'otherMeeting:uploadCouncil'">会议纪要</a>
|
||||||
<a @click="handleUploadFile(record,'2')" v-has="'otherMeeting:upload'">上传文件</a>
|
<a @click="handleUploadFile(record,'2')" v-has="'otherMeeting:upload'">上传文件</a>
|
||||||
<!-- <a @click="handleSignup(record)">报名信息</a>-->
|
<!-- <a @click="handleSignup(record)">报名信息</a>-->
|
||||||
<a @click="handleEdit(record)" v-has="'otherMeeting:edit'">编辑</a>
|
<a @click="handleEdit(record)" v-has="'otherMeeting:edit'">编辑</a>
|
||||||
<a @click="handleDelete(record.id)" v-has="'otherMeeting:delete'">删除</a>
|
<a @click="handleDelete(record.id)" v-has="'otherMeeting:delete'">删除</a>
|
||||||
</span>
|
</span>
|
||||||
@@ -129,8 +134,9 @@ import '@/assets/less/TableExpand.less'
|
|||||||
import JDate from '@comp/tools/JDate'
|
import JDate from '@comp/tools/JDate'
|
||||||
import JDictSelectTag from '@comp/dict/JDictSelectTag'
|
import JDictSelectTag from '@comp/dict/JDictSelectTag'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'OtherMeeting',
|
name: 'OtherMeeting',
|
||||||
mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
|
mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
|
||||||
components: {
|
components: {
|
||||||
JYearDate,
|
JYearDate,
|
||||||
@@ -180,7 +186,8 @@ name: 'OtherMeeting',
|
|||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'startTime',
|
dataIndex: 'startTime',
|
||||||
width: 220,
|
width: 220,
|
||||||
customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
|
customRender: (text, record) => (
|
||||||
|
<j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '召开地点',
|
title: '召开地点',
|
||||||
@@ -227,9 +234,9 @@ name: 'OtherMeeting',
|
|||||||
deleteBatch: '/meeting/otherMeeting/deleteBatch',
|
deleteBatch: '/meeting/otherMeeting/deleteBatch',
|
||||||
exportXlsUrl: '/meeting/otherMeeting/exportXls',
|
exportXlsUrl: '/meeting/otherMeeting/exportXls',
|
||||||
importExcelUrl: '/meeting/otherMeeting/importExcel',
|
importExcelUrl: '/meeting/otherMeeting/importExcel',
|
||||||
releaseMeeingUrl:'/meeting/otherMeeting/release'// 发布会议的接口
|
releaseMeeingUrl: '/meeting/otherMeeting/release'// 发布会议的接口
|
||||||
},
|
},
|
||||||
disableMixinCreated:true
|
disableMixinCreated: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -245,8 +252,8 @@ name: 'OtherMeeting',
|
|||||||
/*
|
/*
|
||||||
* 上传会议文件
|
* 上传会议文件
|
||||||
* */
|
* */
|
||||||
handleUploadFile(record,type) {
|
handleUploadFile(record, type) {
|
||||||
this.$refs.modalForm.edit(record,type)
|
this.$refs.modalForm.edit(record, type)
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
* 报名信息
|
* 报名信息
|
||||||
@@ -285,8 +292,8 @@ name: 'OtherMeeting',
|
|||||||
handleAdd() {
|
handleAdd() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: '/incomePayments/meetManage/AddOrDetailMeet',
|
path: '/incomePayments/meetManage/AddOrDetailMeet',
|
||||||
query:{
|
query: {
|
||||||
meetingType:'4'
|
meetingType: '4'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -299,7 +306,7 @@ name: 'OtherMeeting',
|
|||||||
query: {
|
query: {
|
||||||
id: record.id,
|
id: record.id,
|
||||||
meetingName: record.meetingName,
|
meetingName: record.meetingName,
|
||||||
meetingType:'4'
|
meetingType: '4'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user