|
|
@@ -18,7 +18,7 @@
|
|
|
<!-- 订单 -->
|
|
|
<view>
|
|
|
<view class="order-item" v-for="item,index in groupList"
|
|
|
- @click="jumpUrl('/pages/orderDetail/orderDetail?id='+item)">
|
|
|
+ @click="jumpUrl('/pages/orderDetail/orderDetail?id='+item.id)">
|
|
|
<view class="ddflex order-item-header">
|
|
|
<view class="order-time">类型：{{item.type==2?'按次计费':item.type==3?'按时计费':''}}</view>
|
|
|
<block>
|
|
|
@@ -45,16 +45,22 @@
|
|
|
<view class="order-item-content-data fflex tover">{{item.batteryId}}</view>
|
|
|
</view>
|
|
|
<view class="order-item-content ddflex">
|
|
|
+ <view class="order-item-content-label">应付金额：</view>
|
|
|
+ <view class="order-item-content-data fflex tover" style="color: #EB5C20">{{item.totalMoney?'￥'+item.totalMoney:'-'}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="order-item-content ddflex">
|
|
|
<view class="order-item-content-label">描述：</view>
|
|
|
- <view class="order-item-content-data fflex tover">{{item.exceptionCause?item.exceptionCause:'无'}}</view>
|
|
|
+ <view class="order-item-content-data fflex tover">
|
|
|
+ <view style="color: #2A82E4;margin-left: 10rpx;text-decoration: underline;" @click.stop="jumpUrl('/warning/userAlarm/userAlarm?orderId='+item.id)">查看用户报障</view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-if="item.isException!==0" class="order-btns ddflex">
|
|
|
- <view class="order-btn-time">2022-12-31 17:16:37</view>
|
|
|
- <view style="justify-content: flex-end;" class="ddflex">
|
|
|
+ <view class="order-btns ddflex">
|
|
|
+ <view class="order-btn-time">{{item.createDate}}</view>
|
|
|
+ <view v-if="item.isException==2" style="justify-content: flex-end;" class="ddflex">
|
|
|
<view class="order-btn" v-if="item.status==3&&item.refundStatus==0" @click.stop="openPop(item,'退款')">退款</view>
|
|
|
<view class="order-btn" v-if="item.status==0||item.status==1" @click.stop="openPop(item,'结算')">结算</view>
|
|
|
- <view class="order-btn" @click.stop="finishOrder">处理</view>
|
|
|
+ <view class="order-btn" @click.stop="finishOrder(item)">处理</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -70,13 +76,13 @@
|
|
|
@closePop="closePop()" @popSubmit="popSubmit()">
|
|
|
<view class="apply-info-box" v-if="popTitle=='退款'">
|
|
|
<view class="reason-input">
|
|
|
- <input v-model="tempData.rmoney" type="number" placeholder="请填写退款金额"></input>
|
|
|
+ <input v-model="tempData.rmoney" type="digit" placeholder="请填写退款金额"></input>
|
|
|
</view>
|
|
|
<view>请填写退款金额,最多可退￥{{tempData.payMoney}}</view>
|
|
|
</view>
|
|
|
<view class="apply-info-box" v-if="popTitle=='结算'">
|
|
|
<view class="reason-input">
|
|
|
- <input v-model="tempData.rmoney" type="number" placeholder="是否调整订单金额"></input>
|
|
|
+ <input v-model="tempData.rmoney" type="digit" placeholder="是否调整订单金额"></input>
|
|
|
</view>
|
|
|
<view>如需调整订单金额，请填写调整后的订单金额，否则无需填写</view>
|
|
|
</view>
|
|
|
@@ -196,13 +202,13 @@
|
|
|
content: "确定退款？",
|
|
|
success: (res) => {
|
|
|
if (res.confirm) {
|
|
|
- req.getRequest('/admin/v2/order/refund', {
|
|
|
- id: this.tempData.id,
|
|
|
+ req.postRequest('/admin/v2/order/refund', {
|
|
|
+ orderNo:this.tempData.orderNo,
|
|
|
refundMoney:this.tempData.rmoney
|
|
|
}, data => {
|
|
|
this.tempData = null
|
|
|
this.showPop = false
|
|
|
- res.msg('订单已退款')
|
|
|
+ req.msg('订单已退款')
|
|
|
this.getMachineList()
|
|
|
})
|
|
|
}
|
|
|
@@ -214,14 +220,14 @@
|
|
|
content: "确定结算？",
|
|
|
success: (res) => {
|
|
|
if (res.confirm) {
|
|
|
- req.getRequest('/admin/v2/order/settle', {
|
|
|
- id: this.tempData.id,
|
|
|
+ req.postRequest('/admin/v2/order/settle', {
|
|
|
+ orderId: this.tempData.id,
|
|
|
settleMoney:this.tempData.rmoney,
|
|
|
settleType:2
|
|
|
}, data => {
|
|
|
this.tempData = null
|
|
|
this.showPop = false
|
|
|
- res.msg('订单已结算')
|
|
|
+ req.msg('订单已结算')
|
|
|
this.getMachineList()
|
|
|
})
|
|
|
}
|
|
|
@@ -236,10 +242,10 @@
|
|
|
content: "确定直接处理该订单？如需调整订单金额请取消并点击结算操作，如需退款请取消并点击退款操作",
|
|
|
success: (res) => {
|
|
|
if (res.confirm) {
|
|
|
- req.getRequest('/admin/v2/order/settle', {
|
|
|
- id: item.id
|
|
|
+ req.postRequest('/admin/v2/order/finish', {
|
|
|
+ orderId:item.id
|
|
|
}, data => {
|
|
|
- res.msg('订单已处理')
|
|
|
+ req.msg('订单已处理')
|
|
|
this.getMachineList()
|
|
|
})
|
|
|
}
|
xhj