diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index 16901ed..6fa9fe3 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -383,6 +383,7 @@ export default { * 重置 */ searchReset() { + this.departChange(this.departId) let obj = { departId: this.departId, principalId: this.principal, diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index a586ecd..4a4d8db 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -254,7 +254,7 @@ - + 审核凭证 diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index a42eee4..d01c5df 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -96,7 +96,7 @@ + v-decorator="[ 'postContactAddress',validatorRules.postContactAddress]"> @@ -105,7 +105,7 @@ + v-decorator="[ 'postCode',validatorRules.postCode]"> @@ -201,7 +201,16 @@ export default { orderCode: { rules: [{required: true, message: '请输入订单号后四位'}], validateTrigger: 'blur' - } + }, + postContactAddress:{ + rules: [{required: true, message: '请输入邮寄地址'}], + validateTrigger: 'blur' + }, + postCode:{ + rules: [{required: true, message: '请输入邮编'}], + validateTrigger: 'blur' + }, + }, // 是否可编辑 isEditBool: false, diff --git a/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue b/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue index 775de18..a0d1dea 100644 --- a/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue +++ b/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue @@ -8,6 +8,7 @@ @@ -96,6 +97,17 @@ export default { } return startValue.valueOf() > endValue.valueOf() }, + /* + * 抵达时间禁用 + * */ + disabledArrivalTimeEndDate(endValue) { + const startValueTemp = this.form.getFieldValue('departureTime') + const startValue = startValueTemp && moment(startValueTemp, 'YYYY-MM-DD') + if (!endValue || !startValue) { + return false + } + return startValue.valueOf() < endValue.valueOf() - 86400000 + }, } } diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index fb036c0..a5840d0 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -87,7 +87,7 @@ - 打印 + 打印 邮寄 diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index 0a62350..8d9133b 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -96,6 +96,7 @@ :is-limit="true" :maxLength='50'> + 若没有您要选择的企业,请您添加企业信息(发票抬头) @@ -525,10 +526,10 @@ export default { 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 { + }else if(this.currentMeetingInfo.meetingType === '2'){ this.meetingCostSum = this.currentMeetingInfo.meetingCosts } @@ -763,7 +764,9 @@ export default { } } } - +.color-red { + color: red; +} .qr-code { width: 140px; height: 140px;