Merge branch 'hotfix/nbs日期传参修改' into release/0827

This commit is contained in:
mengxiaolong
2020-08-27 17:11:09 +08:00

View File

@@ -1,7 +1,7 @@
<template>
<div class="internal-container">
<van-sticky>
<div class="title" style='background:#f5f5f5'>
<div class="title" style="background:#f5f5f5">
<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(2)" :class="{ default: 1, checked: checkType === 2 }">当月</van-button>
@@ -28,10 +28,12 @@
</div>
</template>
<script>
let date = new Date()
import { Sticky, Popup, Picker, DatetimePicker } from 'vant'
import { getTableList } from '@/api/ebiz/nbs'
import InternalNav from '@/components/ebiz/nbs/InternalNav'
import InternalList from '@/components/ebiz/nbs/InternalList'
import utils from '@/assets/js/utils/date-utils'
export default {
name: 'internal',
components: {
@@ -42,6 +44,7 @@ export default {
[InternalNav.name]: InternalNav,
[InternalList.name]: InternalList
},
data() {
return {
params: {
@@ -67,11 +70,12 @@ export default {
let endTime = null
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) {
//当月
this.params.dateType = new Date().getFullYear() + '-' + Number(new Date().getMonth() + 1) + '-01'
endTime = new Date().getFullYear() + '-' + Number(new Date().getMonth() + 1) + '-' + new Date().getDate()
this.params.dateType = utils.formatDate(date, 'yyyy-MM-01')
endTime = utils.formatDate(date, 'yyyy-MM-dd')
} else {
this.params.dateType = type
endTime = type