admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/xinghong-dev'

Browse Source
This commit is contained in:
java110 2022-06-28 16:07:28 +08:00
commit 85a934ffbd
2 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@
</option>
<option value="-102">{{vc.i18n('自定义周期','payFeeOrder')}}</option>
<option value="-101">{{vc.i18n('自定义金额','payFeeOrder')}}</option>
<option value="-103">{{vc.i18n('自定义结束时间','payFeeOrder')}}</option>
</select>
</div>
</div>
@ -62,6 +63,12 @@
<input type="text" :placeholder="vc.i18n('请输入实际周期','payFeeOrder')" v-model="payFeeOrderInfo.cycles" v-on:change="changeCycle(payFeeOrderInfo.cycles)" class="form-control">
</div>
</div>
<div class="form-group row" v-show="payFeeOrderInfo.tempCycles == '-103'">
<label class="col-sm-2 col-form-label"><span><span><vc:i18n name="缴费结束时间" namespace="payFeeOrder"></vc:i18n></span></span></label>
<div class="col-sm-6">
<input type="text" :placeholder="vc.i18n('请选择缴费结束时间','payFeeOrder')" v-model="payFeeOrderInfo.custEndTime" class=" form-control cust-endTime">
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label" style="padding-right:0px;"><span><span><vc:i18n name="备注" namespace="payFeeOrder"></vc:i18n></span></span></label>
<div class="col-sm-6" style="padding-left:5px;">
@ -193,6 +200,11 @@
<label class="col-sm-8 col-form-label">{{vc.dateFormat(payFeeOrderInfo.endTime)}} 至
{{vc.dateSubOneDay(payFeeOrderInfo.endTime,vc.dateFormat(payFeeOrderInfo.showEndTime),payFeeOrderInfo.feeFlag)}}</label>
</div>
<div class="row" v-else-if="payFeeOrderInfo.feeFlag != '2006012' && payFeeOrderInfo.custEndTime != ''">
<label class="col-sm-3 col-form-label"><span><span><vc:i18n name="缴费时间段" namespace="payFeeOrder"></vc:i18n></span></span>：</label>
<label class="col-sm-8 col-form-label">{{vc.dateFormat(payFeeOrderInfo.endTime)}} 至
{{payFeeOrderInfo.custEndTime}}</label>
</div>
<div class="row">
<label class="col-sm-3 col-form-label"><span><span><vc:i18n name="应收金额" namespace="payFeeOrder"></vc:i18n></span></span>：</label>
<label class="col-sm-8 col-form-label">{{payFeeOrderInfo.totalFeePrice}}</label>

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

@ -49,7 +49,8 @@
authCode: '',
orderId: '',
offlinePayFeeSwitch: '1',
flag: ''
flag: '',
custEndTime: ''
}
},
watch: {
@ -62,6 +63,7 @@
}
},
_initMethod: function () {
vc.component._initCustEndDate();
if (vc.notNull(vc.getParam("feeId"))) {
vc.component.payFeeOrderInfo.feeId = vc.getParam('feeId');
vc.component.payFeeOrderInfo.feeName = vc.getParam('feeName');
@ -152,6 +154,37 @@
})
},
methods: {
_initCustEndDate: function () {
$(".cust-endTime").datetimepicker({
minView: "month",
language: 'zh-CN',
fontAwesome: 'fa',
format: 'yyyy-mm-dd',
initTime: true,
initialDate: new Date(),
autoClose: 1,
todayBtn: true
});
$('.cust-endTime').datetimepicker()
.on('changeDate', function (ev) {
var value = $(".cust-endTime").val();
vc.component.payFeeOrderInfo.custEndTime = value;
let start = Date.parse(new Date($that.payFeeOrderInfo.endTime))
let end = Date.parse(new Date($that.payFeeOrderInfo.custEndTime))
if (start - end >= 0) {
vc.toast("结束时间必须大于起始时间")
$that.payFeeOrderInfo.custEndTime = '';
return;
}
$that.getComputedAmount(0);
});
document.getElementsByClassName(" form-control cust-endTime")[0].addEventListener('click', myfunc)
function myfunc(e) {
e.currentTarget.blur();
}
},
_useUserAccountChange: function (e) {
if (e.target.checked) {
// 查询用户账户
@ -199,9 +232,11 @@
* 点击 “提交缴费”
*/
_openPayFee: function (_type) {
// 周期不为空且不是自定义周期
if ($that.payFeeOrderInfo.tempCycles != "" && $that.payFeeOrderInfo.tempCycles != '-102') {
$that.payFeeOrderInfo.cycles = $that.payFeeOrderInfo.tempCycles;
}
// 一次性费用
if ($that.payFeeOrderInfo.feeFlag == '2006012') {
$that.payFeeOrderInfo.cycles = '1';
$that.payFeeOrderInfo.tempCycles = '1';
@ -215,6 +250,7 @@
vc.toast(vc.validate.errInfo);
return;
}
// 缴费周期为正整数时，显示缴费结束时间
if (!(/(^[1-9]\d*$)/.test($that.payFeeOrderInfo.cycles))) {
$that.payFeeOrderInfo.showEndTime = '';
} else {
@ -387,23 +423,23 @@
emulateJSON: true
},
function (json, res) {
let _json = JSON.parse(json)
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
if (res.status == 200) {
let _feeInfo = {
totalAmount: $that.payFeeOrderInfo.receivedAmount,
fees: _printFees
}
let _data = JSON.parse(json).data;
// let _feeInfo = {
// totalAmount: $that.payFeeOrderInfo.receivedAmount,
// fees: _printFees
// }
// $that.payFeeOrderInfo.receiptId = _data.receiptId;
//vc.saveData('_feeInfo', _feeInfo);
//查询收据
let _data = _json.data;
setTimeout(function() {
$that._queryPayFeeReceiptId(_data);
}, 1000);
vc.toast("缴费成功");
location.reload();
return;
}
vc.toast(_json.msg);
},
function (errInfo, error) {
console.log('请求失败处理');
@ -448,6 +484,7 @@
* @param {*} _cycles
*/
_changeMonth: function (_cycles) {
vc.component.payFeeOrderInfo.custEndTime = '';
if ('-102' == _cycles) {
vc.component.payFeeOrderInfo.totalFeePrice = 0.00;
vc.component.payFeeOrderInfo.receivedAmount = 0.00;
@ -458,6 +495,9 @@
} else if ('-101' == _cycles) {
$that.payFeeOrderInfo.cycles = "101";
return;
} else if ('-103' == _cycles) {
$that.payFeeOrderInfo.cycles = "103";
return;
}
let _newCycles = _cycles;
if (_cycles == '') {
@ -591,6 +631,9 @@
cycle: _cycles
}
};
if(_cycles == 0){
param.params.custEndTime = $that.payFeeOrderInfo.custEndTime
}
//发送get请求
vc.http.apiGet('/feeApi/listFeeObj',
param,