whj 1 ano atrás
pai
commit
a5da64d74e

+ 8 - 7
src/views/purchase/purchase-order-report/PurchaseOrderReport.vue

@@ -9,7 +9,7 @@
               :default-value="moment(defaultStartMonth, monthFormat)"
               :format="monthFormat"
               showTime
-              v-model="queryParam.startTime"
+              v-model="queryParam.createdTimeStart"
               placeholder="开始月份"
               @change="onStartChange" />
             <a-date-picker
@@ -17,7 +17,7 @@
               :default-value="moment(defaultEndMonth, monthFormat)"
               :format="monthFormat"
               showTime
-              v-model="queryParam.endTime"
+              v-model="queryParam.createdTimeEnd"
               placeholder="结束月份"
               @change="onEndChange" />
             <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),
       queryParam: {
         // 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,
       chart: null, // 创建一个chart变量
@@ -139,10 +139,11 @@ export default {
   methods: {
     moment,
     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) {
-      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 () {
       getPurchaseReport(this.queryParam)
@@ -194,7 +195,7 @@ export default {
     handlePrint (record) {
       const modal = this.$refs.basePrintModal
       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) {
       console.log(111)