From ca5e27c6e18fc8400d7c1d1faefd2068388830b3 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 27 Sep 2021 15:23:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=85=B3=E8=81=94=E4=BC=9A=E8=AE=AE=20?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/AddMeetingPerson.vue | 165 +++++++++++------- .../modules/SelectMeetingProjectModule.vue | 11 ++ .../modules/SelectMemberProjectModule.vue | 8 + .../meetManage/OtherMeetingForm.vue | 2 +- src/views/signUp/SignUpPage.vue | 27 +-- src/views/system/modules/UserModal.vue | 2 +- 6 files changed, 122 insertions(+), 93 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue index ffd1a1c..5b96fa1 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue @@ -14,7 +14,8 @@ - + @@ -22,7 +23,8 @@ - + @@ -41,14 +43,14 @@ v-decorator="['phone']" disabled="" :maxLength='11' - > + > - + 嘉宾 参会人 内部企业 @@ -76,16 +78,16 @@ - - - + + + - + 汇款 线上缴费 打包 @@ -119,7 +121,8 @@ - + 是 否 @@ -128,15 +131,18 @@ - + - + + - + @@ -145,7 +151,7 @@ - {{meetingCosts}}元 + {{ meetingCosts }}元 @@ -169,6 +175,7 @@ import JImageUpload from '@comp/jero/JImageUpload' import JDate from '@comp/tools/JDate' import pick from 'lodash.pick' import {getContactsById} from '@api/api' +import {postcode} from '@/utils/validate' export default { @@ -183,10 +190,10 @@ export default { }, data() { return { - title:'新增参会人', - width:800, - visible:false, - confirmLoading:false, + title: '新增参会人', + width: 800, + visible: false, + confirmLoading: false, form: this.$form.createForm(this), model: {}, labelCol: { @@ -211,14 +218,14 @@ export default { validateTrigger: 'change' }, postCode: { - rules: [{required: true, message: '请输入邮寄地址'}], + rules: [{required: true, validator: this.validatePostCode}], validateTrigger: 'blur' }, paymentRecord: { rules: [{required: true, message: '请上传缴费凭证'}], validateTrigger: 'change' }, - housiwei: { + orderCode: { rules: [{required: true, message: '请输入订单号后四位'}], validateTrigger: 'blur' }, @@ -226,65 +233,67 @@ export default { rules: [{required: true, message: '请输入邮编'}], validateTrigger: 'blur' }, - payMode:{ + payMode: { rules: [{required: true, message: '请选择来款方式'}], validateTrigger: 'change' }, - companyId:{ + companyId: { rules: [{required: true, message: '请选择参会单位'}], validateTrigger: 'change' }, - companyContactId:{ + companyContactId: { rules: [{required: true, message: '请选择参会人'}], validateTrigger: 'change' }, - postContactId:{ + postContactId: { rules: [{required: true, message: '请选择邮寄联系人'}], validateTrigger: 'change' }, - needInvoice:{ + needInvoice: { rules: [{required: true, message: '请选择发票类型'}], validateTrigger: 'change' }, - identity:{ + identity: { rules: [{required: true, message: '请选择身份'}], validateTrigger: 'change', - initialValue:2 + initialValue: 2 }, - phone:{ + phone: { rules: [{required: true, message: '请输入手机号'}], validateTrigger: 'blur' }, }, + // 订单后四位显示 + onlinePayModeBool: false, url: { - add:'/meeting/payMeetingSituation/add' + add: '/meeting/payMeetingSituation/add' }, // 合同信息 - contractInfo:{}, + contractInfo: {}, // 联系人回显 - selectContact:null, + selectContact: null, // 会议金额 - meetingCosts:'', + meetingCosts: '', } }, - methods:{ - open(record){ - console.log(record,'addMeetingPerson') - this.meetingCosts ='' + methods: { + open(record) { + console.log(record, 'addMeetingPerson') + this.meetingCosts = '' this.form.resetFields() this.visible = true - this.contractInfo = Object.assign({},record) + this.contractInfo = Object.assign({}, record) // 参会单位的默认显示 this.contractInfo.companyId = { - id:record.signedCompanyId, - companyName:record.signedCompanyTemporaryName + id: record.signedCompanyId, + companyName: record.signedCompanyTemporaryName } // 姓名的默认显示 this.contractInfo.companyContactId = record.signedContactsId // 通过联系人id获取手机号 - this.queryInfoById(record.signedContactsId).then( res => { - this.form.setFieldsValue({'phone':res.phone}) + this.queryInfoById(record.signedContactsId).then(res => { + this.form.setFieldsValue({'phone': res.phone}) }) // 邮寄联系人显示 this.contractInfo.postContactId = record.signedContactsId @@ -293,54 +302,56 @@ export default { // 身份默认选择参会人 this.contractInfo.identify = 1 this.selectContact = { - id:record.signedContactsTemporaryId, - name:record.signedContactsTemporaryName + id: record.signedContactsTemporaryId, + name: record.signedContactsTemporaryName } - this.$nextTick( () => { - this.form.setFieldsValue(pick(this.contractInfo,'companyId','companyContactId','identify','postContactId')) + this.$nextTick(() => { + this.form.setFieldsValue(pick(this.contractInfo, 'companyId', 'companyContactId', 'identify', 'postContactId')) }) }, - close(){ + close() { this.visible = false }, - handleOk(){ - const that = this + handleOk() { + const that = this this.form.validateFields((err, values) => { - if(!err){ + if (!err) { that.confirmLoading = true let method = 'post' let url = this.url.add - const formData = Object.assign({},values) + const formData = Object.assign({}, values) formData.companyId = values.companyId.id formData.meetingId = values.meetingId.id + // 合同id + formData.contractId = this.contractInfo.id // 在合同处新增的参会人需要添加参数 flag = 1 用于后端发送系统消息与邮件 formData.flag = 1 - httpAction(url,formData,method).then(res => { - if(res.success){ + httpAction(url, formData, method).then(res => { + if (res.success) { that.$message.success(res.message) that.$emit('ok') that.handleCancel() that.confirmLoading = false - }else { + } else { this.$message.warn(res.message) } - }).finally( () => { + }).finally(() => { that.confirmLoading = false }) } }) }, - handleCancel(){ + handleCancel() { this.close() }, /* * 选择会议 * */ - selectMeeting(val){ + selectMeeting(val) { console.log(val) - if(val.meetingCosts){ + if (val.meetingCosts) { this.meetingCosts = val.meetingCosts - if(val.meetingCostsVip){ + if (val.meetingCostsVip) { this.meetingCosts = val.meetingCosts + val.meetingCostsVip } @@ -351,11 +362,11 @@ export default { /* * 通过id获取联系人信息 * */ - queryInfoById(id){ + queryInfoById(id) { return new Promise(resolve => { let result = {} getContactsById({id}).then(res => { - if(res.success){ + if (res.success) { result = res.result } }).finally(() => { @@ -366,10 +377,34 @@ export default { /* * 选择姓名 更新手机号 * */ - changeSelectContract(val){ + changeSelectContract(val) { this.queryInfoById(val).then(res => { - this.form.setFieldsValue({'phone':res.phone}) + this.form.setFieldsValue({'phone': res.phone}) }) + }, + /* + * 校验邮编 + * */ + validatePostCode(rule, value, callback) { + if (value === '' || value === undefined || value === null) { + callback('请输入邮编') + } + if (value && postcode(value)) { + callback() + } else { + callback('请输入正确格式的邮编') + } + }, + /* + * 线上缴费才有订单后四位 + * */ + changePayMode(e) { + // 缴费方式为线上 要输入订单后四位 + if (e.target.value === 2) { + this.onlinePayModeBool = true + } else { + this.onlinePayModeBool = false + } } } diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index 938a387..401af7f 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -266,6 +266,17 @@ export default { this.queryParam = {} this.visible = false }, + /* + * 新增成功 直接关联 关闭弹窗 + * */ + modalFormOk() { + // 新增/修改 成功时，重载列表 + this.loadData() + this.$emit('ok') + this.handleCancel() + //清空列表选中 + this.onClearSelected() + }, handleOk() { if (this.selectedRowKeys.length <= 0) { this.$message.warn('请选择项目后再提交关联') diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue index 9a066bc..e97a8af 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue @@ -375,6 +375,14 @@ export default { this.loadData(1) } }, + modalFormOk() { + // 新增/修改 成功时，重载列表 + this.loadData() + this.$emit('ok') + this.handleCancel() + //清空列表选中 + this.onClearSelected() + }, /* * 打开新增 * */ diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index 7981061..d885c4b 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -54,7 +54,7 @@ diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index a90ddd1..0156f9d 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -117,8 +117,6 @@ @ok="addContactsOk"> - - - - - - - - - - - - - - @@ -316,10 +295,6 @@ export default { rules: [{required: true, message: '请输入手机号'}], validateTrigger: 'blur' }, - email: { - rules: [{required: true, message: '请输入邮箱'}], - validateTrigger: 'blur' - }, identify: { rules: [{required: true, message: '请选择身份'}], validateTrigger: 'change' @@ -542,7 +517,7 @@ export default { const model = Object.assign({}, res.result) // 设置手机 邮箱 职务 if (res.success) { - that.form.setFieldsValue(pick(model, 'phone', 'email', 'post')) + that.form.setFieldsValue(pick(model, 'phone')) } // 设置邮寄联系人和地址 if (this.$refs.formother !== undefined) { diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index 80bb266..d64d142 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -138,7 +138,7 @@ - +