diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 73b1120..6299b9c 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -99,19 +99,19 @@ - + + + + + + + + - { // 加定时器是因为有可能赋值不成功 setTimeout(() => { - this.form.setFieldsValue(pick(this.model, 'notice', 'hotelContactsList', 'hotelName', 'hotelAddress', 'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone','meetingContactsList')), 200 + this.form.setFieldsValue(pick(this.model,'venue', 'notice', 'hotelContactsList', 'hotelName', 'hotelAddress', 'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone','meetingContactsList')), 200 }) // 如果是标协会议则回显 标协会议的字段 if (this.meetingType === '2') { @@ -749,6 +749,7 @@ export default { handleOk() { const that = this this.form.validateFields((err, values) => { + console.log(values) // 这是设置召开时间不选择的边框颜色为红色 if (err && Object.prototype.hasOwnProperty.call(err, 'convokeLocale')) { this.hasError = true @@ -762,8 +763,9 @@ export default { } else { httpurl = this.url.add } - let placeName = values.convokeLocale - const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)}) + // let placeName = values.convokeLocale + //{venue: this.getPcaText(placeName)} + const formData = Object.assign(this.model, values) // 如果会议的费用为0 不能上传缴费凭证 if (values.meetingCosts === '0.00') { delete formData.paymentQrCode @@ -799,6 +801,7 @@ export default { formData.startSignInTime = this.newSignInTime[0] formData.endSignInTime = this.newSignInTime[1] } + formData.convokeLocale = '10001' console.log('表单提交数据', formData) httpAction(httpurl, formData, method).then((res) => { if (res.success) { diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js index 00aad28..7f64870 100644 --- a/src/views/incomePayments/meetManage/meetingValidate.js +++ b/src/views/incomePayments/meetManage/meetingValidate.js @@ -41,9 +41,15 @@ export default { ], validateTrigger: ['change'] }, + venue: { + rules: [ + {required: true, message: '请输入召开地点/腾讯会议'}, + ], + validateTrigger: ['blur'] + }, address: { rules: [ - {required: true, message: '请输入详细地址'}, + {required: true, message: '请输入详细地址/腾讯会议号'}, ], validateTrigger: ['blur'] },