This commit is contained in:
2024-01-10 15:58:45 +08:00
parent 1f44a0defa
commit 3bc7522428
2 changed files with 32 additions and 9 deletions

View File

@@ -565,8 +565,8 @@ export default {
//字符串拼接,开始时间,结束时间 //字符串拼接,开始时间,结束时间
let beg = getDay(-7) + " 00:00:00"; //当月第一天 let beg = getDay(-7) + " 00:00:00"; //当月第一天
let end = getDay(0) + " 23:59:59"; //当天 let end = getDay(0) + " 23:59:59"; //当天
this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
this.createTimeRange = [beg, end]; this.createTimeRange = [beg, end];
// this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
// console.log("一进入页面显示的时间段", this.createTimeRange); // console.log("一进入页面显示的时间段", this.createTimeRange);
// return this.createTimeRange; // return this.createTimeRange;
}, },

View File

@@ -43,6 +43,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" :clearable="true"/>
</el-form-item>
<el-form-item label="结算时间"> <el-form-item label="结算时间">
<el-date-picker <el-date-picker
v-model="settleTimeRange" v-model="settleTimeRange"
@@ -53,7 +59,7 @@
range-separator="-" range-separator="-"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
:clearable="false" :clearable="true"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -283,6 +289,8 @@ export default {
rules: {}, rules: {},
// 站点列表 // 站点列表
stationList: [], stationList: [],
// 订单创建时间范围
createTimeRange: [],
// 订单结算时间范围 // 订单结算时间范围
settleTimeRange: [], settleTimeRange: [],
totalDateList: [], totalDateList: [],
@@ -414,17 +422,32 @@ export default {
//字符串拼接,开始时间,结束时间 //字符串拼接,开始时间,结束时间
let beg = getDay(-7) + " 00:00:00"; //当月第一天 let beg = getDay(-7) + " 00:00:00"; //当月第一天
let end = getDay(0) + " 23:59:59"; //当天 let end = getDay(0) + " 23:59:59"; //当天
this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据 this.createTimeRange = [beg, end];
// this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
// console.log("defaultDate", this.settleTimeRange); // console.log("defaultDate", this.settleTimeRange);
}, },
}, },
watch: { watch: {
settleTimeRange(newValue, oldValue) { createTimeRange(newValue, oldValue) {
if (newValue != null && newValue.length > 0) { console.log("createTimeRange发生变化", newValue, oldValue);
this.queryParams.startTime = newValue[0]; if (newValue != null && newValue.length > 0) {
this.queryParams.endTime = newValue[1]; 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;
}
},
}, },
}; };
</script> </script>