添加站点加一个groupCode字段

This commit is contained in:
BOOL\25024
2024-02-23 09:59:36 +08:00
parent e278682c4d
commit e920512509

View File

@@ -7,8 +7,7 @@
<!-- 客户 --> <!-- 客户 -->
<el-tab-pane label="客户"> <el-tab-pane label="客户">
<el-col> <el-col>
<el-button type="primary" size="mini" icon="el-icon-plus" <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAddMember">添加会员
@click="handleAddMember">添加会员
</el-button> </el-button>
</el-col> </el-col>
<el-table :data="memberGroupList" stripe style="width: 100%" v-loading="loading"> <el-table :data="memberGroupList" stripe style="width: 100%" v-loading="loading">
@@ -30,108 +29,60 @@
</el-table> </el-table>
<!--分页--> <!--分页-->
<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="getMemberList" :limit.sync="queryParams.pageSize" @pagination="getMemberList" style="margin-bottom: 20px" />
style="margin-bottom: 20px"/>
</el-tab-pane> </el-tab-pane>
<!-- 交易明细 --> <!-- 交易明细 -->
<el-tab-pane label="交易明细"> <el-tab-pane label="交易明细">
<!--搜索条件--> <!--搜索条件-->
<el-form <el-form :model="queryOrderParams" ref="queryForm" size="small" :inline="true" v-show=true
:model="queryOrderParams" label-width="168px" @submit.native.prevent>
ref="queryForm"
size="small"
:inline="true"
v-show=true
label-width="168px"
@submit.native.prevent
>
<el-form-item label="订单编号" prop="orderCode"> <el-form-item label="订单编号" prop="orderCode">
<el-input <el-input v-model="queryOrderParams.orderCode" placeholder="请输入订单编号" clearable
v-model="queryOrderParams.orderCode" @keyup.enter.native="handleQuery" />
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 <el-select v-model="queryOrderParams.orderStatus" placeholder="请选择订单状态" clearable
v-model="queryOrderParams.orderStatus" style="width: 140px">
placeholder="请选择订单状态" <el-option v-for="dict in dict.type.order_status" :key="dict.value" :label="dict.label"
clearable :value="dict.value" />
style="width: 140px"
>
<el-option
v-for="dict in dict.type.order_status"
:key="dict.value"
:label="dict.label"
:value="dict.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 <el-input v-model="queryOrderParams.mobileNumber" placeholder="请输入手机号码" clearable
v-model="queryOrderParams.mobileNumber" @keyup.enter.native="handleQuery" />
placeholder="请输入手机号码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="queryOrderParams.createTimeRange" style="width: 240px" <el-date-picker v-model="queryOrderParams.createTimeRange" style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
:default-time="['00:00:00', '23:59:59']" type="daterange" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"
:clearable="true" /> :clearable="true" />
</el-form-item> </el-form-item>
<el-form-item label="结算时间"> <el-form-item label="结算时间">
<el-date-picker <el-date-picker v-model="queryOrderParams.settleTimeRange" style="width: 240px"
v-model="queryOrderParams.settleTimeRange" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
style="width: 240px" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss" :clearable="true"></el-date-picker>
: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>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
type="primary" </el-button>
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <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-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
type="warning" v-hasPermi="['order:order:export']">导出
plain </el-button>
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['order:order:export']"
>导出
</el-button
>
</el-col> </el-col>
<div> <div>
<ul> <ul>
@@ -150,8 +101,7 @@
<el-table :data="orderListResult" stripe style="width: 100%" v-loading="loading"> <el-table :data="orderListResult" stripe style="width: 100%" v-loading="loading">
<el-table-column label="订单编号" align="center" prop="orderCode" width="280px"> <el-table-column label="订单编号" align="center" prop="orderCode" width="280px">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/order/index/orderDetail/' + scope.row.orderCode" <router-link :to="'/order/index/orderDetail/' + scope.row.orderCode" class="link-type">
class="link-type">
<span>{{ scope.row.orderCode }}</span> <span>{{ scope.row.orderCode }}</span>
</router-link> </router-link>
</template> </template>
@@ -160,8 +110,7 @@
<el-table-column label="会员昵称" align="center" prop="nickName" width="120px" /> <el-table-column label="会员昵称" align="center" prop="nickName" width="120px" />
<el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px" /> <el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px" />
<el-table-column label="站点" align="center" prop="stationName" /> <el-table-column label="站点" align="center" prop="stationName" />
<el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode" <el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode" width="200px" />
width="200px"/>
<el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px" /> <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px" />
<el-table-column label="启动方式" align="center" prop="startMode" width="100px"> <el-table-column label="启动方式" align="center" prop="startMode" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -202,8 +151,7 @@
<el-table-column label="描述" align="center" prop="templateDesc" /> <el-table-column label="描述" align="center" prop="templateDesc" />
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" <el-button size="mini" type="text" icon="el-icon-edit" @click="addasite(scope.row)">修改
@click="addasite(scope.row)">修改
</el-button> </el-button>
<el-button size="mini" type="text" icon="el-icon-delete" <el-button size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除 @click="handleDelete(scope.row)">删除
@@ -213,8 +161,7 @@
</el-table> </el-table>
<!--分页--> <!--分页-->
<pagination v-show="stationTotal > 0" :total="stationTotal" :page.sync="queryStation.pageNum" <pagination v-show="stationTotal > 0" :total="stationTotal" :page.sync="queryStation.pageNum"
:limit.sync="queryStation.pageSize" @pagination="getStationList" :limit.sync="queryStation.pageSize" @pagination="getStationList" style="margin-bottom: 20px" />
style="margin-bottom: 20px"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-col> </el-col>
@@ -231,8 +178,7 @@
<el-dialog title="添加站点" :visible.sync="getSite" :before-close="getCancel" width="1000px" append-to-body> <el-dialog title="添加站点" :visible.sync="getSite" :before-close="getCancel" width="1000px" append-to-body>
<el-form ref="exchangeRate" :model="exchangeRate" :rules="dialogRules"> <el-form ref="exchangeRate" :model="exchangeRate" :rules="dialogRules">
<el-form-item label="请选择站点"> <el-form-item label="请选择站点">
<el-select v-model="selectSite" placeholder="请选择站点" filterable style="width:300px" <el-select v-model="selectSite" placeholder="请选择站点" filterable style="width:300px" @change="queryInfo">
@change="queryInfo">
<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>
@@ -644,6 +590,7 @@ export default {
this.$refs["exchangeRate"].validate(valid => { this.$refs["exchangeRate"].validate(valid => {
if (valid) { if (valid) {
let newOffers = { let newOffers = {
groupCode: this.$route.params.groupCode.split('&')[0],
stationId: this.stationId, stationId: this.stationId,
electricityPriceA: this.exchangeRate.modifyServiceA, electricityPriceA: this.exchangeRate.modifyServiceA,
servicePriceA: this.exchangeRate.modifyElectricityA, servicePriceA: this.exchangeRate.modifyElectricityA,