|
@@ -119,6 +119,7 @@
|
|
<script>
|
|
<script>
|
|
import Title from '@/components/Title';
|
|
import Title from '@/components/Title';
|
|
import InfoCard from './components/InfoCard'
|
|
import InfoCard from './components/InfoCard'
|
|
|
|
+import { dateFormat } from '@/utils/index'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
components: {
|
|
components: {
|
|
@@ -129,8 +130,8 @@ import InfoCard from './components/InfoCard'
|
|
return {
|
|
return {
|
|
pickerOptions1: {
|
|
pickerOptions1: {
|
|
disabledDate: (time) => {
|
|
disabledDate: (time) => {
|
|
- if (this.data.end_time) {
|
|
|
|
- return time.getTime() > new Date(this.data.end_time).getTime()
|
|
|
|
|
|
+ if (this.form.end_time) {
|
|
|
|
+ return time.getTime() > new Date(this.form.end_time).getTime()
|
|
} else {
|
|
} else {
|
|
return time.getTime() > Date.now()
|
|
return time.getTime() > Date.now()
|
|
}
|
|
}
|
|
@@ -138,8 +139,8 @@ import InfoCard from './components/InfoCard'
|
|
},
|
|
},
|
|
pickerOptions2: {
|
|
pickerOptions2: {
|
|
disabledDate: (time) => {
|
|
disabledDate: (time) => {
|
|
- if (this.data.start_time) {
|
|
|
|
- return time.getTime() < new Date(this.data.start_time).getTime()
|
|
|
|
|
|
+ if (this.form.start_time) {
|
|
|
|
+ return time.getTime() < new Date(this.form.start_time).getTime()
|
|
} else {
|
|
} else {
|
|
return time.getTime() > Date.now()
|
|
return time.getTime() > Date.now()
|
|
}
|
|
}
|
|
@@ -170,8 +171,12 @@ import InfoCard from './components/InfoCard'
|
|
// 获取列表
|
|
// 获取列表
|
|
getList() {
|
|
getList() {
|
|
const { currentPage, pageSize } = this.paginationData
|
|
const { currentPage, pageSize } = this.paginationData
|
|
|
|
+ const { start_nl, end_nl, start_time, end_time } = this.form
|
|
const params = {
|
|
const params = {
|
|
- ...this.form,
|
|
|
|
|
|
+ start_nl,
|
|
|
|
+ end_nl,
|
|
|
|
+ start_time: start_time ? dateFormat(start_time, 'YYYYMMDD') : '',
|
|
|
|
+ end_time: end_time ? dateFormat(end_time, 'YYYYMMDD') : '',
|
|
page: currentPage,
|
|
page: currentPage,
|
|
page_size: pageSize
|
|
page_size: pageSize
|
|
}
|
|
}
|