diff --git a/public/pages/property/feeReceipt/feeReceipt.js b/public/pages/property/feeReceipt/feeReceipt.js index c137ef992..bfe1c546a 100644 --- a/public/pages/property/feeReceipt/feeReceipt.js +++ b/public/pages/property/feeReceipt/feeReceipt.js @@ -1,6 +1,6 @@ /** - 入驻小区 - **/ + 入驻小区 +**/ (function (vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; @@ -17,19 +17,31 @@ objType: '', storeName: '', objId: '', - month: '', - qstartTime: '', - qendTime: '', - type: '', - roomId: '', + month:'', + qstartTime:'', + qendTime:'', + type:'', + roomId:'', communityId: vc.getCurrentCommunity().communityId, - receiptId: '' + receiptId:'' } } }, _initMethod: function () { + //切换 至费用页面 + vc.on('feeReceipt', 'switch', function (_param) { + if (_param.ownerId == '') { + return; + } + console.log(_param); + vc.component.feeReceiptManageInfo.conditions.roomId=_param.roomName; + vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); + + }); vc.component._initDate(); + vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); + // vc.initDateMonth('startTime', function (_startTime) { // $that.feeReceiptManageInfo.conditions.month = _startTime; // }); @@ -42,8 +54,10 @@ // vc.initDateMonth('startTime', function (_startTime) { // $that.reportFeeSummaryInfo.conditions.startTime = _startTime; // }); + }, _initEvent: function () { + vc.on('feeReceiptManage', 'listFeeReceipt', function (_param) { vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); }); @@ -52,7 +66,7 @@ }); }, methods: { - _initDate: function () { + _initDate:function(){ $(".startTime").datetimepicker({ language: 'zh-CN', fontAwesome: 'fa', @@ -76,22 +90,25 @@ todayBtn: true }); $('.startTime').datetimepicker() - .on('changeDate', function (ev) { - var value = $(".startTime").val(); - vc.component.feeReceiptManageInfo.conditions.qstartTime = value; - }); + .on('changeDate', function (ev) { + var value = $(".startTime").val(); + vc.component.feeReceiptManageInfo.conditions.qstartTime = value ; + }); $('.endTime').datetimepicker() - .on('changeDate', function (ev) { - var value = $(".endTime").val(); - vc.component.feeReceiptManageInfo.conditions.qendTime = value; - }); + .on('changeDate', function (ev) { + var value = $(".endTime").val(); + vc.component.feeReceiptManageInfo.conditions.qendTime = value ; + }); }, _listFeeReceipts: function (_page, _rows) { + vc.component._initDate(); vc.component.feeReceiptManageInfo.conditions.page = _page; vc.component.feeReceiptManageInfo.conditions.row = _rows; + var param = { params: vc.component.feeReceiptManageInfo.conditions }; + // console.log(param); //发送get请求 vc.http.apiGet('/feeReceipt/queryFeeReceipt', param, @@ -114,32 +131,40 @@ } ); }, + _queryFeeReceiptMethod: function () { vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); }, + _printFeeReceipt: function (_receipt) { window.open("/print.html#/pages/property/printPayFee?receiptId=" + _receipt.receiptId); }, _printFeeReceipts: function (_conditions) { - if (_conditions.roomId == null || _conditions.roomId == "") { - vc.toast("请填写收费对象", 1000); + // console.log(_conditions) + if(_conditions.roomId==null|| _conditions.roomId ==""){ + vc.toast("请填写收费对象",1000); return; } - if (_conditions.type == null || _conditions.type == "") { - vc.toast("请选择打印类型", 1000); + if(_conditions.type==null|| _conditions.type ==""){ + vc.toast("请选择打印类型",1000); return; } - if (_conditions.qstartTime == null || _conditions.qstartTime == "") { - vc.toast("请选择开始时间", 1000); + // if(_conditions.month==null|| _conditions.month ==""){ + // vc.toast("请选择费用月份",1000); + // return; + // } + if(_conditions.qstartTime==null|| _conditions.qstartTime ==""){ + vc.toast("请选择开始时间",1000); return; } - if (_conditions.qendTime == null || _conditions.qendTime == "") { - vc.toast("请选择结束时间", 1000); + if(_conditions.qendTime==null|| _conditions.qendTime ==""){ + vc.toast("请选择结束时间",1000); return; } - window.open("/print.html#/pages/property/printPayFees?roomName=" + _conditions.roomId + - "&type=" + _conditions.type + "&qstartTime=" + _conditions.qstartTime + "&qendTime=" + _conditions.qendTime + - "&storeName=" + _conditions.storeName); + // window.open("/print.html#/pages/property/printPayFees?roomName=" + _conditions.roomId+ + // "&type="+_conditions.type+"&month="+_conditions.month); + window.open("/print.html#/pages/property/printPayFees?roomName=" + _conditions.roomId+ + "&type="+_conditions.type+"&qstartTime="+_conditions.qstartTime+"&qendTime="+_conditions.qendTime); }, _moreCondition: function () { if (vc.component.feeReceiptManageInfo.moreCondition) { @@ -148,6 +173,8 @@ vc.component.feeReceiptManageInfo.moreCondition = true; } } + + } }); })(window.vc); diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html index 0ee8f6952..b7301bb74 100644 --- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html +++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html @@ -161,8 +161,8 @@ v-on:click="changeTab('simplifyOwnerTransactionCar')">道闸同步
  • - 补打收据 + 补打收据
    • @@ -191,11 +191,9 @@
    -
    - +
    +
    - -
    diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js index e5e26db7a..a92466a00 100644 --- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js +++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js @@ -150,8 +150,14 @@ vc.emit(_tab, 'switch', { ownerId: $that.simplifyAcceptanceInfo.ownerId, - roomId: $that.simplifyAcceptanceInfo.roomId + roomId: $that.simplifyAcceptanceInfo.roomId, + roomName: $that.simplifyAcceptanceInfo.floorNum+"栋"+$that.simplifyAcceptanceInfo.unitNum+"单元"+$that.simplifyAcceptanceInfo.roomNum+"室" }) + if(_tab=='feeReceipt'){ + this.timer = setTimeout(()=>{ //设置延迟执行 + vc.component._initDatetimepicker(); + },500); + } }, errorLoadImg: function () { vc.component.simplifyAcceptanceInfo.ownerPhoto = "/img/noPhoto.jpg"; @@ -183,6 +189,40 @@ roomName: '', sex: 0 } + }, + _initDatetimepicker:function(){ + $(".startTime").datetimepicker({ + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd', + startView: 2, + minView: 2, + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $(".endTime").datetimepicker({ + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd', + startView: 2, + minView: 2, + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $('.startTime').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".startTime").val(); + vc.component.feeReceiptManageInfo.conditions.qstartTime = value ; + }); + $('.endTime').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".endTime").val(); + vc.component.feeReceiptManageInfo.conditions.qendTime = value ; + }); } }