diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 2258347..2f31ba4 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -630,7 +630,7 @@ import JImageUpload from '@comp/jero/JImageUpload' import {checkMeetingName} from '@/utils/validateOnly' import {addZero} from '@/utils/util' import {money, phoneReg} from '@/utils/validate' -import {LinkTopicsEnums, MeetTypeEnums} from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums' export default { @@ -931,7 +931,7 @@ export default { this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime] // 起草组会议费用默认0 (功能安全中心同起草组) - if (this.meetingType === '7' || this.meetingType === MeetTypeEnums.safetyCenter.value) { + if (this.meetingType === '7' || this.meetingType === MeetingTypeEnums.safetyCenter.value) { this.model.meetingCosts = '0.00' this.QRcodeBool = false } @@ -1049,7 +1049,7 @@ export default { } // 如果是 应用安全中心 来的加上id和会议类型 if (this.isSafetyCenterId) { - formData.meetingType = MeetTypeEnums.safetyCenter.value + formData.meetingType = MeetingTypeEnums.safetyCenter.value formData.projectId = this.$route.query.safetyCenterId } // 转换召开时间 @@ -1413,6 +1413,12 @@ export default { add: '/meeting/draftGroupMeeting/add', edit: '/meeting/draftGroupMeeting/edit' } + // 功能安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return { + add: '', + edit: '' + } } }, /* diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 8f23fa8..fb2859a 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -437,6 +437,7 @@ import { downloadFile } from '../../../api/manage' import WasicTopicData from './modules/wasicStaticData' import { formatMoney } from '@/utils/formatMoney' import {getPayConfirmList} from '@api/incomePaymentsApi' +import {MeetingTypeEnums} from '@/enums/commonEnums' export default { @@ -656,6 +657,18 @@ export default { auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp', guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag' }, + // 功能安全中心会议的参会情况的权限编码 + safetyCenterMeetingCode: { + search: 'safetyCenterMeetingSituation:search', + add: 'safetyCenterMeetingSituation:add', + export: 'safetyCenterMeetingSituation:export', + batchDel: 'safetyCenterMeetingSituation:batchDel', + edit: 'safetyCenterMeetingSituation:edit', + delete: 'safetyCenterMeetingSituation:delete', + auditRecord: 'safetyCenterMeetingSituation:auditCredentials', + auditSignUpInfo: 'safetyCenterMeetingSituation:auditSignUp', + guestsUploadFileFlag: 'safetyCenterMeetingSituation:guestsUploadFileFlag' + }, disableMixinCreated: true, // url: { // list: '/meeting/payMeetingSituation/page', @@ -720,6 +733,14 @@ export default { exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls', importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel' }, + // 起草组会议的url + safetyCenterMeetingUrl: { + list: '/meeting/draftGroupMeetingSituation/page', + delete: '/meeting/draftGroupMeetingSituation/delete', + deleteBatch: '/meeting/draftGroupMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls', + importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel' + }, // 当前的会议信息详情 currentMeetingInfo: {}, meetingType: '', @@ -832,6 +853,9 @@ export default { return this.councilMeetingUrl case '7': return this.draftGroupMeetingUrl + // 安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return this.safetyCenterMeetingUrl // 为了解决控制台报错写的 default:return this.workGroupMeetingUrl } @@ -1036,6 +1060,9 @@ export default { return '理事会会议' case '7': return '起草组会议' + // 功能安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return MeetingTypeEnums.safetyCenter.name default: return '其他会议' } @@ -1138,6 +1165,9 @@ export default { case '7': this.authorCode = Object.assign({}, this.draftGroupMeetingCode) break + // 功能安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + this.authorCode = Object.assign({}, this.safetyCenterMeetingCode) } } } diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 32a6ffa..c6c27f9 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -169,7 +169,7 @@ import {httpAction} from '@api/manage' import pick from 'lodash.pick' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import { queryCompanyInfoById } from '../../../api/api' -import { LinkTopicsEnums } from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums' import WasicTopicData from './modules/wasicStaticData' export default { @@ -289,6 +289,11 @@ export default { add: '/meeting/draftGroupMeetingSituation/add', edit:'/meeting/draftGroupMeetingSituation/edit' }, + // 功能安全中心会议的url + safetyCenterMeetingUrl: { + add: '/meeting/draftGroupMeetingSituation/add', + edit:'/meeting/draftGroupMeetingSituation/edit' + }, title:'添加参会人', // 当前参会企业是否是内部企业 isInternalEnterprise: false, @@ -340,6 +345,8 @@ export default { return this.councilMeetingUrl case '7': return this.draftGroupMeetingUrl + case MeetingTypeEnums.safetyCenter.value: + return this.safetyCenterMeetingUrl } }, }, diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue index bc532d8..2736b8e 100644 --- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue +++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue @@ -61,6 +61,7 @@ import { ACCESS_TOKEN } from '../../../../store/mutation-types' import { Modal } from 'ant-design-vue' import store from '@/store' import { isExternalTerminal } from '../../../../utils/util' +import {MeetingTypeEnums} from '@/enums/commonEnums' const FILE_TYPE_ALL = 'all' const columns = [ @@ -208,6 +209,12 @@ export default { uploadFile: '/meeting/draftGroupMeeting/uploadFile', uploadCouncilFile: '/meeting/draftGroupMeeting/uploadCouncilFile', } + // 安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return { + uploadFile: '', + uploadCouncilFile: '' + } } }, handleOk() { diff --git a/src/views/projectManagement/AllMeetingList.vue b/src/views/projectManagement/AllMeetingList.vue index c2d331e..b77366e 100644 --- a/src/views/projectManagement/AllMeetingList.vue +++ b/src/views/projectManagement/AllMeetingList.vue @@ -151,6 +151,7 @@ import '@/assets/less/TableExpand.less' import JDate from '@comp/tools/JDate' import JDictSelectTag from '@comp/dict/JDictSelectTag' import moment from 'moment' +import {MeetingTypeEnums} from '@/enums/commonEnums' export default { name: 'AllMeetingList', @@ -296,6 +297,8 @@ export default { pathMap.set('5','/incomePayments/meetManage/AttendanceCommitteeMeeting') pathMap.set('6','/incomePayments/meetManage/AttendanceCouncilMeeting') pathMap.set('7','/incomePayments/meetManage/AttendanceDraftGroupMeeting') + // 功能安全中心会议 + pathMap.set(MeetingTypeEnums.safetyCenter.value,'/incomePayments/meetManage/AttendanceFunctionalSafetyCenter') this.$router.push({ path: pathMap.get(record.meetingType+''), query: {