From a2aae33a723be5b645797a72b123fa11ffed99be Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 4 Jan 2022 10:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=85=B6?=
=?UTF-8?q?=E4=BB=96=E4=BC=9A=E8=AE=AE=20=E5=9B=BD=E9=99=85=E7=A0=94?=
=?UTF-8?q?=E8=AE=A8=E4=BC=9A=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE=20?=
=?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83=E8=B0=83=E6=95=B4=E4=B8=BA?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BA=A7=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mixins/JeroListMixin.js | 20 ++++++++---
.../projectManagement/CommitteeMeeting.vue | 14 ++++----
.../InternationalSeminar.vue | 3 +-
src/views/projectManagement/OtherMeeting.vue | 35 +++++++++++--------
4 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index a2a37b9..bb1299e 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -362,17 +362,27 @@ export const JeroListMixin = {
* @Date 2021-12-29
* @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
if(this.url.releaseMeeingUrl){
- // 为什么是meetingIds 做的时候后端跟 分标委会议发布那样做了 就这样传参了
const param = {
- meetingIds:[record.id]
+ meetingIds:this.selectedRowKeys
}
-
this.$confirm({
title: '确认发布',
- content: '确定要发布此会议吗?',
+ content: '确定要发布选中的会议吗?',
onOk: function () {
postAction(that.url.releaseMeeingUrl,param).then(res => {
if(res.success){
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index fd54d6c..3b6ddc5 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -102,6 +102,8 @@
发布
+
+ 发布
@@ -133,8 +135,9 @@
-
- 发布
+
+
+
会议纪要
上传文件
@@ -295,7 +298,7 @@ export default {
edit: 'standardsMeeting:edit',
delete: 'standardsMeeting:delete',
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')
} else {
// 分标委会议 列表表头 去掉可发布列
-
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() {
@@ -350,7 +352,7 @@ export default {
delete: '/meeting/standardsMeeting/delete',
deleteBatch: '/meeting/standardsMeeting/deleteBatch',
exportXlsUrl: '/meeting/standardsMeeting/exportXls',
- releaseMeeingUrl:'/meeting/standardsMeeting/release', // 发布会议的接口
+ releaseMeeingUrl: '/meeting/standardsMeeting/release', // 发布会议的接口
}
} else if (meetingType === '5') {
// 分标委会议
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index acb38a6..c54caa2 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -71,6 +71,7 @@
新增
导出
批量删除
+ 发布
@@ -102,7 +103,7 @@
- 发布
+
会议纪要
上传文件
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index ce60563..3c3ec26 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -36,7 +36,8 @@
-
+
@@ -70,8 +71,10 @@
@@ -92,7 +95,8 @@
@change="handleTableChange">
-
+
@@ -102,10 +106,11 @@
- 发布
+
+
会议纪要
上传文件
-
+
编辑
删除
@@ -129,8 +134,9 @@ import '@/assets/less/TableExpand.less'
import JDate from '@comp/tools/JDate'
import JDictSelectTag from '@comp/dict/JDictSelectTag'
import moment from 'moment'
+
export default {
-name: 'OtherMeeting',
+ name: 'OtherMeeting',
mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
components: {
JYearDate,
@@ -180,7 +186,8 @@ name: 'OtherMeeting',
align: 'center',
dataIndex: 'startTime',
width: 220,
- customRender: (text, record) => ()
+ customRender: (text, record) => (
+ )
},
{
title: '召开地点',
@@ -227,9 +234,9 @@ name: 'OtherMeeting',
deleteBatch: '/meeting/otherMeeting/deleteBatch',
exportXlsUrl: '/meeting/otherMeeting/exportXls',
importExcelUrl: '/meeting/otherMeeting/importExcel',
- releaseMeeingUrl:'/meeting/otherMeeting/release'// 发布会议的接口
+ releaseMeeingUrl: '/meeting/otherMeeting/release'// 发布会议的接口
},
- disableMixinCreated:true
+ disableMixinCreated: true
}
},
computed: {
@@ -245,8 +252,8 @@ name: 'OtherMeeting',
/*
* 上传会议文件
* */
- handleUploadFile(record,type) {
- this.$refs.modalForm.edit(record,type)
+ handleUploadFile(record, type) {
+ this.$refs.modalForm.edit(record, type)
},
/*
* 报名信息
@@ -285,8 +292,8 @@ name: 'OtherMeeting',
handleAdd() {
this.$router.push({
path: '/incomePayments/meetManage/AddOrDetailMeet',
- query:{
- meetingType:'4'
+ query: {
+ meetingType: '4'
}
})
},
@@ -299,7 +306,7 @@ name: 'OtherMeeting',
query: {
id: record.id,
meetingName: record.meetingName,
- meetingType:'4'
+ meetingType: '4'
}
})
},