diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue index 5b96fa1..e2b1ce7 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue @@ -230,7 +230,7 @@ export default { validateTrigger: 'blur' }, postAddress: { - rules: [{required: true, message: '请输入邮编'}], + rules: [{required: true, message: '请输入邮寄地址'}], validateTrigger: 'blur' }, payMode: { diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue index d2a0892..9a40f62 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue @@ -267,7 +267,7 @@ export default { if(value && money(value)){ callback() }else { - callback('请输入合法的金额数字,最多2位小数,10位正数') + callback('应收金额格式错误') } }, diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue index 4484d11..f922643 100644 --- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue +++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue @@ -87,21 +87,21 @@ - + v-decorator="['outHotelTime',validatorRules.outHotelTime]" placeholder="请选择离店时间"> @@ -124,7 +124,7 @@ - @@ -135,7 +135,7 @@ + v-decorator="[ 'destination',validatorRules.destination]"> @@ -143,7 +143,7 @@ + v-decorator="[ 'arrivalShift',validatorRules.arrivalShift]"> @@ -162,7 +162,7 @@ - @@ -173,7 +173,7 @@ + v-decorator="[ 'departureStation',validatorRules.departureStation]"> @@ -182,7 +182,7 @@ + v-decorator="[ 'departureShift',validatorRules.departureShift]"> @@ -274,14 +274,51 @@ export default { rules: [{ required: true, message: '请选择是否入住酒店' }], validateTrigger: 'change' }, + inHotelTime:{ + rules: [{ required: true, message: '请选择入住酒店时间' }], + validateTrigger: 'change' + }, + outHotelTime:{ + rules: [{ required: true, message: '请选择离店时间' }], + validateTrigger: 'change' + }, + roomLayout:{ + rules: [{ required: true, message: '请输入房型' }], + validateTrigger: 'blur' + }, pickUp: { rules: [{ required: true, message: '请选择是否接站' }], validateTrigger: 'change' }, + departureTime:{ + rules: [{ required: true, message: '请选择离开时间' }], + validateTrigger: 'change' + }, + departureStation:{ + rules: [{ required: true, message: '请输入离开站' }], + validateTrigger: 'blur' + }, + arrivalShift:{ + rules: [{ required: true, message: '请输入到达班次' }], + validateTrigger: 'blur' + }, deliveryStation: { rules: [{ required: true, message: '请选择是否送站' }], validateTrigger: 'change' - } + }, + arrivalTime:{ + rules: [{ required: true, message: '请选择抵达时间' }], + validateTrigger: 'change' + }, + destination:{ + rules: [{ required: true, message: '请输入到达站' }], + validateTrigger: 'blur' + }, + departureShift:{ + rules: [{ required: true, message: '请输入离开班次' }], + validateTrigger: 'blur' + }, + } } diff --git a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue index 41eb126..3faae72 100644 --- a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue +++ b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue @@ -38,7 +38,7 @@ @@ -90,6 +90,7 @@ import JYearDate from '@comp/jero/JYearDate' import JUpload from '@comp/jero/JUpload' import SelectPrincipal from '@comp/company/SelectPrincipal' import {addZero} from '@/utils/util' +import {money} from '@/utils/validate' export default { name: 'MemberProjectModal', @@ -129,6 +130,12 @@ export default { rules: [{required: true, message: '请输入会员项目'}], validateTrigger: 'blur' }, + chargeStandard:{ + rules: [ + {required: false, validator: this.validateMoney}, + ], + validateTrigger: ['blur'] + }, particularYear: { rules: [{required: true, message: '请选择年份'}], validateTrigger: ['change','blur'] @@ -196,6 +203,17 @@ export default { handleCancel() { this.close() }, + validateMoney(rule, value, callback) { + if(value){ + if (value && money(value)) { + callback() + } else { + callback('请输入合法的金额数字,最多2位小数,10位正数') + } + }else { + callback() + } + }, } } diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue index db32292..47cea26 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue @@ -220,6 +220,7 @@ import CompanySelect from '@comp/company/CompanySelect' // import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule' import SelectContacts from '@comp/company/SelectContacts' import {addZero} from '@/utils/util' +import {money} from '@/utils/validate' export default { name: 'SafeguardMemberModal', @@ -276,9 +277,12 @@ export default { initialValue: 3, }, amountReceivable: { - rules: [{ required: true, message: '请输入应收金额' }], - validateTrigger: 'blur', + rules: [ + {required: true, validator: this.validateMoney}, + ], + validateTrigger: ['blur'] }, + chargeNoticeNo: { rules: [{ required: true, message: '请输入收费通知号' }], validateTrigger: 'blur', @@ -310,6 +314,16 @@ export default { add() { this.edit({}) }, + validateMoney(rule, value, callback) { + if (value === undefined || value === '' || value === null) { + callback('请输入应收金额') + } + if (value && money(value)) { + callback() + } else { + callback('请输入合法的金额数字,最多2位小数,10位正数') + } + }, edit(record) { // 清除定时器 if (this.timer) {