From 5f2d3e116d14996135c713eb61c31d5d8a029843 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 15 May 2025 06:05:11 +0800 Subject: [PATCH] md --- src/views/emis/common/LineOrderChart.vue | 7 +- .../PayBackStat/PayBackLineGL.vue | 35 +++++--- .../PayBackStat/PayBackRecordList.vue | 40 ++++----- .../PayBackStat/PayBackStatQuery.vue | 24 +++-- .../emisSettleBill/PayBackStat/PayDay.vue | 28 ++---- src/views/emis/emisSettlePayRecord/index.vue | 89 +++++++++++++------ 6 files changed, 132 insertions(+), 91 deletions(-) diff --git a/src/views/emis/common/LineOrderChart.vue b/src/views/emis/common/LineOrderChart.vue index fe860910..48ddab5d 100644 --- a/src/views/emis/common/LineOrderChart.vue +++ b/src/views/emis/common/LineOrderChart.vue @@ -60,6 +60,11 @@ export default { initChart() { this.chart = echarts.init(this.$el, 'macarons') this.setOptions(this.chartData) + + let that=this; + this.chart.on('click', function (params) { + that.$emit("onChangeTime",params); + }); }, setOptions({ xAxisData,orderStateData } = {}) { this.chart.setOption({ @@ -93,7 +98,7 @@ export default { data: ['expected', 'actual'] }, series: [{ - name: '订单统计', itemStyle: { + name: '统计', itemStyle: { normal: { color: '#FF005A', lineStyle: { diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackLineGL.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackLineGL.vue index fd83174a..527dea14 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/PayBackLineGL.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackLineGL.vue @@ -3,22 +3,20 @@ - - - - - - - + + + + + + - @@ -32,19 +30,25 @@ import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import { calculateRecedMoney } from "@/api/emis/emisSettleBill"; import CardWithHeader from '@/components/CardWithHeader/index.vue'; +import BarChart from '@/views/emis/common/BarChart.vue'; import LineOrderChart from '@/views/emis/common/LineOrderChart.vue'; +import PayDayRecordList from '@/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue'; + import { mapGetters } from 'vuex' import { beginText } from "pdf-lib"; export default { name: 'Index', components: { CardWithHeader, - LineOrderChart + BarChart, + LineOrderChart, + PayDayRecordList }, data() { return { loading: false, + tradeDay:null, noticeList:[], orderStateData:{ xAxisData:[], @@ -69,11 +73,12 @@ export default { ...mapGetters(['avatar', 'nickName','ownerSiteName']), }, created() { - this.initOrderStatData(); + // this.initOrderStatData(); this.initRecdStatData(); }, methods: { + initOrderStatData(){ // 查询统计 @@ -155,6 +160,10 @@ export default { }); }, + onChangeTime(data){ + console.log("===onChangeTime=>data===>",data); + this.tradeDay=data.name; + }, goRouterPath(clickPath) { // 跳转预警详情页面 this.$router.push({ diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue index c1f90a95..423f2f23 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue @@ -145,6 +145,9 @@ export default { }, queryType:{ type:Number + }, + tradeDay:{ + type:String } }, @@ -189,14 +192,7 @@ export default { id:null, titleView:"", openView: false, - // 更新站点时间范围 - daterangeSettleStartDate: [], - // 更新站点时间范围 - daterangeSettleEndDate: [], - // 更新站点时间范围 - daterangeCreateTime: [], - // 更新站点时间范围 - daterangeUpdateTime: [], + // 查询参数 queryParams: { pageNum: 1, @@ -211,17 +207,25 @@ export default { watch: { "queryInfo": { handler (newValue, oldValue) { - console.log("====>queryInfo====>",this.queryInfo); - this.queryParams.settleBillNo=this.queryInfo.settleBillNo; + this.queryParams.settleBillNo=this.$route.query.settleBillNo; + this.queryParams.params.queryDataType=this.$route.query.queryDataType; this.getList(); }, deep: true }, + "tradeDay": { + handler (newValue, oldValue) { + console.log("====>tradeDay====>",this.tradeDay); + this.dateTimeRange=[this.tradeDay+' 00:00:00',this.tradeDay+' 23:59:59']; + this.getList(); + }, + deep: true + }, + $route () { if(this.$route.query.action=='queryBIData'){ this.queryParams.settleBillNo=this.$route.query.settleBillNo; this.queryParams.params.queryDataType=this.$route.query.queryDataType; - this.getList(); } @@ -229,23 +233,19 @@ export default { }, created() { console.log("====>queryInfo====>",this.queryInfo); - // if(this.queryInfo!=null){ - // this.queryParams.settleBillNo=this.queryInfo.settleBillNo; - // } if(this.$route.query.action=='queryBIData'){ - this.queryParams.settleBillNo=this.$route.query.settleBillNo; - this.queryParams.params.queryDataType=this.$route.query.queryDataType; - + this.queryParams.settleBillNo=this.$route.query.settleBillNo; + this.queryParams.params.queryDataType=this.$route.query.queryDataType; this.getList(); } - // this.getList(); }, methods: { /** 查询结算总账单列表 */ getList() { this.loading = true; + let qParams = this.addDateRange(this.queryParams, this.dateTimeRange,"tradeDate"); this.emisSettleBillList=[]; - queryPayBackRecordList(this.queryParams).then(response => { + queryPayBackRecordList(qParams).then(response => { this.emisSettleBillList = response.rows; this.total = response.total; this.loading = false; @@ -490,8 +490,6 @@ export default { return ++index } - - if (j === 'waybillDetail.parcelQty') { return v['waybillDetail']['parcelQty']; } diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue index df3af20e..1d74f535 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue @@ -78,6 +78,14 @@ >
+ + 收款日历 + - - - - + + @click="handleShowCanlender" + >收款日历 +