diff --git a/public/pages/property/feeReceipt/feeReceipt.html b/public/pages/property/feeReceipt/feeReceipt.html new file mode 100644 index 000000000..6a6ef71b3 --- /dev/null +++ b/public/pages/property/feeReceipt/feeReceipt.html @@ -0,0 +1,98 @@ +
+
+
+
+
+
查询条件
+
+ +
+
+
+
+
+ + +
+
+
+ +
+
+ +
+ +
+
+ +
+
+ + +
+
+
+
+
+
+
+
+
收据信息
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
费用类型收费对象总金额缴费时间收据ID操作
{{feeReceipt.objType == '3333'? '房屋费':'车位费'}}{{feeReceipt.objName}}{{feeReceipt.amount}}{{feeReceipt.createTime}}{{feeReceipt.receiptId}} +
+ +
+
+
    +
    + + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/public/pages/property/feeReceipt/feeReceipt.js b/public/pages/property/feeReceipt/feeReceipt.js new file mode 100644 index 000000000..c9bf21610 --- /dev/null +++ b/public/pages/property/feeReceipt/feeReceipt.js @@ -0,0 +1,80 @@ +/** + 入驻小区 +**/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + feeReceiptManageInfo: { + rooms: [], + feeReceipts: [], + total: 0, + records: 1, + moreCondition: false, + feeReceiptId: '', + conditions: { + objType: '', + objId: '', + communityId: vc.getCurrentCommunity().communityId, + } + } + }, + _initMethod: function () { + vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function () { + + vc.on('feeReceiptManage', 'listFeeReceipt', function (_param) { + vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listFeeReceipts(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listFeeReceipts: function (_page, _rows) { + + vc.component.feeReceiptManageInfo.conditions.page = _page; + vc.component.feeReceiptManageInfo.conditions.row = _rows; + + var param = { + params: vc.component.feeReceiptManageInfo.conditions + }; + + //发送get请求 + vc.http.apiGet('/feeReceipt/queryFeeReceipt', + param, + function (json, res) { + var _feeReceiptManageInfo = JSON.parse(json); + vc.component.feeReceiptManageInfo.total = _feeReceiptManageInfo.total; + vc.component.feeReceiptManageInfo.records = _feeReceiptManageInfo.records; + vc.component.feeReceiptManageInfo.feeReceipts = _feeReceiptManageInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.feeReceiptManageInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + + _queryFeeReceiptMethod: function () { + vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _printFeeReceipt: function (_receipt) { + window.open("/print.html#/pages/property/printPayFee?receiptId=" + _receipt.receiptId); + }, + _moreCondition: function () { + if (vc.component.feeReceiptManageInfo.moreCondition) { + vc.component.feeReceiptManageInfo.moreCondition = false; + } else { + vc.component.feeReceiptManageInfo.moreCondition = true; + } + } + + + } + }); +})(window.vc); diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js index 8fb2519bf..957dfba6f 100644 --- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js +++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js @@ -11,7 +11,8 @@ communityId: vc.getCurrentCommunity().communityId, payObjId: '', payObjType: '', - roomName: '' + roomName: '', + receiptId:'' } }, watch: { @@ -116,8 +117,11 @@ totalAmount: $that.owePayFeeOrderInfo.feePrices, fees: _printFees } + let _data = JSON.parse(json).data; - vc.saveData('_feeInfo', _feeInfo); + $that.owePayFeeOrderInfo.receiptId = _data.receiptId; + + //vc.saveData('_feeInfo', _feeInfo); //关闭model $("#payFeeResult").modal({ backdrop: "static",//点击空白处不关闭对话框 @@ -140,7 +144,7 @@ }, _printAndBack: function () { $('#payFeeResult').modal("hide"); - window.open("/print.html#/pages/property/printPayFee?roomName=" + $that.owePayFeeOrderInfo.roomName) + window.open("/print.html#/pages/property/printPayFee?receiptId=" + $that.owePayFeeOrderInfo.receiptId) }, _dealSelectFee: function () { let totalFee = 0.00; diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js index ac3023c03..9a6de9b1e 100644 --- a/public/pages/property/payFeeOrder/payFeeOrder.js +++ b/public/pages/property/payFeeOrder/payFeeOrder.js @@ -22,7 +22,8 @@ remark: '', builtUpArea: 0.0, squarePrice: 0.0, - additionalAmount: 0.0 + additionalAmount: 0.0, + receiptId:'' } }, _initMethod: function () { @@ -130,7 +131,11 @@ fees: _printFees } - vc.saveData('_feeInfo', _feeInfo); + let _data = JSON.parse(json).data; + + $that.payFeeOrderInfo.receiptId = _data.receiptId; + + //vc.saveData('_feeInfo', _feeInfo); //关闭model $("#payFeeResult").modal({ backdrop: "static",//点击空白处不关闭对话框 @@ -175,7 +180,7 @@ }, _printAndBack: function () { //$('#payFeeResult').modal("hide"); - window.open("/print.html#/pages/property/printPayFee?roomName=" + $that.payFeeOrderInfo.roomName) + window.open("/print.html#/pages/property/printPayFee?receiptId=" + $that.payFeeOrderInfo.receiptId) }, _mathCeil:function(_price){ return Math.ceil(_price); diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html index e2e3bcdc1..30e79da19 100644 --- a/public/pages/property/printPayFee/printPayFee.html +++ b/public/pages/property/printPayFee/printPayFee.html @@ -20,8 +20,11 @@ 编号 收费项目 + 收费范围 + 周期 单价 固定费 + 面积/用量 单位 金额 备注 @@ -31,18 +34,23 @@ {{index +1}} {{item.feeName}} + {{vc.dateFormat(item.startTime)}}至{{vc.dateFormat(item.endTime)}} + {{item.cycle}} {{item.squarePrice}} {{item.additionalAmount}} + {{item.area}} 元 {{item.amount}} {{item.remark}} - 总费用 - {{printPayFeeInfo.feePrices}}元 + 大写人民币（元） + {{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}} + + {{printPayFeeInfo.amount}} - +

    尊敬的业主：

    diff --git a/public/pages/property/printPayFee/printPayFee.js b/public/pages/property/printPayFee/printPayFee.js index 91b24b1a7..93397302d 100644 --- a/public/pages/property/printPayFee/printPayFee.js +++ b/public/pages/property/printPayFee/printPayFee.js @@ -4,8 +4,9 @@ data: { printPayFeeInfo: { communityName: '', + receiptId:'', roomName: '', - feePrices: 0.00, + amount: 0.00, fees: [], feeTime: '', wechatName:'' @@ -15,14 +16,12 @@ _initMethod: function () { //vc.component._initPrintPurchaseApplyDateInfo(); - $that.printPayFeeInfo.roomName = vc.getParam('roomName'); + $that.printPayFeeInfo.receiptId = vc.getParam('receiptId'); $that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date()); - let _feeInfo = vc.getData('_feeInfo'); $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name; - $that.printPayFeeInfo.feePrices = _feeInfo.totalAmount; - $that.printPayFeeInfo.fees = _feeInfo.fees; + $that._loadReceipt(); $that._loadWechat(); }, @@ -33,6 +32,57 @@ methods: { _initPayFee: function () { + }, + _loadReceipt:function(){ + + var param = { + params: { + page:1, + row:1, + receiptId:$that.printPayFeeInfo.receiptId, + communityId:vc.getCurrentCommunity().communityId + } + }; + + //发送get请求 + vc.http.apiGet('/feeReceipt/queryFeeReceipt', + param, + function (json, res) { + var _feeReceiptManageInfo = JSON.parse(json); + let _feeReceipt = _feeReceiptManageInfo.data[0]; + + $that.printPayFeeInfo.amount = _feeReceipt.amount; + $that.printPayFeeInfo.roomName = _feeReceipt.objName; + + $that._loadReceiptDetail(); + + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _loadReceiptDetail:function(){ + + var param = { + params: { + page:1, + row:100, + receiptId:$that.printPayFeeInfo.receiptId, + communityId:vc.getCurrentCommunity().communityId + } + }; + + //发送get请求 + vc.http.apiGet('/feeReceipt/queryFeeReceiptDetail', + param, + function (json, res) { + var _feeReceiptManageInfo = JSON.parse(json); + let _feeReceiptDetails = _feeReceiptManageInfo.data; + $that.printPayFeeInfo.fees = _feeReceiptDetails; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); }, _loadWechat: function () { var param = {