diff --git a/src/views/modules/user/alluser.vue b/src/views/modules/user/alluser.vue index ee0c7368..4c9760c2 100644 --- a/src/views/modules/user/alluser.vue +++ b/src/views/modules/user/alluser.vue @@ -5,36 +5,48 @@ - + - + -
- +
+ - 注册时间   - + + +
+ +   + format="yyyy-MM-dd" + placeholder="选择日期时间" + style="width:200px"> + + {{ $t('query') }} @@ -152,6 +164,22 @@ export default { startTime: '', endTime: '' }, + pickerBeginDateBefore: { + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, deptIdList: [], options: [], userDetailVisible: false, @@ -234,10 +262,6 @@ export default { }).catch(() => { }) } }, - setRegistTime () { - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, formatPartyFlag: function (row, column) { return row.partyFlag === '1' ? '是' : row.state === '0' ? '未知' : '否' }, diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue index 9c30226b..0f4cc610 100644 --- a/src/views/modules/user/fail-authentication.vue +++ b/src/views/modules/user/fail-authentication.vue @@ -58,16 +58,28 @@ clearable>
- 注册时间   -   + + + + + + + + - {{ $t('query') }} + {{ $t('query') }} { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, deptIdList: [], options: [], userDetailVisible: false, @@ -293,10 +321,6 @@ export default { }).catch(() => { }) } }, - setRegistTime () { - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, formatState: function (row, column) { let state = row.state if (state === '1') { diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue index c862195a..9b325682 100644 --- a/src/views/modules/user/pass-authentication.vue +++ b/src/views/modules/user/pass-authentication.vue @@ -58,16 +58,28 @@ clearable>
- 注册时间   -   + + + + + + + + - {{ $t('query') }} + {{ $t('query') }} { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, deptIdList: [], options: [], userDetailVisible: false, @@ -288,10 +316,6 @@ export default { }).catch(() => { }) } }, - setRegistTime () { - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, formatState: function (row, column) { let state = row.state if (state === '1') { diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue index e8143c3b..6c05a447 100644 --- a/src/views/modules/user/unauthorized.vue +++ b/src/views/modules/user/unauthorized.vue @@ -59,16 +59,28 @@
- 注册时间   -   + + + + + + + + - {{ $t('query') }} + {{ $t('query') }} { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, deptIdList: [], options: [], userDetailVisible: false, @@ -291,10 +319,6 @@ export default { }).catch(() => { }) } }, - setRegistTime () { - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, formatState: function (row, column) { let state = row.state if (state === '1') { diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue index 9b911ab3..2be6f616 100644 --- a/src/views/modules/user/wait-authentication.vue +++ b/src/views/modules/user/wait-authentication.vue @@ -58,16 +58,28 @@ clearable>
- 注册时间   -   + + + + + + + + - {{ $t('query') }} + {{ $t('query') }} { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, deptIdList: [], options: [], userDetailVisible: false, @@ -280,10 +308,6 @@ export default { }).catch(() => { }) } }, - setRegistTime () { - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, formatState: function (row, column) { let state = row.state if (state === '1') {