mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 02:55:04 +08:00
修改充电订单页面
This commit is contained in:
@@ -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,22 +94,22 @@
|
||||
end-placeholder="结束日期"
|
||||
:clearable="true"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</div>
|
||||
<el-button
|
||||
@click="showOrHide()"
|
||||
style="
|
||||
border-color: white;
|
||||
background-color: white;
|
||||
font-size: x-small;
|
||||
color: #50bfff;
|
||||
padding: 1px 2px;
|
||||
margin-left: 40%;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 15px;
|
||||
"
|
||||
border-color: white;
|
||||
background-color: white;
|
||||
font-size: x-small;
|
||||
color: #50bfff;
|
||||
padding: 1px 2px;
|
||||
margin-left: 40%;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 15px;
|
||||
"
|
||||
:icon="icon"
|
||||
>{{ showOrHideText }}
|
||||
>{{ showOrHideText }}
|
||||
</el-button>
|
||||
</el-form>
|
||||
|
||||
@@ -120,15 +120,12 @@
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
@click="handleQuery"
|
||||
>搜索
|
||||
>搜索
|
||||
</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>
|
||||
<el-button
|
||||
@@ -138,17 +135,21 @@
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['order:order:export']"
|
||||
>导出
|
||||
>导出
|
||||
</el-button>
|
||||
<div>
|
||||
{{ dateDescription }}期间,总用电量{{ sumUsedElectricity }}度,总消费金额{{ sumOrderAmount }}元,总结算金额{{ sumSettleAmount }}元
|
||||
{{ dateDescription }}期间,总用电量{{
|
||||
sumUsedElectricity
|
||||
}}度,总消费金额{{ sumOrderAmount }}元,总结算金额{{
|
||||
sumSettleAmount
|
||||
}}元
|
||||
</div>
|
||||
<el-popover placement="top-start" width="400" trigger="click">
|
||||
<el-checkbox
|
||||
:indeterminate="isIndeterminate"
|
||||
v-model="checkAll"
|
||||
@change="handleCheckAllChange"
|
||||
>全选
|
||||
>全选
|
||||
</el-checkbox>
|
||||
<div style="margin: 15px 0"></div>
|
||||
<el-checkbox-group
|
||||
@@ -156,37 +157,28 @@
|
||||
v-model="checkedCities"
|
||||
@change="handleCheckedCitiesChange"
|
||||
>
|
||||
<el-checkbox
|
||||
v-for="city in cities"
|
||||
:label="city"
|
||||
:key="city.id"
|
||||
>{{ city }}
|
||||
<el-checkbox v-for="city in cities" :label="city" :key="city.id"
|
||||
>{{ city }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-popover>
|
||||
</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%"/>
|
||||
<el-skeleton-item variant="h3" style="width: 50%" />
|
||||
<div
|
||||
style="
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-items: space-between;
|
||||
margin-top: 16px;
|
||||
height: 16px;
|
||||
"
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-items: space-between;
|
||||
margin-top: 16px;
|
||||
height: 16px;
|
||||
"
|
||||
>
|
||||
<el-skeleton-item
|
||||
variant="text"
|
||||
style="margin-right: 16px"
|
||||
/>
|
||||
<el-skeleton-item variant="text" style="width: 30%"/>
|
||||
<el-skeleton-item variant="text" style="margin-right: 16px" />
|
||||
<el-skeleton-item variant="text" style="width: 30%" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -201,67 +193,53 @@
|
||||
<div class="cardview-static">
|
||||
<div>
|
||||
<router-link
|
||||
:to="
|
||||
'/order/index/orderDetail/' +
|
||||
item.orderCode
|
||||
"
|
||||
:to="'/order/index/orderDetail/' + item.orderCode"
|
||||
class="link-type"
|
||||
>订单编号:{{ item.orderCode }}
|
||||
>订单编号:{{ item.orderCode }}
|
||||
</router-link>
|
||||
|
||||
<el-tag
|
||||
:type="color(item.orderStatus)"
|
||||
style="margin-left: 10px"
|
||||
>{{ item.orderStatusDescribe }}
|
||||
>{{ item.orderStatusDescribe }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<div>
|
||||
开始时间:{{ item.chargeStartTime || "一" }}
|
||||
</div>
|
||||
<div>开始时间:{{ item.chargeStartTime || "一" }}</div>
|
||||
</div>
|
||||
<div style="padding: 10px">
|
||||
<el-descriptions
|
||||
class="title"
|
||||
:title="`${item.nickName || '---'}(${
|
||||
item.mobileNumber || '---'
|
||||
})`"
|
||||
item.mobileNumber || '---'
|
||||
})`"
|
||||
:column="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>
|
||||
<el-descriptions-item label="实时充电度数"
|
||||
>{{ item.realTimeChargingDegree || "一" }}
|
||||
>{{ item.realTimeChargingDegree || "一" }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="实时消费金额"
|
||||
>{{ item.realTimeAmount || "一" }}
|
||||
>{{ item.realTimeAmount || "一" }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="起始SOC"
|
||||
>{{ item.startSoc || "一" }}
|
||||
>{{ item.startSoc || "一" }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="终止SOC"
|
||||
>{{ item.endSoc || "一" }}
|
||||
>{{ item.endSoc || "一" }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="结束充电时间"
|
||||
>{{ item.chargeEndTime || "一" }}
|
||||
>{{ item.chargeEndTime || "一" }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="启动方式"
|
||||
>{{ startMode(item.startMode) }}
|
||||
>{{ 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>
|
||||
|
||||
@@ -289,12 +267,12 @@ import {
|
||||
totalData,
|
||||
} from "@/api/order/order";
|
||||
import Template from "@/views/billing/template";
|
||||
import {listStation} from "@/api/pile/station";
|
||||
import {getDay} from "@/utils/common";
|
||||
import { listStation } from "@/api/pile/station";
|
||||
import { getDay } from "@/utils/common";
|
||||
|
||||
export default {
|
||||
name: "Order",
|
||||
components: {Template},
|
||||
components: { Template },
|
||||
|
||||
dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
|
||||
data() {
|
||||
@@ -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,11 +566,10 @@ export default {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
.catch(() => {});
|
||||
},
|
||||
/** 订单详情序号 */
|
||||
rowOrderDetailIndex({row, rowIndex}) {
|
||||
rowOrderDetailIndex({ row, rowIndex }) {
|
||||
row.index = rowIndex + 1;
|
||||
},
|
||||
/** 订单详情添加按钮操作 */
|
||||
@@ -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,13 +656,13 @@ 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) {
|
||||
@@ -699,7 +673,9 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
::v-deep .el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell {
|
||||
::v-deep
|
||||
.el-descriptions--medium:not(.is-bordered)
|
||||
.el-descriptions-item__cell {
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user