autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-10 10:19:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-23 16:46:15 +08:00
parent 2b6ded7b75 d354946b28
commit d5db6ac990
2 changed files with 79 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -389,8 +389,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
OrderTotalDataVO vo = new OrderTotalDataVO();
String startTime = dto.getStartSettleTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)) : dto.getStartSettleTime(); // 2023-08-16 00:00:00
String endTime = dto.getEndSettleTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()) : dto.getEndSettleTime(); // 2023-08-16 23:59:59
String startTime = dto.getStartTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)) : dto.getStartTime(); // 2023-08-16 00:00:00
String endTime = dto.getEndTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()) : dto.getEndTime(); // 2023-08-16 23:59:59
// 格式化时间
startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(startTime)); // 2023-08-16
endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(endTime)); // 2023-08-16

106
jsowell-ui/src/views/order/order/index.vue
View File

@@ -69,20 +69,20 @@
/>
</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-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="结算时间">
<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-date-picker>
</el-form-item>
<!-- <el-form-item label="结算时间">
<el-date-picker
v-model="settleTimeRange"
style="width: 240px"
@@ -94,7 +94,7 @@
end-placeholder="结束日期"
:clearable="true"
></el-date-picker>
</el-form-item>
</el-form-item> -->
</div>
<el-button
@click="showOrHide()"
@@ -124,10 +124,7 @@
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置
</el-button>
</el-col>
@@ -141,7 +138,11 @@
>导出
</el-button>
<div>
{{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{ sumOrderAmount }}元，总结算金额{{ sumSettleAmount }}元
{{ dateDescription }}期间，总用电量{{
sumUsedElectricity
}}度，总消费金额{{ sumOrderAmount }}元，总结算金额{{
sumSettleAmount
}}元
</div>
<el-popover placement="top-start" width="400" trigger="click">
<el-checkbox
@@ -156,10 +157,7 @@
v-model="checkedCities"
@change="handleCheckedCitiesChange"
>
<el-checkbox
v-for="city in cities"
:label="city"
:key="city.id"
<el-checkbox v-for="city in cities" :label="city" :key="city.id"
>{{ city }}
</el-checkbox>
</el-checkbox-group>
@@ -167,10 +165,7 @@
</el-row>
<el-skeleton style="width: 100%" :loading="loading" animated :count="3">
<template slot="template">
<el-skeleton-item
variant="text"
style="width: 100%; height: 100%"
/>
<el-skeleton-item variant="text" style="width: 100%; height: 100%" />
<div style="padding: 14px">
<el-skeleton-item variant="h3" style="width: 50%" />
<div
@@ -182,10 +177,7 @@
height: 16px;
"
>
<el-skeleton-item
variant="text"
style="margin-right: 16px"
/>
<el-skeleton-item variant="text" style="margin-right: 16px" />
<el-skeleton-item variant="text" style="width: 30%" />
</div>
</div>
@@ -201,10 +193,7 @@
<div class="cardview-static">
<div>
<router-link
:to="
'/order/index/orderDetail/' +
item.orderCode
"
:to="'/order/index/orderDetail/' + item.orderCode"
class="link-type"
>订单编号：{{ item.orderCode }}
</router-link>
@@ -215,9 +204,7 @@
>{{ item.orderStatusDescribe }}
</el-tag>
</div>
<div>
开始时间：{{ item.chargeStartTime || "一" }}
</div>
<div>开始时间：{{ item.chargeStartTime || "一" }}</div>
</div>
<div style="padding: 10px">
<el-descriptions
@@ -229,10 +216,7 @@
>
<!-- @click.native="goMemberDetail(item)" -->
<el-descriptions-item label="站点名称">
<div
style="color: #337ab7"
@click="goStationDetail(item)"
>
<div style="color: #337ab7" @click="goStationDetail(item)">
{{ item.stationName || "一" }}
</div>
</el-descriptions-item>
@@ -255,13 +239,7 @@
>{{ startMode(item.startMode) }}
</el-descriptions-item>
</el-descriptions>
<div
style="
flex: 1;
text-align: center;
margin: auto;
"
></div>
<div style="flex: 1; text-align: center; margin: auto"></div>
</div>
</div>
@@ -416,9 +394,7 @@ export default {
}
},
startMode(mode) {
let arr = this.dict.type.start_mode.find(
(item) => item.value == mode
);
let arr = this.dict.type.start_mode.find((item) => item.value == mode);
if (arr == null) {
return "一";
} else {
@@ -426,9 +402,7 @@ export default {
}
},
payMode(mode) {
let arr = this.dict.type.pay_mode.find(
(item) => item.value == mode
);
let arr = this.dict.type.pay_mode.find((item) => item.value == mode);
if (arr == null) {
return "一";
} else {
@@ -436,9 +410,7 @@ export default {
}
},
payStatus(status) {
let arr = this.dict.type.pay_status.find(
(item) => item.value == status
);
let arr = this.dict.type.pay_status.find((item) => item.value == status);
if (arr == null) {
return "一";
} else {
@@ -474,6 +446,7 @@ export default {
/** 查询订单列表 */
getList() {
this.loading = true;
console.log("查询订单列表需要的参数", this.queryParams);
listOrder(this.queryParams).then((response) => {
this.orderList = response.rows;
console.log("order里面的参数", this.orderList);
@@ -593,8 +566,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {
});
.catch(() => {});
},
/** 订单详情序号 */
rowOrderDetailIndex({ row, rowIndex }) {
@@ -665,6 +637,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];
// console.log("一进入页面显示的时间段", this.createTimeRange);
// return this.createTimeRange;
},
},
@@ -682,14 +656,14 @@ export default {
settleTimeRange(newValue, oldValue) {
console.log("settleTimeRange", newValue, oldValue);
if (newValue != null && newValue.length > 0) {
this.queryParams.startSettleTime = newValue[0];
this.queryParams.endSettleTime = newValue[1];
this.queryParams.startTime = newValue[0];
this.queryParams.endTime = newValue[1];
} else {
this.queryParams.startSettleTime = null;
this.queryParams.endSettleTime = null;
}
this.queryParams.startTime = null;
this.queryParams.endTime = null;
}
},
},
computed: {
tagType(row) {
console.log("tagType row", row);