Merge remote-tracking branch 'origin/master'

This commit is contained in:
92895 2020-12-08 18:06:10 +08:00
commit ea9649e9a8
2 changed files with 2 additions and 1 deletions

View File

@ -85,6 +85,7 @@
vc.jumpToPage('/admin.html#/pages/property/owePayFeeOrder?payObjId=' + $that.simplifyRoomFeeInfo.roomId + "&payObjType=3333&roomName=" + $that.simplifyRoomFeeInfo.roomName);
},
_openRoomCreateFeeAddModal: function () {
$that.simplifyRoomFeeInfo.ownerName = $that.simplifyRoomFeeInfo.name;
vc.emit('roomCreateFeeAdd', 'openRoomCreateFeeAddModal', {
isMore: false,
room: $that.simplifyRoomFeeInfo,

View File

@ -18,7 +18,7 @@
v-model="feeDetailInfo.endTime"
class="form-control form-control-sm end_time">
</div>
<div class="col-sm-3">
<div class="col-sm-6">
<button type="button" class="btn btn-primary btn-sm" v-on:click="queryFeeDetailMethod()">
<i class="fa fa-search"></i> 马上查询
</button>