mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-02-25 14:17:54 +08:00
优化交费相关代码
This commit is contained in:
parent
dcf012c5e6
commit
218e0d9c29
@ -0,0 +1,92 @@
|
||||
<div class="margin-top">
|
||||
<div class="row margin-top-lg">
|
||||
|
||||
</div>
|
||||
<div class="margin-top">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='编号' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='名称' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='手机号' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='充电桩' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='插槽' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='充电小时' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='充电量' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='开始时间' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='结束时间' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='扣款账户' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='小时电价' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='扣款金额' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='插座状态' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='说明' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="chargeMachineOrder in ownerDetailChargeMachineOrderInfo.chargeMachineOrders">
|
||||
<td class="text-center">{{chargeMachineOrder.orderId}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.personName}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.personTel}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.machineName}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.portName}}</td>
|
||||
<td class="text-center" v-if="chargeMachineOrder.chargeHours == 999">按量充电</td>
|
||||
<td class="text-center" v-else>{{chargeMachineOrder.chargeHours}}小时</td>
|
||||
<td class="text-center">{{chargeMachineOrder.energy}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.startTime}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.endTime}}</td>
|
||||
<td class="text-center hand">{{chargeMachineOrder.acctDetailId}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.durationPrice}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.amount}}(<a href="javascript:void(0)"
|
||||
@click="_viewOrderAccts(chargeMachineOrder)">明细</a>)</td>
|
||||
<td class="text-center">{{chargeMachineOrder.stateName}}
|
||||
<span v-if="chargeMachineOrder.state == '1001'">
|
||||
(<a href="javascript:void(0)" @click="_showStopCharge(chargeMachineOrder)">停止充电</a>)
|
||||
</span>
|
||||
|
||||
</td>
|
||||
<td class="text-center">{{chargeMachineOrder.remark || '-'}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<!-- 分页 -->
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
|
||||
</div>
|
||||
<div class="col-sm-8">
|
||||
<vc:create namespace="ownerDetailChargeMachineOrder" path="frame/paginationPlus"></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<vc:create path="machine/stopChargeMachine"></vc:create>
|
||||
|
||||
|
||||
</div>
|
||||
@ -0,0 +1,73 @@
|
||||
/**
|
||||
入驻小区
|
||||
**/
|
||||
(function (vc) {
|
||||
var DEFAULT_PAGE = 1;
|
||||
var DEFAULT_ROWS = 10;
|
||||
vc.extends({
|
||||
data: {
|
||||
ownerDetailChargeMachineOrderInfo: {
|
||||
chargeMachineOrders: [],
|
||||
ownerId: '',
|
||||
link: '',
|
||||
}
|
||||
},
|
||||
_initMethod: function () {
|
||||
},
|
||||
_initEvent: function () {
|
||||
vc.on('ownerDetailChargeMachineOrder', 'switch', function (_data) {
|
||||
$that.ownerDetailChargeMachineOrderInfo.ownerId = _data.ownerId;
|
||||
$that.ownerDetailChargeMachineOrderInfo.link = _data.link;
|
||||
$that._loadOwnerDetailChargeMachineOrderData(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
});
|
||||
vc.on('ownerDetailChargeMachineOrder', 'listChargeMachineOrder',
|
||||
function (_data) {
|
||||
vc.component._loadOwnerDetailChargeMachineOrderData(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
});
|
||||
vc.on('ownerDetailChargeMachineOrder', 'paginationPlus', 'page_event',
|
||||
function (_currentPage) {
|
||||
vc.component._loadOwnerDetailChargeMachineOrderData(_currentPage, DEFAULT_ROWS);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
_loadOwnerDetailChargeMachineOrderData: function (_page, _row) {
|
||||
let param = {
|
||||
params: {
|
||||
page: _page,
|
||||
row: _row,
|
||||
communityId: vc.getCurrentCommunity().communityId,
|
||||
personTel: $that.ownerDetailChargeMachineOrderInfo.link,
|
||||
}
|
||||
};
|
||||
|
||||
//发送get请求
|
||||
vc.http.apiGet('/chargeMachine.listChargeMachineOrder',
|
||||
param,
|
||||
function (json) {
|
||||
let _roomInfo = JSON.parse(json);
|
||||
vc.component.ownerDetailChargeMachineOrderInfo.chargeMachineOrders = _roomInfo.data;
|
||||
vc.emit('ownerDetailChargeMachineOrder', 'paginationPlus', 'init', {
|
||||
total: _roomInfo.records,
|
||||
dataCount: _roomInfo.total,
|
||||
currentPage: _page
|
||||
});
|
||||
},
|
||||
function () {
|
||||
console.log('请求失败处理');
|
||||
}
|
||||
);
|
||||
},
|
||||
//查询
|
||||
_qureyOwnerDetailChargeMachineOrder: function () {
|
||||
$that._loadOwnerDetailChargeMachineOrderData(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
},
|
||||
_viewOrderAccts: function (_order) { // 展示扣款明细
|
||||
vc.jumpToPage('/#/pages/machine/chargeMachineOrderAccts?orderId=' + _order.orderId)
|
||||
},
|
||||
_showStopCharge: function (_order) {
|
||||
vc.emit('stopChargeMachine', 'openStopChargeMachineModal', _order);
|
||||
},
|
||||
|
||||
}
|
||||
});
|
||||
})(window.vc);
|
||||
@ -14,21 +14,25 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group">
|
||||
<input type="text" :placeholder="vc.i18n('请选择订单编号','chargeMachineOrder')" v-model="chargeMachineOrderInfo.conditions.orderId" class=" form-control">
|
||||
<input type="text" :placeholder="vc.i18n('请选择订单编号','chargeMachineOrder')"
|
||||
v-model="chargeMachineOrderInfo.conditions.orderId" class=" form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group">
|
||||
<input type="text" :placeholder="vc.i18n('请选择名称','chargeMachineOrder')" v-model="chargeMachineOrderInfo.conditions.personName" class=" form-control">
|
||||
<input type="text" :placeholder="vc.i18n('请选择名称','chargeMachineOrder')"
|
||||
v-model="chargeMachineOrderInfo.conditions.personName" class=" form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<div class="form-group">
|
||||
<input type="text" :placeholder="vc.i18n('请选择手机号','chargeMachineOrder')" v-model="chargeMachineOrderInfo.conditions.personTel" class=" form-control">
|
||||
<input type="text" :placeholder="vc.i18n('请选择手机号','chargeMachineOrder')"
|
||||
v-model="chargeMachineOrderInfo.conditions.personTel" class=" form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-1">
|
||||
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryChargeMachineOrderMethod()">
|
||||
<button type="button" class="btn btn-primary btn-sm"
|
||||
v-on:click="_queryChargeMachineOrderMethod()">
|
||||
<i class="glyphicon glyphicon-search"></i> <span>
|
||||
<vc:i18n name="查询"></vc:i18n>
|
||||
</span>
|
||||
@ -38,12 +42,14 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group">
|
||||
<input type="text" :placeholder="vc.i18n('请填写充电桩名称','chargeMachineOrder')" v-model="chargeMachineOrderInfo.conditions.machineName" class=" form-control">
|
||||
<input type="text" :placeholder="vc.i18n('请填写充电桩名称','chargeMachineOrder')"
|
||||
v-model="chargeMachineOrderInfo.conditions.machineName" class=" form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group">
|
||||
<input type="text" :placeholder="vc.i18n('请填写插槽','chargeMachineOrder')" v-model="chargeMachineOrderInfo.conditions.portName" class=" form-control">
|
||||
<input type="text" :placeholder="vc.i18n('请填写插槽','chargeMachineOrder')"
|
||||
v-model="chargeMachineOrderInfo.conditions.portName" class=" form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
@ -79,48 +85,48 @@
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='编号' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='名称' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='手机号' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='充电桩' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='插槽' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='充电小时' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='充电量' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='开始时间' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='结束时间' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='扣款账户' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='小时电价' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='扣款金额' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='插座状态' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center"><span>
|
||||
<vc:i18n name='说明' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</span></th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='编号' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='名称' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='手机号' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='充电桩' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='插槽' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='充电小时' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='充电量' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='开始时间' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='结束时间' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='扣款账户' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='小时电价' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='扣款金额' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='插座状态' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center">
|
||||
<vc:i18n name='说明' namespace='chargeMachineOrder'></vc:i18n>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -139,10 +145,12 @@
|
||||
<a href="javascript:void(0)" @click="_viewAccount(chargeMachineOrder)">查看</a>)
|
||||
</td>
|
||||
<td class="text-center">{{chargeMachineOrder.durationPrice}}</td>
|
||||
<td class="text-center">{{chargeMachineOrder.amount}}(<a href="javascript:void(0)" @click="_viewOrderAccts(chargeMachineOrder)">明细</a>)</td>
|
||||
<td class="text-center">{{chargeMachineOrder.amount}}(<a href="javascript:void(0)"
|
||||
@click="_viewOrderAccts(chargeMachineOrder)">明细</a>)</td>
|
||||
<td class="text-center">{{chargeMachineOrder.stateName}}
|
||||
<span v-if="chargeMachineOrder.state == '1001'">
|
||||
(<a href="javascript:void(0)" @click="_showStopCharge(chargeMachineOrder)">停止充电</a>)
|
||||
(<a href="javascript:void(0)"
|
||||
@click="_showStopCharge(chargeMachineOrder)">停止充电</a>)
|
||||
</span>
|
||||
|
||||
</td>
|
||||
|
||||
@ -222,6 +222,12 @@
|
||||
<vc:i18n name="开门记录" namespace="ownerDetail"></vc:i18n>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" v-bind:class="{active:ownerDetailInfo._currentTab == 'ownerDetailChargeMachineOrder'}"
|
||||
v-on:click="changeTab('ownerDetailChargeMachineOrder')">
|
||||
<vc:i18n name="充电订单" namespace="ownerDetail"></vc:i18n>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div v-if="ownerDetailInfo._currentTab == 'ownerDetailRoom'">
|
||||
@ -265,9 +271,9 @@
|
||||
<div v-if="ownerDetailInfo._currentTab == 'ownerDetailAccessControlRecord'">
|
||||
<vc:create path="owner/ownerDetailAccessControlRecord"></vc:create>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div v-if="ownerDetailInfo._currentTab == 'ownerDetailChargeMachineOrder'">
|
||||
<vc:create path="owner/ownerDetailChargeMachineOrder"></vc:create>
|
||||
</div>
|
||||
|
||||
|
||||
<vc:create path="property/editOwner" notifyLoadDataComponentName="ownerDetail" componentTitle="业主"></vc:create>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user