From c71207cba4f0367e938400c5d268e05457dec820 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 29 Oct 2021 13:47:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[bug]=20=E7=A5=A8=E6=8D=AE=E9=82=AE?= =?UTF-8?q?=E5=AF=84=E6=89=93=E5=8D=B0=E7=A6=81=E7=94=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mailManagement/BillMail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - 打印 + 打印 邮寄 From 7ce97421c068412f7655892e061fe6465e630006 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 29 Oct 2021 15:08:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=A0=94=E8=AE=A8=E4=BC=9A=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4?= =?UTF-8?q?=E7=9A=84=E7=A6=81=E7=94=A8=20=E9=82=AE=E7=BC=96=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=9A=84=E6=A0=A1=E9=AA=8C=20=20=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=82=E4=BC=9A=E4=BC=81=E4=B8=9A=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../incomePayments/meetManage/Attendance.vue | 2 +- .../meetManage/OtherMeetingForm.vue | 15 ++++++++++++--- .../meetManage/modules/SeminarPartnerForm.vue | 12 ++++++++++++ src/views/signUp/SignUpPage.vue | 9 ++++++--- 4 files changed, 31 insertions(+), 7 deletions(-) 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/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index b053554..909d33f 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -96,6 +96,7 @@ :is-limit="true" :maxLength='50'> + 若没有您要选择的企业,请您添加企业信息(发票抬头) @@ -524,10 +525,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 } @@ -761,7 +762,9 @@ export default { } } } - +.color-red { + color: red; +} .qr-code { width: 140px; height: 140px; From 918c3aa3c48e9ba298021d773fa0a8ac60dc0a87 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 29 Oct 2021 15:59:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[bug]=20=E6=94=B6=E5=85=A5=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../revenueContract/modules/SelectProjectModule.vue | 1 + 1 file changed, 1 insertion(+) 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,