From 643aafb9f6ca5a004a46fa13fb3c5e384218c7ce Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 20 Oct 2021 18:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E6=89=93=E5=8C=85?=
=?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=B8=BA0=20=E7=BC=B4=E8=B4=B9=E4=BA=8C?=
=?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=9A=84=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../meetManage/AddOrDetailMeet.vue | 10 ++++++-
.../meetManage/OtherMeetingForm.vue | 20 ++++++++++++--
src/views/signUp/SignUpPage.vue | 26 +++++++++++++++----
3 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index bfe0528..24c72eb 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -525,7 +525,7 @@ export default {
this.$nextTick(() => {
// 加定时器是因为有可能赋值不成功
setTimeout(() => {
- this.form.setFieldsValue(pick(this.model,'notice','meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
+ this.form.setFieldsValue(pick(this.model,'notice','paymentQrCode','meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
})
// 如果是标协会议则回显 标协会议的字段
if (this.meetingType === '2') {
@@ -561,6 +561,10 @@ export default {
}
let placeName = values.convokeLocale
const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
+ // 如果会议的费用未为0 不能上传缴费凭证
+ if(values.meetingCosts === '0.00' ){
+ delete formData.paymentQrCode
+ }
// 添加编辑会议需要增加会议类型
formData.meetingType = this.meetingType
// 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id
@@ -787,6 +791,10 @@ export default {
// 会议费用为 0控制二维码显示隐藏
if (value === '0.00') {
this.QRcodeBool = false
+ // 如果付款二维码有值 需要清空
+ if(this.form.getFieldValue('paymentQrCode')){
+ this.form.resetFields('paymentQrCode')
+ }
} else {
this.QRcodeBool = true
}
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 91030eb..2e83492 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -36,9 +36,11 @@
@@ -117,6 +119,7 @@ import SelectContacts from '@comp/company/SelectContacts'
import pick from 'lodash.pick'
import JDictSelectTag from '@comp/dict/JDictSelectTag'
import moment from 'moment'
+import {getContactsById} from '@api/api'
export default {
name: 'OtherMeetingForm',
@@ -222,13 +225,24 @@ export default {
}
})
},
+
/*
* 选择了联系人后给邮寄联系人和地址赋值
* */
setAddressVal(val) {
- val = Object.assign({}, {postContactId: val.id, postContactAddress: val.contactAddress})
+ val = Object.assign({}, {postContactId: val.id, postContactAddress: val.contactAddress,postCode:val.postalCode})
this.$nextTick(() => {
- this.form.setFieldsValue(pick(val, 'postContactId', 'postContactAddress'))
+ this.form.setFieldsValue(pick(val, 'postContactId', 'postContactAddress','postCode'))
+ })
+ },
+ /*
+ * 选择联系人之后地址邮编复制
+ * */
+ changePost(val){
+ getContactsById({id:val}).then(res => {
+ if(res.success){
+ this.setAddressVal(res.result)
+ }
})
},
/*
@@ -248,8 +262,10 @@ export default {
changePayMode(e) {
if (e.target.value === 3) {
this.payModeBool = true
+ this.$emit('isPack',true)
} else {
this.payModeBool = false
+ this.$emit('isPack',false)
}
// 缴费方式为线上 要输入订单后四位
if(e.target.value === 2){
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index ca4a01e..ac852fe 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -175,13 +175,14 @@
+ :identify-type="identifyType" @formData="getFormData" @isPack="isPack">
@@ -321,6 +322,8 @@ export default {
inviteCodeBool: false,
// 邀请码错误状态
codeErrorBool: true,
+ // 是否是打包
+ isPackBool:false,
url: {
add: '/meeting/payMeetingSituation/signUp'
}
@@ -344,15 +347,15 @@ 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 = Number(this.currentMeetingInfo.meetingCosts) + Number(this.currentMeetingInfo.meetingCostsVip)
+ this.meetingCostSum = this.currentMeetingInfo.meetingCosts
} else {
this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
// 费用合计
- this.meetingCostSum = Number(this.currentMeetingInfo.meetingCosts)
+ this.meetingCostSum = this.currentMeetingInfo.meetingCosts
}
// 初始化召开时间
if (this.currentMeetingInfo.startTime) {
@@ -425,6 +428,15 @@ export default {
if (r != null) return unescape(r[2])
return null
},
+ // 是否打包 打包会议费用为0
+ isPack(val){
+ this.isPackBool = val
+ if(this.isPackBool){
+ this.meetingCostSum = '0.00'
+ }else {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCosts
+ }
+ },
/*
* 确定
* */
@@ -541,6 +553,11 @@ export default {
this.inviteCodeBool = false
// 选的否 身份置空
this.identifyType = null
+ this.$nextTick(() => {
+ if(this.$refs.formother){
+ this.$refs.formother.isLimitBool = true
+ }
+ })
}
},
/*
@@ -555,7 +572,6 @@ export default {
nextSetp() {
// 获取邀请码
let code = this.form.getFieldValue('code')
- console.log(this.currentMeetingInfo.cooperativeInvitationCode === code)
switch (code) {
// 合作伙伴
case this.currentMeetingInfo.cooperativeInvitationCode: