This commit is contained in:
2023-10-11 11:46:00 +08:00
parent fbf2f03058
commit 0fe26a2e9f

View File

@@ -1,37 +1,53 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="168px" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="168px"
@submit.native.prevent> @submit.native.prevent>
<el-form-item label="所属运营商" prop="merchantId" label-width="120">
<el-select v-model="queryParams.merchantId" filterable clearable placeholder="请选择运营商">
<el-option
v-for="item in merchantList"
:key="item.merchantName"
:label="item.merchantName"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="站点" prop="stationId"> <el-form-item label="站点" prop="stationId">
<el-select v-model="queryParams.stationId" placeholder="请选择站点" clearable filterable style="width: 140px"> <el-select v-model="queryParams.stationId" placeholder="请选择站点" clearable filterable
style="width: 140px">
<el-option v-for="(station, index) in stationList" :key="index" :label="station.stationName" <el-option v-for="(station, index) in stationList" :key="index" :label="station.stationName"
:value="station.id" /> :value="station.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单编号" prop="orderCode"> <el-form-item label="订单编号" prop="orderCode">
<el-input v-model="queryParams.orderCode" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.orderCode" placeholder="请输入订单编号" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable style="width: 140px"> <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable
style="width: 140px">
<el-option v-for="item1 in dict.type.order_status" :key="item1.value" :label="item1.label" <el-option v-for="item1 in dict.type.order_status" :key="item1.value" :label="item1.label"
:value="item1.value" /> :value="item1.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="mobileNumber"> <el-form-item label="手机号码" prop="mobileNumber">
<el-input v-model="queryParams.mobileNumber" placeholder="请输入手机号码" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.mobileNumber" placeholder="请输入手机号码" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<div v-if="buttonBoolean"> <div v-if="buttonBoolean">
<el-form-item label="交易流水号" prop="transactionCode"> <el-form-item label="交易流水号" prop="transactionCode">
<el-input v-model="queryParams.transactionCode" placeholder="请输入交易流水号" clearable <el-input v-model="queryParams.transactionCode" placeholder="请输入交易流水号" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery"/>
</el-form-item> </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" <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="开始日期" :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期" :clearable="true"></el-date-picker> end-placeholder="结束日期" :clearable="true"></el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="结算时间"> <!-- <el-form-item label="结算时间">
@@ -78,7 +94,7 @@
sumUsedElectricity sumUsedElectricity
}}总消费金额{{ sumOrderAmount }}总结算金额{{ }}总消费金额{{ sumOrderAmount }}总结算金额{{
sumSettleAmount sumSettleAmount
}} }}
</div> </div>
<el-popover placement="top-start" width="400" trigger="click"> <el-popover placement="top-start" width="400" trigger="click">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
@@ -92,9 +108,9 @@
</el-row> </el-row>
<el-skeleton style="width: 100%" :loading="loading" animated :count="3"> <el-skeleton style="width: 100%" :loading="loading" animated :count="3">
<template slot="template"> <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"> <div style="padding: 14px">
<el-skeleton-item variant="h3" style="width: 50%" /> <el-skeleton-item variant="h3" style="width: 50%"/>
<div style=" <div style="
display: flex; display: flex;
align-items: center; align-items: center;
@@ -102,8 +118,8 @@
margin-top: 16px; margin-top: 16px;
height: 16px; 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%" /> <el-skeleton-item variant="text" style="width: 30%"/>
</div> </div>
</div> </div>
</template> </template>
@@ -113,11 +129,14 @@
@change="handleSelectionChange"> @change="handleSelectionChange">
<div class="cardview-static"> <div class="cardview-static">
<div> <div>
<router-link :to="'/order/index/orderDetail/' + item.orderCode" class="link-type">订单编号{{ item.orderCode <router-link :to="'/order/index/orderDetail/' + item.orderCode" class="link-type">
订单编号{{
item.orderCode
}} }}
</router-link> </router-link>
<el-tag :type="color(item.orderStatus)" style="margin-left: 10px">{{ item.orderStatusDescribe }} <el-tag :type="color(item.orderStatus)" style="margin-left: 10px">
{{ item.orderStatusDescribe }}
</el-tag> </el-tag>
</div> </div>
<div>开始时间{{ item.chargeStartTime || "一" }}</div> <div>开始时间{{ item.chargeStartTime || "一" }}</div>
@@ -149,7 +168,7 @@
</div> </div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> :limit.sync="queryParams.pageSize" @pagination="getList"/>
</template> </template>
<el-empty description="暂无数据" v-else></el-empty> <el-empty description="暂无数据" v-else></el-empty>
</template> </template>
@@ -168,11 +187,12 @@ import {
} from "@/api/order/order"; } from "@/api/order/order";
import Template from "@/views/billing/template"; import Template from "@/views/billing/template";
import {getStationSelectList, listStation} from "@/api/pile/station"; import {getStationSelectList, listStation} from "@/api/pile/station";
import { getDay } from "@/utils/common"; import {getDay} from "@/utils/common";
import {getMerchantList} from "@/api/pile/merchant";
export default { export default {
name: "Order", name: "Order",
components: { Template }, components: {Template},
dicts: ["order_status", "start_mode", "pay_mode", "pay_status"], dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
data() { data() {
@@ -237,6 +257,7 @@ export default {
createTimeRange: [], createTimeRange: [],
// 订单创建结束范围 // 订单创建结束范围
settleTimeRange: [], settleTimeRange: [],
merchantList: [],
}; };
}, },
mounted() { mounted() {
@@ -244,6 +265,7 @@ export default {
}, },
created() { created() {
this.dataLoading(); this.dataLoading();
this.getMerchantList();
}, },
methods: { methods: {
goMemberDetail(item) { goMemberDetail(item) {
@@ -254,6 +276,12 @@ export default {
}, },
}); });
}, },
getMerchantList() {
getMerchantList().then((response) => {
this.merchantList = response.rows;
console.log("merchantList", this.merchantList)
});
},
goStationDetail(scope) { goStationDetail(scope) {
// console.log(scope,'跳转站点名称') // console.log(scope,'跳转站点名称')
// console.log("跳转到充电站详情", scope.row.stationName); // console.log("跳转到充电站详情", scope.row.stationName);
@@ -466,10 +494,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => { }); .catch(() => {
});
}, },
/** 订单详情序号 */ /** 订单详情序号 */
rowOrderDetailIndex({ row, rowIndex }) { rowOrderDetailIndex({row, rowIndex}) {
row.index = rowIndex + 1; row.index = rowIndex + 1;
}, },
/** 订单详情添加按钮操作 */ /** 订单详情添加按钮操作 */