diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index e16433d..7c7bf1f 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -5,7 +5,7 @@ const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/quer // 判断工作组成员是否设置来款通知 const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param) // 工作组会议的发布提醒 -const publishRemind = (param) => postAction('/meeting/payMeeting/publishReminder', param) +const publishRemind = (param) => postAction('/meeting/workGroupMeeting/publishReminder', param) // 通过id获取收入合同信息 const getRevenueContractById = (param) => getAction('/contract/payIncomeContract/queryById', param) // 收入合同审核 diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index 401af7f..5c3b6ff 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -255,6 +255,8 @@ export default { this.contranctInfo =Object.assign({},record) console.log(record,'meetingPerson') this.filters.companyId = record.signedCompanyId + // 列表查询加入打包年份 + this.filters.packYear = record.packYear //记录合同id this.contractId = this.contranctInfo.id // 记录打包状态 diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 4ae514d..03ed8f6 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -492,6 +492,8 @@ export default { this.title = '编辑会议' // 修改会议类型 控制dom显示 编辑取接口查到的会议类型 this.meetingType = record.meetingType + '' + // 编辑根据接口返回的会议类型获取不同的会议类型 + this.url = this.createUrlByMeetingType(this.meetingType) } else { this.title = '新增会议' // 如果是标协会会议需要显示酒店联系人 @@ -503,6 +505,8 @@ export default { } // 新增取路由参数 this.meetingType = this.$route.query.meetingType + // 新增根据路由参数 会议类型更换不同的接口 + this.url = this.createUrlByMeetingType(this.meetingType) } console.log(this.model) // 召开时间回显 @@ -696,6 +700,38 @@ export default { this.newSignInTime = dateString }, /* + * 根据会议类型返回不同的会议新增与编辑接口 + * */ + createUrlByMeetingType(meetingType){ + switch (String(meetingType)){ + // 工作组会议 + case '1':return { + add:'/meeting/workGroupMeeting/add', + edit:'/meeting/workGroupMeeting/edit' + } + // 标协会议 + case '2':return { + add:'/meeting/standardsMeeting/add', + edit:'/meeting/standardsMeeting/edit' + } + // 国际研讨会 + case '3':return { + add:'/meeting/internalMeeting/add', + edit:'/meeting/internalMeeting/edit' + } + // 其他会议 + case '4':return { + add:'/meeting/otherMeeting/add', + edit:'/meeting/otherMeeting/edit' + } + // 分标委会议 + case '5':return { + add:'/meeting/committeeMeeting/add', + edit:'/meeting/committeeMeeting/edit' + } + } + }, + /* * 校验邀请码 * */ validateCode(rule, value, callback) { diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 5660559..55a5c11 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -428,14 +428,14 @@ export default { }, // 工作组会议的参会情况的权限编码 workGroupMeetingCode:{ - search:'workGroupMeetingSituationSituation:search', - add:'workGroupMeetingSituationSituation:add', - export:'workGroupMeetingSituationSituation:export', - batchDel:'workGroupMeetingSituationSituation:batchDel', - edit:'workGroupMeetingSituationSituation:edit', - delete:'workGroupMeetingSituationSituation:delete', - auditRecord:'workGroupMeetingSituationSituation:auditCredentials', - auditSignUpInfo:'workGroupMeetingSituationSituation:auditSignUp' + search:'workGroupMeetingSituation:search', + add:'workGroupMeetingSituation:add', + export:'workGroupMeetingSituation:export', + batchDel:'workGroupMeetingSituation:batchDel', + edit:'workGroupMeetingSituation:edit', + delete:'workGroupMeetingSituationS:delete', + auditRecord:'workGroupMeetingSituation:auditCredentials', + auditSignUpInfo:'workGroupMeetingSituation:auditSignUp' }, // 国际研讨会的参会情况的权限编码 internalMeetingCode:{ diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index 647e7e9..0c8cd9a 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -250,13 +250,13 @@ export default { }, // 标协会议的权限编码 standardsMeetingAuthorCode:{ - add:' standardsMeeting:add', - search:' standardsMeeting:search', - export:' standardsMeeting:export', - batchDel:' standardsMeeting:batchDel', - upload:' standardsMeeting:upload', - edit:' standardsMeeting:edit', - delete:' standardsMeeting:delete' + add:'standardsMeeting:add', + search:'standardsMeeting:search', + export:'standardsMeeting:export', + batchDel:'standardsMeeting:batchDel', + upload:'standardsMeeting:upload', + edit:'standardsMeeting:edit', + delete:'standardsMeeting:delete' } } }, diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index fe072e2..eb4885e 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -276,7 +276,8 @@ export default { this.$router.push({ path: '/incomePayments/meetManage/AddOrDetailMeet', query: { - workingGroupProjectId: currentId + workingGroupProjectId: currentId, + meetingType:'1' } }) },