{
+ 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,
@@ -202,6 +235,7 @@ export default {
this.options = res.data.options
})
.catch(() => { })
+ this.initTime()
},
watch: {
'deptIdList': function (val) {
@@ -209,29 +243,53 @@ export default {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
- this.dataForm.deptId = ''
- }else
+ }
if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
- this.dataForm.deptId = this.deptIdList[0]
- }else
+ }
if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
- this.dataForm.deptId = this.deptIdList[1]
- }else
+ }
if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = this.deptIdList[2]
- this.dataForm.deptId = this.deptIdList[2]
}
}
},
methods: {
+ initTime () {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+ this.time = [start, end]
+ let year = start.getFullYear()
+ let month = start.getMonth() + 1
+ if (month < 10) {
+ month = '0' + month
+ }
+ let date = start.getDate()
+ if (date < 10) {
+ date = '0' + date
+ }
+ let startDate = year + '-' + month + '-' + date
+ let yearend = end.getFullYear()
+ let monthend = end.getMonth() + 1
+ if (monthend < 10) {
+ monthend = '0' + monthend
+ }
+ let dateend = end.getDate()
+ if (dateend < 10) {
+ dateend = '0' + dateend
+ }
+ let endDate = yearend + '-' + monthend + '-' + dateend
+ this.dataForm.startTime = startDate
+ this.dataForm.endTime = endDate
+ },
getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) {
@@ -264,10 +322,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') {
@@ -320,7 +374,15 @@ export default {
this.$refs.userDetail.dataForm.id = userId
this.$refs.userDetail.init()
})
- }
+ },
+ btKeyUpnickname(e){
+ e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+ this.dataForm.nickname = e.target.value
+ },
+ btKeyUpmobile(e){
+ e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+ this.dataForm.mobile = e.target.value
+ },
},
components: {
AddOrUpdate,
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index a36c327..6862a89 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -4,7 +4,7 @@
+ @keyup.enter.native="getDataListSearch()">
-
-
- 注册时间
-
+
+
+
+
+
+
+
+
- {{ $t('query') }}
+ {{ $t('query') }}
{{ $t('export') }}
@@ -81,36 +93,37 @@
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
-
- {{scope.$index+1}}
+
+
+ {{scope.$index+1}}
+
+
+ align="center"
+ width="120">
-
-
-
-
+ align="center"
+ min-width="200">
+
+ align="center"
+ width="180">
+ show-overflow-tooltip>
{
+ 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,
@@ -192,6 +221,7 @@ export default {
this.options = res.data.options
})
.catch(() => { })
+ this.initTime()
},
watch: {
'deptIdList': function (val) {
@@ -218,6 +248,34 @@ export default {
}
},
methods: {
+ initTime () {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+ this.time = [start, end]
+ let year = start.getFullYear()
+ let month = start.getMonth() + 1
+ if (month < 10) {
+ month = '0' + month
+ }
+ let date = start.getDate()
+ if (date < 10) {
+ date = '0' + date
+ }
+ let startDate = year + '-' + month + '-' + date
+ let yearend = end.getFullYear()
+ let monthend = end.getMonth() + 1
+ if (monthend < 10) {
+ monthend = '0' + monthend
+ }
+ let dateend = end.getDate()
+ if (dateend < 10) {
+ dateend = '0' + dateend
+ }
+ let endDate = yearend + '-' + monthend + '-' + dateend
+ this.dataForm.startTime = startDate
+ this.dataForm.endTime = endDate
+ },
getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) {
@@ -250,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') {
@@ -306,7 +360,15 @@ export default {
this.$refs.userDetail.dataForm.id = userId
this.$refs.userDetail.init()
})
- }
+ },
+ btKeyUprealName(e){
+ e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+ this.dataForm.realName = e.target.value
+ },
+ btKeyUpmobile(e){
+ e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+ this.dataForm.mobile = e.target.value
+ },
},
components: {
AddOrUpdate,