diff --git a/src/mixins/RangeDateMixin.js b/src/mixins/RangeDateMixin.js index 2271988..8c52307 100644 --- a/src/mixins/RangeDateMixin.js +++ b/src/mixins/RangeDateMixin.js @@ -8,8 +8,8 @@ export const RangeDateMixin = { endKey: 'endRegisterTime' }, rangeDateFormat: { - begin: 'YYYY-MM-DD 00:00:00', - end: 'YYYY-MM-DD 23:59:59' + begin: 'YYYY-MM-DD HH:mm:ss', + end: 'YYYY-MM-DD HH:mm:ss' } } }, diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 947870d..580d8a5 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -391,7 +391,7 @@ export default { }, particularYear: { rules: [ - { required: true, message: '请选择年份!' }, + { required: true, validator:this.validateYear }, ], validateTrigger:['blur','change'], initialValue:this.$store.getters.currentYear @@ -467,9 +467,13 @@ export default { // 联系人电话 this.model.directorPhone = this.$route.query.directorPhone this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')) + // 加定时器是因为有可能赋值不成功 + setTimeout( () => { + this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')),200 + }) // 如果是标协会议则回显 标协会议的字段 if(this.meetingType === '2'){ + console.log('this.model',this.model) this.form.setFieldsValue(pick(this.model,'signInTime','tbMeetingType','meetingCostsVip','hotelName','hotelAddress' )) } // 如果是工作组会议 赋值工作组 @@ -660,6 +664,20 @@ export default { }) }, /* + * 年份校验 + * */ + validateYear(rule,value,callback){ + if(value === undefined || value === '' || value === null ){ + callback('请选择年份') + } + const year = new Date().getFullYear() + if(Number(value) < year){ + callback(`请选择${year}年或之后的年份`) + }else { + callback() + } + }, + /* * 获取所有的工作组 * */ getWorkSelectList() { diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue index 5311e01..69b6aa8 100644 --- a/src/views/incomePayments/meetManage/MeetManageList.vue +++ b/src/views/incomePayments/meetManage/MeetManageList.vue @@ -15,7 +15,7 @@ @@ -23,7 +23,7 @@ @@ -39,7 +39,7 @@ @@ -47,7 +47,7 @@ diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index 1c69fd4..d4c6fa9 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -19,7 +19,7 @@ @@ -27,7 +27,7 @@ @@ -44,7 +44,7 @@ @@ -52,7 +52,7 @@