From e9d1c32df853fd1316cb8c3d6df74d4cf2920069 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Wed, 22 Sep 2021 14:07:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8A=A5=E5=90=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetManage/AddOrDetailMeet.vue | 15 ++++++----- .../incomePayments/meetManage/Attendance.vue | 2 +- .../meetManage/SignUpInfoEdit.vue | 3 --- .../meetManage/modules/AuditModal.vue | 6 ++--- .../SafeguardStardsMemberList.vue | 6 ----- .../projectManagement/CommitteeMeeting.vue | 25 +++++++++++++------ 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index bdf03bc..681be4d 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -458,17 +458,17 @@ export default { // 是否从工作组会议维护来的 isWorkGroupMeetType() { if (this.$route.query.workingGroupProjectId) { - return false - } else { return true + } else { + return false } }, // 是否从分标委会议维护来的 isCaseCommitteeId() { if (this.$route.query.caseCommitteeId) { - return false - } else { return true + } else { + return false } }, }, @@ -571,13 +571,15 @@ export default { } let placeName = values.convokeLocale const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)}) + // 添加会议需要增加会议类型 + formData.meetingType = this.$route.query.meetingType // 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id - if (!this.isWorkGroupMeetType) { + if (this.isWorkGroupMeetType) { formData.meetingType = '1' formData.workingGroupId = this.$route.query.workingGroupProjectId } // 如果是分标委会议需要加上分标委id与会议类型 - if (!this.isCaseCommitteeId) { + if (this.isCaseCommitteeId) { formData.meetingType = '5' formData.caseCommitteeId = this.$route.query.caseCommitteeId } @@ -599,6 +601,7 @@ export default { that.$message.warning(res.message) } }).finally(() => { + that.confirmLoading = false }) } }) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 9c374d6..de51458 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -219,7 +219,7 @@ 审核凭证 - 审核报名信息 + 审核报名信息 编辑 删除 diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 6f1e3b3..ff657da 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -252,9 +252,6 @@ export default { id:this.model.companyContactTemporaryId, name:this.model.companyContactName } - - console.log(this.$refs.formother,'=====================') - //国际研讨会的嘉宾编辑回显值 this.$nextTick(() => { // 普通会议的编辑回显值 diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue index 61fdc8f..87da7b6 100644 --- a/src/views/incomePayments/meetManage/modules/AuditModal.vue +++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue @@ -153,7 +153,7 @@ export default { // 审核凭证 check: '/meeting/payMeetingSituation/check', // 审核报名信息 - checkSignUp:'' + checkSignUp:'/meeting/payMeetingSituation/checkRegister' }, // 审核结果选择 checkBool:false, @@ -183,10 +183,10 @@ export default { let httpurl = '' if(that.checkSignBool){ // 审核报名信息的接口 - httpurl = this.url.check + httpurl = this.url.checkSignUp }else { // 审核凭证的接口 - httpurl = this.url.checkSignUp + httpurl = this.url.check } let method = 'post' const formData = Object.assign({}, values) diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue index ab3ed7b..4c3b302 100644 --- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue @@ -193,12 +193,6 @@ export default { dataIndex: 'paidAmount', scopedSlots: { customRender: 'text' }, }, - { - title: '注册时间', - align: 'center', - dataIndex: 'registerTime', - scopedSlots: { customRender: 'text' }, - }, { title: '打包', align: 'center', diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index daaf3ac..e025d0d 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -277,13 +277,24 @@ export default { * */ handleAdd() { // 分表委的新增应该是需要分表委的id - this.$router.push({ - path: '/incomePayments/meetManage/AddOrDetailMeet', - query: { - meetingType:this.meetingType, - caseCommitteeId:this.caseCommitteeId - } - }) + if(this.meetingType === '5'){ + this.$router.push({ + path: '/incomePayments/meetManage/AddOrDetailMeet', + query: { + meetingType:this.meetingType, + caseCommitteeId:this.caseCommitteeId + } + }) + } + // 标协会议新增 + if(this.meetingType === '2'){ + this.$router.push({ + path: '/incomePayments/meetManage/AddOrDetailMeet', + query: { + meetingType:this.meetingType + } + }) + } }, /* * 编辑