hbyt/cloud-battery-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
cjb 2025-07-28 09:57:11 +08:00
parent 280b57884a
commit 9bf9960b42
5 changed files with 111 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -7,7 +7,6 @@ VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway' VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway'
#VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway' #VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway'
#VITE_APP_BASE_API = 'http://192.168.7.152:9100/gateway'
#VITE_APP_BASE_API = '/dev-api' #VITE_APP_BASE_API = '/dev-api'
#VITE_APP_BASE_API = 'https://api.evo-techina.com' #VITE_APP_BASE_API = 'https://api.evo-techina.com'

11
src/api/order/replabatt.ts
View File

@ -138,3 +138,14 @@ export function paystatus(outTradeNo:string) {
} }
},false) },false)
} }
//订单详情
export function oderdetails(orderNo:string) {
return server.request({
url: '/cloud/order/swap/'+orderNo,
method: 'get',
},false)
}

6
src/api/order/reservation.ts
View File

@ -28,7 +28,7 @@ interface Addobj{
export function addhdz(data:Addobj) { export function addhdz(data:Addobj) {
return server.request({ return server.request({
url: '/cloud/order/swap/pre/add', url: '/cloud/order/per/add',
method: 'post', method: 'post',
data data
}) })
@ -56,7 +56,7 @@ interface Querydata{
} }
export function getyylist(params:Querydata) { export function getyylist(params:Querydata) {
return server.request({ return server.request({
url: '/cloud/order/swap/pre/list', url: '/cloud/order/per/list',
method: 'get', method: 'get',
params params
}) })
@ -65,7 +65,7 @@ export function getyylist(params:Querydata) {
//取消预约 //取消预约
export function delhdz(id:string) { export function delhdz(id:string) {
return server.request({ return server.request({
url: '/cloud/order/swap/pre/cancel', url: '/cloud/order/per/cancel',
method: 'post', method: 'post',
data:{ data:{
id id

156
src/views/order/replabatt/index.vue
View File

@ -102,9 +102,9 @@
<el-table-column label="车牌号" min-width="120" align="center" prop="plateNum" :show-overflow-tooltip="true" /> <el-table-column label="车牌号" min-width="120" align="center" prop="plateNum" :show-overflow-tooltip="true" />
<el-table-column label="换电站" min-width="200" align="center" prop="stationName" :show-overflow-tooltip="true" /> <el-table-column label="换电站" min-width="200" align="center" prop="stationName" :show-overflow-tooltip="true" />
<el-table-column label="预约人" min-width="120" align="center" prop="orderPreUname" :show-overflow-tooltip="true" /> <el-table-column label="预约人" min-width="120" align="center" prop="orderPreUname" :show-overflow-tooltip="true" />
<el-table-column label="预约人电话" min-width="120" align="center" prop="orderPrePhone" :show-overflow-tooltip="true" /> <!-- <el-table-column label="预约人电话" min-width="120" align="center" prop="orderPrePhone" :show-overflow-tooltip="true" /> -->
<el-table-column label="订单时间" min-width="200" align="center" prop="orderTime" :show-overflow-tooltip="true" /> <el-table-column label="订单时间" min-width="200" align="center" prop="orderTime" :show-overflow-tooltip="true" />
<el-table-column label="金额账号" min-width="120" align="center" prop="accountCode" :show-overflow-tooltip="true" /> <!-- <el-table-column label="金额账号" min-width="120" align="center" prop="accountCode" :show-overflow-tooltip="true" /> -->
<el-table-column label="订单金额(元)" min-width="120" align="center" prop="amount" :show-overflow-tooltip="true"> <el-table-column label="订单金额(元)" min-width="120" align="center" prop="amount" :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<div>{{scope.row.amount/100}}</div> <div>{{scope.row.amount/100}}</div>
@ -129,6 +129,8 @@
<div v-else-if="scope.row.feeType == 3">换电量</div> <div v-else-if="scope.row.feeType == 3">换电量</div>
</template> </template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="基础费用(元)" min-width="120" align="center" prop="basicFee" :show-overflow-tooltip="true" /> <el-table-column label="基础费用(元)" min-width="120" align="center" prop="basicFee" :show-overflow-tooltip="true" />
<el-table-column label="服务开始时间" min-width="180" align="center" prop="serviceTimeBegin" :show-overflow-tooltip="true" /> <el-table-column label="服务开始时间" min-width="180" align="center" prop="serviceTimeBegin" :show-overflow-tooltip="true" />
<el-table-column label="服务结束时间" min-width="180" align="center" prop="serviceTimeEnd" :show-overflow-tooltip="true" /> <el-table-column label="服务结束时间" min-width="180" align="center" prop="serviceTimeEnd" :show-overflow-tooltip="true" />
@ -164,7 +166,9 @@
<div v-else-if="scope.row.changeMode == 3">人工干预</div> <div v-else-if="scope.row.changeMode == 3">人工干预</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交易编码" min-width="280" align="center" prop="tradeNo" :show-overflow-tooltip="true" /> <el-table-column label="交易编码" min-width="280" align="center" prop="tradeNo" :show-overflow-tooltip="true" /> -->
<!-- <el-table-column label="操作" align="center" width="100" fixed="right"> <!-- <el-table-column label="操作" align="center" width="100" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
@ -176,7 +180,7 @@
v-model:current-page="queryParams.pageNo" v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize" v-model:page-size="queryParams.pageSize"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
background background0
size="small" size="small"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
@ -468,7 +472,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-bottom: 30px;"> <el-row style="margin-bottom: 30px;padding-bottom: 30px;border-bottom: 2px dashed #ccc;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="5">订单状态：</el-col> <el-col :span="5">订单状态：</el-col>
@ -481,57 +485,66 @@
<el-col :span="18" style="color: #417ebb;">{{xqobj.orderTime}}</el-col> <el-col :span="18" style="color: #417ebb;">{{xqobj.orderTime}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8">
<el-row>
<el-col :span="5">金额账号：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.accountCode?xqobj.accountCode:'--'}}</el-col>
</el-row>
</el-col>
</el-row>
<el-row style="margin-bottom: 30px;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="4">预约人：</el-col> <el-col :span="4">预约人：</el-col>
<el-col :span="20" style="color: #417ebb;">{{xqobj.orderPreUname}}</el-col> <el-col :span="20" style="color: #417ebb;">{{xqobj.orderPreUname}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<el-row>
<el-col :span="5">金额账号：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.accountCode?xqobj.accountCode:'--'}}</el-col>
</el-row>
</el-col> -->
</el-row>
<!-- <el-row style="margin-bottom: 30px;"> -->
<!-- <el-col :span="8">
<el-row> <el-row>
<el-col :span="6">预约人电话：</el-col> <el-col :span="6">预约人电话：</el-col>
<el-col :span="18" style="color: #417ebb;">{{xqobj.orderPrePhone?xqobj.orderPrePhone:''}}</el-col> <el-col :span="18" style="color: #417ebb;">{{xqobj.orderPrePhone?xqobj.orderPrePhone:''}}</el-col>
</el-row> </el-row>
</el-col> </el-col> -->
<el-col :span="8"> <!-- <el-col :span="8">
<el-row> <el-row>
<el-col :span="5">交易编码：</el-col> <el-col :span="5">交易编码：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.tradeNo}}</el-col> <el-col :span="19" style="color: #417ebb;">{{xqobj.tradeNo}}</el-col>
</el-row> </el-row>
</el-col> </el-col> -->
</el-row> <!-- </el-row> -->
<el-row style="margin-bottom: 30px;"> <el-row style="margin-bottom: 30px;padding-bottom: 30px;border-bottom: 2px dashed #ccc;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="5">订单金额：</el-col> <el-col :span="5">订单金额：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.amount/100}}元</el-col> <el-col :span="19" style="color: #417ebb;">{{xqobj.amount/100}}元</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8">
<el-row>
<el-col :span="5">换电费用：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.orderFee/100}}元</el-col>
</el-row>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="5">服务费：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.serviceFee/100}}元</el-col>
</el-row>
</el-col>
</el-row>
<el-row style="margin-bottom: 30px;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="6">计费方式：</el-col> <el-col :span="6">计费方式：</el-col>
<el-col :span="18" style="color: #417ebb;">{{feetype(xqobj.feeType)}}</el-col> <el-col :span="18" style="color: #417ebb;">{{feetype(xqobj.feeType)}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8">
<el-row>
<el-col :span="5">基础费用：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.basicFee/100}}元</el-col>
</el-row>
</el-col>
</el-row>
<el-row style="margin-bottom: 30px;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="7">服务开始时间：</el-col> <el-col :span="7">服务开始时间：</el-col>
@ -544,15 +557,10 @@
<el-col :span="16" style="color: #417ebb;">{{xqobj.serviceTimeEnd}}</el-col> <el-col :span="16" style="color: #417ebb;">{{xqobj.serviceTimeEnd}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8">
<el-row>
<el-col :span="5">服务费：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.serviceFee/100}}元</el-col>
</el-row>
</el-col>
</el-row> </el-row>
<el-row style="margin-bottom: 30px;"> <el-row v-if="xqobj.feeType == 1" style="margin-bottom: 30px;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="12">上次租赁电池时车辆里程：</el-col> <el-col :span="12">上次租赁电池时车辆里程：</el-col>
@ -565,21 +573,29 @@
<el-col :span="12" style="color: #417ebb;">{{xqobj.nowReturnBatCarOdo}}公里</el-col> <el-col :span="12" style="color: #417ebb;">{{xqobj.nowReturnBatCarOdo}}公里</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<el-row> <el-row>
<el-col :span="8">按ODO换电费：</el-col> <el-col :span="8">按ODO换电费：</el-col>
<el-col :span="16" style="color: #417ebb;">{{xqobj.odoAmount}}元</el-col> <el-col :span="16" style="color: #417ebb;">{{xqobj.odoAmount}}元</el-col>
</el-row> </el-row>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row v-if="xqobj.feeType == 2" style="margin-bottom: 30px;">
<el-row style="margin-bottom: 30px;"> <el-col :span="8">
<el-col :span="8">
<el-row> <el-row>
<el-col :span="5">总充电量：</el-col> <el-col :span="9">租用电池包SOC：</el-col>
<el-col :span="19" style="color: #417ebb;">{{xqobj.electAmount}}度</el-col> <el-col :span="10" style="color: #417ebb;">{{xqobj.rentBatSoc}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8">
<el-row>
<el-col :span="9">归还电池包SOC：</el-col>
<el-col :span="10" style="color: #417ebb;">{{xqobj.returnBatSoc}}</el-col>
</el-row>
</el-col>
</el-row>
<el-row v-if="xqobj.feeType == 2" style="margin-bottom: 30px;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="8">租借电池包仓位：</el-col> <el-col :span="8">租借电池包仓位：</el-col>
@ -593,50 +609,51 @@
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="xqobj.feeType == 2" style="margin-bottom: 30px;">
<el-row style="margin-bottom: 30px;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="9">租用电池包SOC：</el-col> <el-col :span="8">归还电池包仓位：</el-col>
<el-col :span="10" style="color: #417ebb;">{{xqobj.rentBatSoc}}</el-col> <el-col :span="12" style="color: #417ebb;">{{xqobj.returnBatNo}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="8">归还电池包编码：</el-col> <el-col :span="8">归还电池包编码：</el-col>
<el-col :span="12" style="color: #417ebb;">{{xqobj.returnBatCode}}</el-col> <el-col :span="16" style="color: #417ebb;">{{xqobj.returnBatCode}}</el-col>
</el-row>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="8">归还电池包仓位：</el-col>
<el-col :span="16" style="color: #417ebb;">{{xqobj.returnBatNo}}</el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="xqobj.feeType == 3" style="margin-bottom: 30px;">
<el-row style="margin-bottom: 30px;"> <el-col :span="8">
<el-col :span="8">
<el-row> <el-row>
<el-col :span="9">归还电池包SOC：</el-col> <el-col :span="5">总充电量：</el-col>
<el-col :span="10" style="color: #417ebb;"></el-col> <el-col :span="19" style="color: #417ebb;">{{xqobj.electAmount}}度</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<!-- <el-row style="margin-bottom: 30px;"> -->
<!-- <el-col :span="8">
<el-row>
<el-col :span="9">归还电池包SOC：</el-col>
<el-col :span="10" style="color: #417ebb;">{{xqobj.returnBatSoc}}</el-col>
</el-row>
</el-col> -->
<!-- <el-col :span="8">
<el-row> <el-row>
<el-col :span="11">归还电池租出时SOC：</el-col> <el-col :span="11">归还电池租出时SOC：</el-col>
<el-col :span="12" style="color: #417ebb;">{{xqobj.returnBatSoc}}</el-col> <el-col :span="12" style="color: #417ebb;">{{xqobj.returnBatSoc}}</el-col>
</el-row> </el-row>
</el-col> </el-col> -->
<el-col :span="8"> <!-- <el-col :span="8">
<el-row> <el-row>
<el-col :span="11">归还电池租出的换电站：</el-col> <el-col :span="11">归还电池租出的换电站：</el-col>
<el-col :span="13" style="color: #417ebb;">{{xqobj.returnBatRentStationName}}</el-col> <el-col :span="13" style="color: #417ebb;">{{xqobj.returnBatRentStationName}}</el-col>
</el-row> </el-row>
</el-col> </el-col> -->
</el-row> <!-- </el-row> -->
<el-row style="margin-bottom: 30px;"> <el-row style="padding-top: 30px;border-top: 2px dashed #ccc;">
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row>
<el-col :span="5">换电模式：</el-col> <el-col :span="5">换电模式：</el-col>
@ -698,7 +715,8 @@
update, update,
delhdz, delhdz,
jsfeiy, jsfeiy,
gethdbz gethdbz,
oderdetails
} from '@/api/order/replabatt' } from '@/api/order/replabatt'
import { import {
@ -727,7 +745,7 @@
} }
}else if(n == 2){ }else if(n == 2){
return { return {
name:'车辆到达指定位置', name:'车辆到位',
icon:'LocationFilled' icon:'LocationFilled'
} }
}else if(n == 3){ }else if(n == 3){
@ -1164,8 +1182,12 @@
let hdbz = ref<any[]>([]) let hdbz = ref<any[]>([])
let xqobj = ref<any>({}) let xqobj = ref<any>({})
function getdetails(n:any) { function getdetails(n:any) {
xqobj.value = n //xqobj.value = n
drawer.value = true drawer.value = true
oderdetails(n.orderNo).then((rps:any) => {
xqobj.value = rps.data
})
gethdbz(n.orderNo).then((rps:any) => { gethdbz(n.orderNo).then((rps:any) => {
hdbz.value.splice(0) hdbz.value.splice(0)
if(rps.data){ if(rps.data){

7
src/views/order/replabatt/payment.vue
View File

@ -77,7 +77,11 @@
<el-table-column label="车牌号" min-width="120" align="center" prop="plateNum" :show-overflow-tooltip="true" /> <el-table-column label="车牌号" min-width="120" align="center" prop="plateNum" :show-overflow-tooltip="true" />
<el-table-column label="订单时间" min-width="200" align="center" prop="orderTime" :show-overflow-tooltip="true" /> <el-table-column label="订单时间" min-width="200" align="center" prop="orderTime" :show-overflow-tooltip="true" />
<el-table-column label="金额账号" min-width="120" align="center" prop="accountCode" :show-overflow-tooltip="true" /> <el-table-column label="金额账号" min-width="120" align="center" prop="accountCode" :show-overflow-tooltip="true" />
<el-table-column label="订单金额" min-width="120" align="center" prop="amount" :show-overflow-tooltip="true" /> <el-table-column label="订单金额" min-width="120" align="center" prop="amount" :show-overflow-tooltip="true">
<template #default="scope">
<div>{{scope.row.amount/100}}</div>
</template>
</el-table-column>
<el-table-column label="订单状态" min-width="120" align="center" prop="status" :show-overflow-tooltip="true"> <el-table-column label="订单状态" min-width="120" align="center" prop="status" :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.status == 1">已创建</div> <div v-if="scope.row.status == 1">已创建</div>
@ -455,6 +459,7 @@
openpop.value = false openpop.value = false
handBtnqu() handBtnqu()
} }
}) })
},5000) },5000)
}) })