diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index f5b934b..526b6cf 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -830,21 +830,8 @@ export default { break } } - }, - watch:{ - $route:{ - immediate: true, - handler: function(val, oldVal){ - if(val.query.meetingType && val.query.meetingType === '3' ){ - val.meta.title ='国际研讨会参会情况' - console.log(val,'val') - console.log(this.$route,'this.$ROUTE') - } - }, - // 深度观察监听 - deep: true - } } + } diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index 134bdba..e531bf0 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -365,13 +365,20 @@ export default { * 参会情况 * */ toAttendance(record) { - const that = this + let path ='' + let meetingType = this.$route.query.meetingType + '' + // 分标委会议与标协会议的跳转 + if(meetingType === '2' ){ + path = '/incomePayments/meetManage/AttendanceStandardsMeeting' + }else if(meetingType === '5'){ + path = '/incomePayments/meetManage/AttendanceCommitteeMeeting' + } this.$router.push({ - path: '/incomePayments/meetManage/Attendance', + path: path, query: { id: record.id, meetingName: record.meetingName, - meetingType:that.$route.query.meetingType + '' + meetingType:meetingType } }) }, diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index 8fd0687..e08f403 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -331,7 +331,7 @@ export default { * */ toAttendance(record) { this.$router.push({ - path: '/incomePayments/meetManage/Attendance', + path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting', query: { id: record.id, meetingName: record.meetingName, diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue index 4c5a648..963043e 100644 --- a/src/views/projectManagement/InternationalSeminar.vue +++ b/src/views/projectManagement/InternationalSeminar.vue @@ -270,7 +270,7 @@ export default { * */ toAttendance(record) { this.$router.push({ - path: '/incomePayments/meetManage/Attendance', + path: '/incomePayments/meetManage/AttendanceInternalMeeting', query: { id: record.id, meetingName: record.meetingName, diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue index c5ae5d6..21347d2 100644 --- a/src/views/projectManagement/OtherMeeting.vue +++ b/src/views/projectManagement/OtherMeeting.vue @@ -275,7 +275,7 @@ name: 'OtherMeeting', * */ toAttendance(record) { this.$router.push({ - path: '/incomePayments/meetManage/Attendance', + path: '/incomePayments/meetManage/AttendanceOhterMeeting', query: { id: record.id, meetingName: record.meetingName,