diff --git a/src/views/email/create.vue b/src/views/email/create.vue index 43a5d47..27bf1fd 100644 --- a/src/views/email/create.vue +++ b/src/views/email/create.vue @@ -49,7 +49,7 @@ - + diff --git a/src/views/email/list.vue b/src/views/email/list.vue index 514d60a..54b862d 100644 --- a/src/views/email/list.vue +++ b/src/views/email/list.vue @@ -9,8 +9,35 @@ - + + + + + + + + + + + + + + + + @@ -26,6 +53,11 @@ highlight-current-row style="width: 100%;" > + + width="70" + > + + { + if (this.postForm.createtime.end && !this.postForm.createtime.start) { + callback(new Error('请同时选择')) + } else { + callback() + } + }, trigger: 'blur' }], + end: [{ required: false, validator: (rule, value, callback) => { + if (this.postForm.createtime.start && !this.postForm.createtime.end) { + callback(new Error('请同时选择')) + } else { + callback() + } + }, trigger: 'blur' }] + }, + sendtime: { + start: [{ required: false, validator: (rule, value, callback) => { + if (this.postForm.sendtime.end && !this.postForm.sendtime.start) { + callback(new Error('请同时选择')) + } else { + callback() + } + }, trigger: 'blur' }], + end: [{ required: false, validator: (rule, value, callback) => { + if (this.postForm.sendtime.start && !this.postForm.sendtime.end) { + callback(new Error('请同时选择')) + } else { + callback() + } + }, trigger: 'blur' }] + } }, dialogAttaVisible: false, mailList: [], @@ -140,6 +219,22 @@ export default { methods: { parseTime, getList(data) { + if (data.createtime.start === '' || data.createtime.end === '') { + data.createtime.start = 0 + data.createtime.end = 0 + } + if (data.createtime.start && data.createtime.end) { + data.createtime.start = data.createtime.start / 1000 + data.createtime.end = data.createtime.end / 1000 + } + if (data.sendtime.start === '' || data.sendtime.end === '') { + data.sendtime.start = 0 + data.sendtime.end = 0 + } + if (data.sendtime.start && data.sendtime.end) { + data.sendtime.start = data.sendtime.start / 1000 + data.sendtime.end = data.sendtime.end / 1000 + } getMailList(this.curpage, this.pagesize, data).then(response => { if (response.code === 0) { this.mailList = response.data