diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index a458fec..fe99b00 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -356,6 +356,29 @@ export const JeroListMixin = {
}
}
},
+ /**
+ * @description: 会议的发布 会议需要发布对应的企业人员才能在企业端看见该会议
+ * @param:record 表格行数据
+ * @Date 2021-12-29
+ * @author fac
+ * */
+ releaseMeeing(record){
+ if(this.url.releaseMeeingUrl){
+ const param = {
+ id: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)
+ }
+ })
+ }else {
+ this.$message.warn('请设置url.releaseMeeingUrl')
+ }
+ },
/*
* 打开项目详情模态框
* */
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index d1d0ba9..63c0e67 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -326,7 +326,7 @@
diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js
index 34faa7d..9654822 100644
--- a/src/views/incomePayments/meetManage/meetingValidate.js
+++ b/src/views/incomePayments/meetManage/meetingValidate.js
@@ -13,7 +13,7 @@ export default {
},
meetingFiles:{
rules: [
- { required: true, message: '请上传会议通知' },
+ { required: false, message: '请上传会议通知' },
],
validateTrigger:['change']
},
@@ -73,19 +73,19 @@ export default {
},
hotelName:{
rules: [
- { required: true, message: '请输入酒店名称' },
+ { required: false, message: '请输入酒店名称' },
],
validateTrigger:['blur']
},
hotelAddress:{
rules: [
- { required: true, message: '请输入酒店地址' },
+ { required: false, message: '请输入酒店地址' },
],
validateTrigger:['blur']
},
contactPerson:{
rules: [
- { required: true, message: '请输入酒店联系人' },
+ { required: false, message: '请输入酒店联系人' },
],
validateTrigger:['blur']
}
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 33138a6..aa5c731 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -28,8 +28,8 @@
-
-
+
+
+
+
+
+
+
+
+
+ 发布
会议纪要
上传文件
@@ -233,6 +242,13 @@ export default {
width: 120,
scopedSlots: {customRender: 'text'}
},
+ {
+ title: '发布状态',
+ align: 'center',
+ dataIndex: 'release_dictText',
+ scopedSlots: {customRender: 'text'},
+ width: 100,
+ },
{
title: '已提醒',
align: 'center',
@@ -267,7 +283,7 @@ export default {
upload: 'committeeMeeting:upload',
edit: 'committeeMeeting:edit',
delete: 'committeeMeeting:delete',
- uploadCouncil:'committeeMeeting:uploadCouncil'
+ uploadCouncil: 'committeeMeeting:uploadCouncil'
},
// 标协会议的权限编码
standardsMeetingAuthorCode: {
@@ -278,7 +294,8 @@ export default {
upload: 'standardsMeeting:upload',
edit: 'standardsMeeting:edit',
delete: 'standardsMeeting:delete',
- uploadCouncil:'standardsMeeting:uploadCouncil'
+ uploadCouncil: 'standardsMeeting:uploadCouncil',
+ releaseMeeing:'', // 发布会议的按钮权限
}
}
},
@@ -300,11 +317,14 @@ 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')
}
},
mounted() {
- if(this.disableMixinCreated){
+ if (this.disableMixinCreated) {
this.loadData(1)
}
},
@@ -330,6 +350,7 @@ export default {
delete: '/meeting/standardsMeeting/delete',
deleteBatch: '/meeting/standardsMeeting/deleteBatch',
exportXlsUrl: '/meeting/standardsMeeting/exportXls',
+ releaseMeeingUrl:'', // 发布会议的接口
}
} else if (meetingType === '5') {
// 分标委会议
@@ -411,7 +432,7 @@ export default {
return
} else {
// 传入选中的会议id
- this.$refs.publishRemindModal.open(this.selectedRowKeys,true)
+ this.$refs.publishRemindModal.open(this.selectedRowKeys, true)
this.$refs.publishRemindModal.title = '发布'
}
@@ -419,8 +440,8 @@ export default {
/*
* 上传文件
* */
- uploadFile(record,type) {
- this.$refs.modalForm.edit(record,type)
+ uploadFile(record, type) {
+ this.$refs.modalForm.edit(record, type)
},
/*
* 报名信息
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index 2af5fb8..d9e9c77 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -33,6 +33,11 @@
+
+
+
+
+
+
+ 发布
会议纪要
上传文件
@@ -120,6 +127,7 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconImg from '@/assets/imgs/icon/icon_international_meeting.png'
import '@/assets/less/TableExpand.less'
import JDate from '@comp/tools/JDate'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
import moment from 'moment'
export default {
@@ -129,6 +137,7 @@ export default {
JYearDate,
UploadMeetFileModal,
PageHeaderTitle,
+ JDictSelectTag,
JDate
},
data() {
@@ -188,6 +197,13 @@ export default {
scopedSlots: {customRender: 'text'},
width: 120,
},
+ {
+ title: '发布状态',
+ align: 'center',
+ dataIndex: 'release_dictText',
+ scopedSlots: {customRender: 'text'},
+ width: 120,
+ },
{
title: '创建时间',
align: 'center',
@@ -212,6 +228,7 @@ export default {
deleteBatch: '/meeting/internalMeeting/deleteBatch',
exportXlsUrl: '/meeting/internalMeeting/exportXls',
importExcelUrl: '/meeting/internalMeeting/importExcel',
+ releaseMeeingUrl:'', // 发布会议的接口
},
disableMixinCreated:true
}
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 7e3b737..ec11d7a 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -33,6 +33,12 @@
+
+
+
+
+
+
- 会议纪要
- 上传文件
+
+ 发布
+ 会议纪要
+ 上传文件
- 编辑
- 删除
+ 编辑
+ 删除
@@ -119,6 +127,7 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconImg from '@/assets/imgs/icon/icon_other_meeting.png'
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',
@@ -127,7 +136,8 @@ name: 'OtherMeeting',
JYearDate,
UploadMeetFileModal,
PageHeaderTitle,
- JDate
+ JDate,
+ JDictSelectTag
},
data() {
return {
@@ -186,6 +196,13 @@ name: 'OtherMeeting',
width: 120,
scopedSlots: {customRender: 'text'}
},
+ {
+ title: '发布状态',
+ align: 'center',
+ dataIndex: 'release_dictText',
+ scopedSlots: {customRender: 'text'},
+ width: 120,
+ },
{
title: '创建时间',
align: 'center',
@@ -210,6 +227,7 @@ name: 'OtherMeeting',
deleteBatch: '/meeting/otherMeeting/deleteBatch',
exportXlsUrl: '/meeting/otherMeeting/exportXls',
importExcelUrl: '/meeting/otherMeeting/importExcel',
+ releaseMeeingUrl:''// 发布会议的接口
},
disableMixinCreated:true
}