diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index a959924af..23e6ce8da 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -565,8 +565,8 @@ export default {
//字符串拼接,开始时间,结束时间
let beg = getDay(-7) + " 00:00:00"; //当月第一天
let end = getDay(0) + " 23:59:59"; //当天
- this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
this.createTimeRange = [beg, end];
+ // this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
// console.log("一进入页面显示的时间段", this.createTimeRange);
// return this.createTimeRange;
},
diff --git a/jsowell-ui/src/views/pile/station/stationOrderList.vue b/jsowell-ui/src/views/pile/station/stationOrderList.vue
index a70b5222e..ac79c7999 100644
--- a/jsowell-ui/src/views/pile/station/stationOrderList.vue
+++ b/jsowell-ui/src/views/pile/station/stationOrderList.vue
@@ -43,6 +43,12 @@
/>
+
+
+
+
@@ -283,6 +289,8 @@ export default {
rules: {},
// 站点列表
stationList: [],
+ // 订单创建时间范围
+ createTimeRange: [],
// 订单结算时间范围
settleTimeRange: [],
totalDateList: [],
@@ -414,17 +422,32 @@ export default {
//字符串拼接,开始时间,结束时间
let beg = getDay(-7) + " 00:00:00"; //当月第一天
let end = getDay(0) + " 23:59:59"; //当天
- this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
+ this.createTimeRange = [beg, end];
+ // this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
// console.log("defaultDate", this.settleTimeRange);
},
},
watch: {
- settleTimeRange(newValue, oldValue) {
- if (newValue != null && newValue.length > 0) {
- this.queryParams.startTime = newValue[0];
- this.queryParams.endTime = newValue[1];
- }
- },
+ createTimeRange(newValue, oldValue) {
+ console.log("createTimeRange发生变化", newValue, oldValue);
+ if (newValue != null && newValue.length > 0) {
+ this.queryParams.startTime = newValue[0];
+ this.queryParams.endTime = newValue[1];
+ } else {
+ this.queryParams.startTime = null;
+ this.queryParams.endTime = null;
+ }
+ },
+ settleTimeRange(newValue, oldValue) {
+ console.log("settleTimeRange发生变化", newValue, oldValue);
+ if (newValue != null && newValue.length > 0) {
+ this.queryParams.startSettleTime = newValue[0];
+ this.queryParams.endSettleTime = newValue[1];
+ } else {
+ this.queryParams.startSettleTime = null;
+ this.queryParams.endSettleTime = null;
+ }
+ },
},
};