diff --git a/src/views/modules/points/activepointlog.vue b/src/views/modules/points/activepointlog.vue
index e3eb6629..187e14be 100644
--- a/src/views/modules/points/activepointlog.vue
+++ b/src/views/modules/points/activepointlog.vue
@@ -27,12 +27,39 @@
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
{{ '总计' }}
+
+ {{ $t('export') }}
+
{{ $t('add') }}
@@ -99,7 +126,8 @@ export default {
getDataListURL: '/points/activepointlog/page',
getDataListIsPage: true,
deleteURL: '/points/activepointlog',
- deleteIsBatch: true
+ deleteIsBatch: true,
+ exportURL: '/points/activepointlog/export'
},
dataForm: {
id: '',
@@ -107,7 +135,9 @@ export default {
userName: '',
deptId: '',
operationDesc: '',
- mobile: ''
+ mobile: '',
+ startTime: '',
+ endTime: ''
},
operationTypeArr: [
{ dictValue: '1', dictName: '加积分' },
@@ -116,7 +146,23 @@ export default {
ids: [],
options: [],
dialogVisible: false,
- totalPoint: '0'
+ totalPoint: '0',
+ 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()
+ }
+ }
+ }
}
},
components: {