From 1277353f3cdff2396cd6bfc5bfd32552873ccbf2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 14 May 2021 12:13:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/parcel/parcel.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 1a52596..6e98766 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -9,6 +9,7 @@
v-model="form"
ref="crud"
:row-style="rowStyle"
+ :search.sync="search"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@@ -96,6 +97,7 @@
return {
form: {},
query: {},
+ search:{},
showViewer: false, // 显示查看器
activeClass: 0,
imgUrl:'',
@@ -343,23 +345,37 @@
this.$router.push({ query: {} });
that.activeClass = e;
var today = new Date();
+ var params ={};
if(e==0){
- var params = {
+ params = {
startTime:this.showToDay(today)+ " 00:00:00",
endTime:this.showToDay(today)+ " 23:59:59"
};
+ //修改搜索框中的值
+ this.search.dateTime=[this.showToDay(today)+ " 00:00:00",this.showToDay(today)+ " 23:59:59"]
}
if(e==1){
- var params = {
+ params = {
startTime:this.showWeekFirstDay(today)+ " 00:00:00",
endTime:this.showToDay(today)+ " 23:59:59"
};
+ //修改搜索框中的值
+ this.search.dateTime=[this.showWeekFirstDay(today)+ " 00:00:00",this.showToDay(today)+ " 23:59:59"]
}
if(e==2){
- var params = {
+ params = {
startTime:this.showMonthFirstDay(today)+ " 00:00:00",
endTime:this.showToDay(today)+ " 23:59:59"
};
+ //修改搜索框中的值
+ this.search.dateTime=[this.showMonthFirstDay(today)+ " 00:00:00",this.showToDay(today)+ " 23:59:59"]
+ }
+
+ if(this.search.decisioDiagramResult){
+ params= {
+ ... params,
+ decisioDiagramResult:this.search.decisioDiagramResult
+ }
}
this.query = params;
this.page.currentPage = 1;
@@ -420,7 +436,7 @@
//window.open(`http://localhost:8108/ureport/excel?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
},
- onLoad(page, params) {
+ onLoad(page, params={}) {
const { dateTime } = this.query;
let values = {
...params,
--
Gitblit v1.9.3