admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-11 14:17:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化答应不清晰问题

Browse Source
This commit is contained in:
java110 2020-11-30 12:37:49 +08:00
parent 70d2fab3af
commit 950704ac8c
6 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/components/property/simplifyCarFee/simplifyCarFee.js
View File

@ -76,7 +76,8 @@
},
_simplifyCarPayFee: function (_fee) {
_fee.roomName = vc.component.simplifyCarFeeInfo.carNum;
vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?' + vc.objToGetParam(_fee));
//vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?' + vc.objToGetParam(_fee));
vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?feeId=' + _fee.feeId);
},
_simplifyCarPayFeeHis: function (_fee) {
vc.jumpToPage('/admin.html#/pages/property/propertyFee?' + vc.objToGetParam(_fee));

3
public/components/property/simplifyRoomFee/simplifyRoomFee.js
View File

@ -127,7 +127,8 @@
_payFee:function(_fee){
_fee.roomName=$that.simplifyRoomFeeInfo.roomName;
_fee.builtUpArea=$that.simplifyRoomFeeInfo.builtUpArea;
vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?'+vc.objToGetParam(_fee));
//vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?'+vc.objToGetParam(_fee));
vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?feeId='+_fee.feeId);
},
_editFee:function(_fee){
vc.emit('editFee', 'openEditFeeModal',_fee);

4
public/components/property/viewMainFee/viewMainFee.js
View File

@ -42,7 +42,7 @@
//加载 业主信息
var _feeId = vc.getParam('feeId')
$that.mainFeeInfo.builtUpArea = vc.getParam('builtUpArea')
//$that.mainFeeInfo.builtUpArea = vc.getParam('builtUpArea')
if (vc.notNull(_feeId)) {
vc.component.loadMainFeeInfo({
@ -166,6 +166,8 @@
$that.mainFeeInfo.payerObjName = _payerObjName;
$that.mainFeeInfo.builtUpArea = _room.builtUpArea;
}, function (errInfo, error) {
console.log('请求失败处理');
}

4
public/pages/property/payFeeOrder/payFeeOrder.html
View File

@ -3,7 +3,7 @@
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
<h5>订单收费</h5>
<h5>订单收费({{payFeeOrderInfo.payerObjName}})</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_goBack()">
@ -145,7 +145,7 @@
<div class="modal-body">
<div class="row" >
<label class="col-sm-3 col-form-label">付费对象：</label>
<label class="col-sm-8 col-form-label">{{payFeeOrderInfo.roomName}}</label>
<label class="col-sm-8 col-form-label">{{payFeeOrderInfo.payerObjName}}</label>
</div>
<div class="row" v-if="payFeeOrderInfo.feeFlag != '2006012' && payFeeOrderInfo.showEndTime != ''">
<label class="col-sm-3 col-form-label" >缴费时间段：</label>

55
public/pages/property/payFeeOrder/payFeeOrder.js
View File

@ -16,7 +16,7 @@
totalFeePrice: 0.00,
receivedAmount: '',
communityId: vc.getCurrentCommunity().communityId,
roomName: '',
payerObjName: '',
squarePrice: '',
remark: '',
builtUpArea: 0.0,
@ -25,7 +25,7 @@
receiptId: '',
showEndTime: '',
selectDiscount: [],
totalDiscountMoney:0.0
totalDiscountMoney: 0.0
}
},
_initMethod: function () {
@ -36,23 +36,22 @@
vc.component.payFeeOrderInfo.endTime = vc.getParam('endTime').replace(/%3A/g, ':');
vc.component.payFeeOrderInfo.feePrice = vc.getParam('feePrice');
$that.payFeeOrderInfo.feeFlag = vc.getParam('feeFlag');
$that.payFeeOrderInfo.roomName = vc.getParam('roomName');
$that.payFeeOrderInfo.payerObjName = vc.getParam('payerObjName');
$that.payFeeOrderInfo.squarePrice = vc.getParam('squarePrice');
$that.payFeeOrderInfo.additionalAmount = vc.getParam('additionalAmount');
$that.payFeeOrderInfo.builtUpArea = vc.getParam('builtUpArea');
//$that.payFeeOrderInfo.builtUpArea = vc.getParam('builtUpArea');
$that.payFeeOrderInfo.squarePrice = vc.getParam('squarePrice');
$that.payFeeOrderInfo.additionalAmount = vc.getParam('additionalAmount');
$that.payFeeOrderInfo.paymentCycles = [];
for (let _index = 1; _index < 7; _index++) {
$that.payFeeOrderInfo.paymentCycles.push(_index * vc.getParam('paymentCycle'))
}
$that.listPayFeeOrderRoom();
};
vc.component.payFeeOrderInfo.totalFeePrice = $that._mathCeil(vc.component.payFeeOrderInfo.feePrice);
vc.component.payFeeOrderInfo.receivedAmount = vc.component.payFeeOrderInfo.totalFeePrice;
},
_initEvent: function () {
vc.on('payFeeOrder', 'changeDiscountPrice', function (_param) {
@ -61,19 +60,24 @@
if (_totalFeePrice < 0) {
return;
}
let _totalDiscountMoney = _param.totalDiscountMoney;
//如果应收小区 优惠金额 则不优惠
if (_totalFeePrice < _totalDiscountMoney) {
return;
}
$that.payFeeOrderInfo.selectDiscount = _param.selectDiscount;
$that.payFeeOrderInfo.totalDiscountMoney = _totalDiscountMoney;
$that.payFeeOrderInfo.receivedAmount = _totalFeePrice - _totalDiscountMoney;
});
vc.on('payFeeOrder', 'initData', function (_param) {
$that.payFeeOrderInfo.paymentCycles = [];
for (let _index = 1; _index < 7; _index++) {
$that.payFeeOrderInfo.paymentCycles.push(_index * _param.paymentCycle);
}
$that.payFeeOrderInfo.totalFeePrice = $that._mathCeil(vc.component.payFeeOrderInfo.feePrice);
$that.payFeeOrderInfo.receivedAmount = $that.payFeeOrderInfo.totalFeePrice;
})
},
methods: {
@ -227,7 +231,32 @@
},
_mathCeil: function (_price) {
return Math.ceil(_price);
}
},
listPayFeeOrderRoom: function () {
if (!vc.notNull($that.payFeeOrderInfo.feeId)) {
return;
}
let param = {
params: {
communityId: vc.getCurrentCommunity().communityId,
feeId: $that.payFeeOrderInfo.feeId,
page: 1,
row: 1
}
};
//发送get请求
vc.http.apiGet('/feeApi/listFeeObj',
param,
function (json, res) {
let listRoomData = JSON.parse(json);
vc.copyObject(listRoomData.data, $that.payFeeOrderInfo);
vc.emit('payFeeOrder', 'initData',listRoomData.data);
}, function (errInfo, error) {
console.log('请求失败处理');
}
);
},
}
});

2
public/print.html
View File

@ -47,7 +47,7 @@
<body class="vc-body">
<vc:create path="frame/bodyTop"></vc:create>
<div class="vc">
<div id="vc-page" style="margin-left: 0;" class="gray-bg dashbard-1 vc-page-height">
<div id="vc-page" style="margin-left: 0;background-color: #FFF;" class="gray-bg dashbard-1 vc-page-height">
<!-- -->
<div id="component" class="vc-wrapper vc-content animated fadeInRight"
vc-path="/common/chooseEnterCommunity">