|
@@ -9,7 +9,7 @@
|
|
:default-value="moment(defaultStartMonth, monthFormat)"
|
|
:default-value="moment(defaultStartMonth, monthFormat)"
|
|
:format="monthFormat"
|
|
:format="monthFormat"
|
|
showTime
|
|
showTime
|
|
- v-model="queryParam.startTime"
|
|
|
|
|
|
+ v-model="queryParam.createdTimeStart"
|
|
placeholder="开始月份"
|
|
placeholder="开始月份"
|
|
@change="onStartChange" />
|
|
@change="onStartChange" />
|
|
<a-date-picker
|
|
<a-date-picker
|
|
@@ -17,7 +17,7 @@
|
|
:default-value="moment(defaultEndMonth, monthFormat)"
|
|
:default-value="moment(defaultEndMonth, monthFormat)"
|
|
:format="monthFormat"
|
|
:format="monthFormat"
|
|
showTime
|
|
showTime
|
|
- v-model="queryParam.endTime"
|
|
|
|
|
|
+ v-model="queryParam.createdTimeEnd"
|
|
placeholder="结束月份"
|
|
placeholder="结束月份"
|
|
@change="onEndChange" />
|
|
@change="onEndChange" />
|
|
<a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
|
|
<a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
|
|
@@ -101,8 +101,8 @@ export default {
|
|
defaultEndMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN),
|
|
defaultEndMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN),
|
|
queryParam: {
|
|
queryParam: {
|
|
// year: 2021,
|
|
// year: 2021,
|
|
- startTime: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR_MONTH) + '-01 00:00:00',
|
|
|
|
- endTime: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
|
|
|
|
|
|
+ createdTimeStart: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR_MONTH) + '-01 00:00:00',
|
|
|
|
+ createdTimeEnd: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
|
|
},
|
|
},
|
|
visible: true,
|
|
visible: true,
|
|
chart: null, // 创建一个chart变量
|
|
chart: null, // 创建一个chart变量
|
|
@@ -139,10 +139,11 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
moment,
|
|
moment,
|
|
onStartChange (date, dateString) {
|
|
onStartChange (date, dateString) {
|
|
- this.queryParam.startMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
|
|
|
|
|
|
+ this.queryParam.createdTimeStart = this.BaseTool.Date.formatter(date, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
|
|
},
|
|
},
|
|
onEndChange (date, dateString) {
|
|
onEndChange (date, dateString) {
|
|
- this.queryParam.endMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
|
|
|
|
|
|
+ console.log(date)
|
|
|
|
+ this.queryParam.createdTimeEnd = this.BaseTool.Date.formatter(date, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
|
|
},
|
|
},
|
|
getData () {
|
|
getData () {
|
|
getPurchaseReport(this.queryParam)
|
|
getPurchaseReport(this.queryParam)
|
|
@@ -194,7 +195,7 @@ export default {
|
|
handlePrint (record) {
|
|
handlePrint (record) {
|
|
const modal = this.$refs.basePrintModal
|
|
const modal = this.$refs.basePrintModal
|
|
this.visible = false
|
|
this.visible = false
|
|
- modal.base({ startMonth: this.queryParam.startMonth, endMonth: this.queryParam.endMonth, title: this.title, data: this.chartsData })
|
|
|
|
|
|
+ modal.base({ createdTimeStart: this.queryParam.createdTimeStart, createdTimeEnd: this.queryParam.createdTimeEnd, title: this.title, data: this.chartsData })
|
|
},
|
|
},
|
|
handleView (record) {
|
|
handleView (record) {
|
|
console.log(111)
|
|
console.log(111)
|