mirror of
http://112.124.100.131/GFRS/ebiz-h5.git
synced 2025-12-18 02:46:45 +08:00
Merge branch 'hotfix/nbs日期传参修改' into release/0827
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="internal-container">
|
<div class="internal-container">
|
||||||
<van-sticky>
|
<van-sticky>
|
||||||
<div class="title" style='background:#f5f5f5'>
|
<div class="title" style="background:#f5f5f5">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<van-button round type="info" size="mini" @click="setDateType(1)" :class="{ default: 1, checked: checkType === 1 }">今日</van-button>
|
<van-button round type="info" size="mini" @click="setDateType(1)" :class="{ default: 1, checked: checkType === 1 }">今日</van-button>
|
||||||
<van-button round type="info" size="mini" @click="setDateType(2)" :class="{ default: 1, checked: checkType === 2 }">当月</van-button>
|
<van-button round type="info" size="mini" @click="setDateType(2)" :class="{ default: 1, checked: checkType === 2 }">当月</van-button>
|
||||||
@@ -28,10 +28,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
let date = new Date()
|
||||||
import { Sticky, Popup, Picker, DatetimePicker } from 'vant'
|
import { Sticky, Popup, Picker, DatetimePicker } from 'vant'
|
||||||
import { getTableList } from '@/api/ebiz/nbs'
|
import { getTableList } from '@/api/ebiz/nbs'
|
||||||
import InternalNav from '@/components/ebiz/nbs/InternalNav'
|
import InternalNav from '@/components/ebiz/nbs/InternalNav'
|
||||||
import InternalList from '@/components/ebiz/nbs/InternalList'
|
import InternalList from '@/components/ebiz/nbs/InternalList'
|
||||||
|
import utils from '@/assets/js/utils/date-utils'
|
||||||
export default {
|
export default {
|
||||||
name: 'internal',
|
name: 'internal',
|
||||||
components: {
|
components: {
|
||||||
@@ -42,6 +44,7 @@ export default {
|
|||||||
[InternalNav.name]: InternalNav,
|
[InternalNav.name]: InternalNav,
|
||||||
[InternalList.name]: InternalList
|
[InternalList.name]: InternalList
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
@@ -67,11 +70,12 @@ export default {
|
|||||||
let endTime = null
|
let endTime = null
|
||||||
if (type === 1) {
|
if (type === 1) {
|
||||||
//今日
|
//今日
|
||||||
this.params.dateType = new Date().getFullYear() + '-' + Number(new Date().getMonth() + 1) + new Date().getDate()
|
|
||||||
|
this.params.dateType = utils.formatDate(date, 'yyyy-MM-dd')
|
||||||
} else if (type === 2) {
|
} else if (type === 2) {
|
||||||
//当月
|
//当月
|
||||||
this.params.dateType = new Date().getFullYear() + '-' + Number(new Date().getMonth() + 1) + '-01'
|
this.params.dateType = utils.formatDate(date, 'yyyy-MM-01')
|
||||||
endTime = new Date().getFullYear() + '-' + Number(new Date().getMonth() + 1) + '-' + new Date().getDate()
|
endTime = utils.formatDate(date, 'yyyy-MM-dd')
|
||||||
} else {
|
} else {
|
||||||
this.params.dateType = type
|
this.params.dateType = type
|
||||||
endTime = type
|
endTime = type
|
||||||
|
|||||||
Reference in New Issue
Block a user