diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index a9b8ab6..0c1bf4c 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -498,6 +498,12 @@ export default {
this.meetingType = record.meetingType + ''
// 编辑根据接口返回的会议类型获取不同的会议url
this.url = this.createUrlByMeetingType(this.meetingType)
+ // 判断会议费用是否为 0 缴费二维码显示
+ if(this.model.meetingCosts === '0.00' ){
+ this.QRcodeBool = false
+ }else {
+ this.QRcodeBool = true
+ }
} else {
this.title = '新增会议'
// 如果是标协会会议需要显示酒店联系人
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 6cc4e64..a586ecd 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -58,13 +58,13 @@
{{ currentMeetingInfo.vipInvitationCode }}
- {{ currentMeetingInfo.speakerInvitationCode }}
+
- {{ currentMeetingInfo.guestInvitationCode }}
+
- {{ currentMeetingInfo.cooperativeInvitationCode }}
+
diff --git a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
index 3f2558d..a9a8e72 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
@@ -5,12 +5,12 @@
个人信息
-
-
+
+
{{ model.companyName }}
-
+
{{ model.companyContactName }}
@@ -32,7 +32,7 @@
行程信息
-
+
{{ model.checkInHotel_dictText }}
@@ -51,7 +51,7 @@
缴费信息
-
+
{{ model.payMode_dictText }}
@@ -69,7 +69,7 @@
邮寄信息
-
+
{{ model.postContactName }}
@@ -88,7 +88,7 @@
行程信息
-
+
{{ model.checkInHotel_dictText }}
@@ -106,7 +106,7 @@
缴费信息
-
+
{{ model.payMode_dictText }}
@@ -125,7 +125,7 @@
邮寄信息
-
+
{{ model.postContactName }}
@@ -351,6 +351,7 @@ export default {
.ant-col {
label {
color: #999;
+ min-width: 45px;
}
span {
diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
index f922643..f5d6406 100644
--- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
+++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
@@ -199,7 +199,7 @@
-
+
{{ currentMeetingInfo.registerDeadline }}
-
+
@@ -177,7 +177,7 @@ export default {
if (this.currentMeetingInfo.meetingCostsVip) {
this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人) 标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
} else {
- this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
+ this.meetingMoney = ` ${this.currentMeetingInfo.meetingCosts}/人`
}
// 初始化召开时间
if (this.currentMeetingInfo.startTime) {
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index b7b8fcf..a1e2763 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -359,13 +359,13 @@ export default {
if (res.success) {
this.currentMeetingInfo = res.result
this.meetingType = this.currentMeetingInfo.meetingType
- // 初始化会议费用 这里的判断有问题 应该根据单位是否是标协会员单位 显示不同的会议费用
+ // 初始化会议费用
if (this.currentMeetingInfo.meetingCostsVip) {
this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人) 标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
// 费用合计
this.meetingCostSum = this.currentMeetingInfo.meetingCosts
} else {
- this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
+ this.meetingMoney = `${this.currentMeetingInfo.meetingCosts}/人`
// 费用合计
this.meetingCostSum = this.currentMeetingInfo.meetingCosts
}
@@ -520,6 +520,24 @@ export default {
if (e.target.value !== 1) {
this.guestType = null
}
+ // 当前会议是国际研讨会 并且选择身份是内部企业的会议费用为0
+ if(e.target.value === 3 && this.currentMeetingInfo.meetingType === '3' ){
+ this.meetingCostSum = '0.00'
+ }else {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCosts
+ }
+ // 当前会议不是国际研讨会议 身份选择嘉宾和 内部企业的会议费用为0
+ if(e.target.value !== 2 && this.currentMeetingInfo.meetingType !== '3' ){
+ this.meetingCostSum = '0.00'
+ }else {
+ // 会议是标协会议的话 需要判断企业是否是标准协会
+ if(this.currentMeetingInfo.meetingType === '2' && this.isStandardBool){
+ this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
+ }else {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCosts
+ }
+
+ }
},
/*
* 选择嘉宾类型
@@ -601,32 +619,39 @@ export default {
* 下一步
* */
nextSetp() {
- // 获取邀请码
- let code = this.form.getFieldValue('code')
- switch (code) {
- // 合作伙伴
- case this.currentMeetingInfo.cooperativeInvitationCode:
- this.identifyType = 1
- this.guestType = 4
- break
- // 演讲嘉宾
- case this.currentMeetingInfo.speakerInvitationCode:
- this.identifyType = 1
- this.guestType = 2
- break
- // 特邀嘉宾
- case this.currentMeetingInfo.guestInvitationCode:
- this.identifyType = 1
- this.guestType = 3
- break
- // vip
- case this.currentMeetingInfo.vipInvitationCode:
- this.identifyType = 1
- this.guestType = 1
- break
- default :
- this.guestType = null
- }
+ this.form.validateFields(['code'],(err) => {
+ if(!err){
+ // 获取邀请码
+ let code = this.form.getFieldValue('code')
+ switch (code) {
+ // 合作伙伴
+ case this.currentMeetingInfo.cooperativeInvitationCode:
+ this.identifyType = 1
+ this.guestType = 4
+ break
+ // 演讲嘉宾
+ case this.currentMeetingInfo.speakerInvitationCode:
+ this.identifyType = 1
+ this.guestType = 2
+ break
+ // 特邀嘉宾
+ case this.currentMeetingInfo.guestInvitationCode:
+ this.identifyType = 1
+ this.guestType = 3
+ break
+ // vip
+ case this.currentMeetingInfo.vipInvitationCode:
+ this.identifyType = 1
+ this.guestType = 1
+ break
+ default :
+ this.guestType = null
+ }
+ }
+ })
+
+
+
},
/*
* 校验邀请码是否正确 给出提示
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 19c292b..e99ef7b 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -595,7 +595,7 @@ export default {
that.onClearSelected()
}
} else {
- that.$message.warning('删除失败!')
+ that.$message.warning(resp.message)
}
})
}