diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index e69528d..9a613c1 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -133,9 +133,9 @@ dictCode="signup_status"/> - + + v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' || currentMeetingInfo.meetingType === '6' "> @@ -257,9 +257,9 @@ 审核凭证 - + 审核报名信息 编辑 @@ -471,6 +471,17 @@ export default { auditRecord: 'standardsMeetingSituation:auditCredentials', auditSignUpInfo: 'standardsMeetingSituation:auditSignUp' }, + // 理事会的参会情况的权限编码 + councilMeetingCode: { + search: 'councilMeetingSituation:search', + add: 'councilMeetingSituation:add', + export: 'councilMeetingSituation:export', + batchDel: 'councilMeetingSituation:batchDel', + edit: 'councilMeetingSituation:edit', + delete: 'councilMeetingSituation:delete', + auditRecord: 'councilMeetingSituation:auditCredentials', + auditSignUpInfo: 'councilMeetingSituation:auditSignUp' + }, disableMixinCreated: true, // url: { // list: '/meeting/payMeetingSituation/page', @@ -519,6 +530,14 @@ export default { exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls', importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel' }, + // 理事会的url + councilMeetingUrl: { + list: '/meeting/councilMeetingSituation/page', + delete: '/meeting/councilMeetingSituation/delete', + deleteBatch: '/meeting/councilMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/councilMeetingSituation/exportXls', + importExcelUrl: '/meeting/councilMeetingSituation/importExcel' + }, // 当前的会议信息详情 currentMeetingInfo: {}, meetingType: '', @@ -762,6 +781,8 @@ export default { return '其他会议' case '5': return '分标委会议' + case '6': + return '理事会会议' default: return '其他会议' } @@ -836,6 +857,9 @@ export default { case '5': this.authorCode = Object.assign({}, this.committeeMeetingCode) break + case '6': + this.authorCode = Object.assign({}, this.councilMeetingCode) + break } } } diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 506a3cc..0912176 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -237,6 +237,11 @@ export default { add: '/meeting/workGroupMeetingSituation/add', edit:'/meeting/workGroupMeetingSituation/edit' }, + // 理事会会议 + councilMeetingUrl:{ + add: '/meeting/councilMeetingSituation/add', + edit:'/meeting/councilMeetingSituation/edit' + }, title:'添加参会人', } }, diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue index 44559dd..195ccb2 100644 --- a/src/views/incomePayments/meetManage/modules/AuditModal.vue +++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue @@ -196,6 +196,13 @@ export default { // 审核报名信息 checkSignUp: '/meeting/standardsMeetingSituation/checkRegister' }, + // 理事会会议url + councilMeetingUrl: { + // 审核凭证 + check: '/meeting/councilMeetingSituation/check', + // 审核报名信息 + checkSignUp: '/meeting/councilMeetingSituation/checkRegister' + }, // 审核结果选择 checkBool: false, // 是否是审核报名信息 @@ -289,6 +296,8 @@ export default { return this.otherMeetingUrl case '5': return this.committeeMeetingUrl + case '6': + return this.councilMeetingUrl } } } diff --git a/src/views/incomePayments/memberManage/CouncilMeetingManage.vue b/src/views/incomePayments/memberManage/CouncilMeetingManage.vue index 0f89f26..ba95ba7 100644 --- a/src/views/incomePayments/memberManage/CouncilMeetingManage.vue +++ b/src/views/incomePayments/memberManage/CouncilMeetingManage.vue @@ -331,7 +331,7 @@ export default { * */ toAttendance(record) { this.$router.push({ - path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting', + path: '/incomePayments/meetManage/AttendanceCouncilMeeting', query: { id: record.id, meetingName: record.meetingName, diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue index a090cd6..b48544c 100644 --- a/src/views/signUp/SignUpEntrance.vue +++ b/src/views/signUp/SignUpEntrance.vue @@ -217,6 +217,8 @@ export default { return '其他会议' case '5': return '分标委会议' + case '6': + return '理事会会议' } } else { return '' diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index b4469b0..50072e6 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -420,6 +420,8 @@ export default { return '其他会议' case '5': return '分标委会议' + case '6': + return '理事会会议' } } else { return ''