diff --git a/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html index 6a9ec894b..9996a828c 100644 --- a/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html +++ b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html @@ -61,7 +61,7 @@ - + {{ownerInvoice.ownerName}} {{ownerInvoice.invoiceType == '1001'?'个人':'公司'}} diff --git a/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js index cb434214d..ab5ede5de 100644 --- a/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js +++ b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js @@ -40,7 +40,7 @@ let _json = JSON.parse(json); $that.searchOwnerInvoiceInfo.ownerInvoices = _json.data; vc.emit('searchOwnerInvoice', 'paginationPlus', 'init', { - total: _ownerInfo.records, + total: _json.records, currentPage: _page }); }, diff --git a/public/components/property/simplifyHisFee/simplifyHisFee.js b/public/components/property/simplifyHisFee/simplifyHisFee.js index 747bfc55a..aec93a150 100644 --- a/public/components/property/simplifyHisFee/simplifyHisFee.js +++ b/public/components/property/simplifyHisFee/simplifyHisFee.js @@ -33,7 +33,7 @@ }); vc.on('simplifyHisFee', 'paginationPlus', 'page_event', function(_currentPage) { - vc.component._listSimplifyFeeDetails(_currentPage, DEFAULT_ROWS); + $that._listSimplifyFeeDetails(_currentPage, DEFAULT_ROWS); }); }, methods: { @@ -52,12 +52,12 @@ param, function(json) { let _feeConfigInfo = JSON.parse(json); - vc.component.simplifyHisFeeInfo.total = _feeConfigInfo.total; - vc.component.simplifyHisFeeInfo.records = _feeConfigInfo.records; - vc.component.simplifyHisFeeInfo.feeDetails = _feeConfigInfo.feeDetails; + $that.simplifyHisFeeInfo.total = _feeConfigInfo.total; + $that.simplifyHisFeeInfo.records = _feeConfigInfo.records; + $that.simplifyHisFeeInfo.feeDetails = _feeConfigInfo.feeDetails; vc.emit('simplifyHisFee', 'paginationPlus', 'init', { - total: vc.component.simplifyHisFeeInfo.records, - dataCount: vc.component.simplifyHisFeeInfo.total, + total: $that.simplifyHisFeeInfo.records, + dataCount: $that.simplifyHisFeeInfo.total, currentPage: _page }); }, diff --git a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html index c050d97c5..e84c222a7 100644 --- a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html +++ b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html @@ -83,6 +83,6 @@ - + \ No newline at end of file diff --git a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js index 8a8d3a593..d77053164 100644 --- a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js +++ b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js @@ -17,8 +17,9 @@ }, _initEvent: function () { - vc.on('addOwnerInvoice', 'chooseOwnerInvoice', function (_owner) { - vc.copyObject(_owner,$that.addOwnerInvoiceInfo); + vc.on('addOwnerInvoice', 'chooseOwner', function (_owner) { + $that.addOwnerInvoiceInfo.ownerName = _owner.name; + $that.addOwnerInvoiceInfo.ownerId = _owner.ownerId; $that._loadFeeDetails(); }); }, @@ -115,16 +116,21 @@ if (_json.code == 0) { //关闭model vc.goBack(); + return; } vc.toast(_json.msg); + }, function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); }, _openChooseOwner: function () { - vc.emit('searchOwnerInvoice', 'openSearchOwnerInvoiceModel', {}); + vc.emit('searchOwner', 'openSearchOwnerModel', {}); }, } diff --git a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html index 7a0834008..5d8e03178 100644 --- a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html +++ b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.html @@ -20,7 +20,7 @@
-
@@ -32,7 +32,7 @@
-
@@ -55,22 +55,31 @@ :placeholder="vc.i18n('必填，请选择地址、电话','ownerApplyInvoice')" class="form-control"> +
+ +
+ +
+
- + -
+
- +
@@ -81,28 +90,74 @@ data-page-size="10"> - - + + + + + + - + - + + + + + + + + + + + + + + + + - + - {{fee.feeName}} + - {{fee.startTime}} + {{feeDetail.feeName}} - {{fee.endTime?fee.endTime:'-'}} + {{feeDetail.payerObjName}} + + + {{feeDetail.receivableAmount}}/{{feeDetail.receivedAmount}} + + + {{feeDetail.primeRateName}} + + + {{vc.dateFormat(feeDetail.startTime)}}~
+ + {{vc.dateFormat(feeDetail.endTime)}} + + + {{vc.dateSubOneDay(vc.dateFormat(feeDetail.endTime),vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}} + + + + {{feeDetail.createTime}} + + + {{feeDetail.cashierName || '-'}} + + + {{feeDetail.stateName}} + + + {{feeDetail.remark}} diff --git a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js index 2f787116c..e68452fed 100644 --- a/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js +++ b/public/pages/fee/ownerApplyInvoice/ownerApplyInvoice.js @@ -4,33 +4,88 @@ ownerApplyInvoiceInfo: { ownerId: '', ownerName: '', - invoiceType:'', - invoiceName:'', - invoiceAddress:'', - + invoiceType: '', + invoiceName: '', + invoiceAddress: '', + invoiceNum: '', + detailIds: [], feeDetails: [] } }, + watch: { + 'ownerApplyInvoiceInfo.detailIds': { + deep: true, + handler: function () { + let checkObj = document.querySelectorAll('.all-check'); // 获取所有checkbox项 + if ($that.ownerApplyInvoiceInfo.detailIds.length < $that.ownerApplyInvoiceInfo.feeDetails.length) { + checkObj[0].checked = false; + } else { + checkObj[0].checked = true; + } + } + } + }, _initMethod: function () { }, _initEvent: function () { - vc.on('ownerApplyInvoice', 'chooseOwner', function (_owner) { - $that.ownerApplyInvoiceInfo.ownerName = _owner.name; - $that.ownerApplyInvoiceInfo.ownerId = _owner.ownerId; + vc.on('ownerApplyInvoice', 'chooseOwnerInvoice', function (_owner) { + vc.copyObject(_owner, $that.ownerApplyInvoiceInfo); $that._loadFeeDetails(); }); }, methods: { - + _openChooseOwner: function () { - vc.emit('searchOwner', 'openSearchOwnerModel', {}); + vc.emit('searchOwnerInvoice', 'openSearchOwnerInvoiceModel', {}); }, - _loadFeeDetails:function(){ + _loadFeeDetails: function () { + let param = { + params: { + page: 1, + row: 50, + communityId: vc.getCurrentCommunity().communityId, + ownerId: $that.ownerApplyInvoiceInfo.ownerId, + } + }; - } + $that.ownerApplyInvoiceInfo.detailIds = []; + + //发送get请求 + vc.http.apiGet('/fee.queryFeeDetail', + param, + function (json) { + let _feeConfigInfo = JSON.parse(json); + $that.ownerApplyInvoiceInfo.feeDetails = _feeConfigInfo.feeDetails; + + if (_feeConfigInfo.feeDetails && _feeConfigInfo.feeDetails.length > 0) { + setTimeout(function () { + _feeConfigInfo.feeDetails.forEach(_detail => { + $that.ownerApplyInvoiceInfo.detailIds.push(_detail.detailId); + }); + }, 1000) + } + + }, + function () { + console.log('请求失败处理'); + } + ); + }, + checkAll: function (e) { + let checkObj = document.querySelectorAll('.checkItem'); // 获取所有checkbox项 + if (e.target.checked) { // 判定全选checkbox的勾选状态 + for (let i = 0; i < checkObj.length; i++) { + if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中 + $that.ownerApplyInvoiceInfo.detailIds.push(checkObj[i].value); + } + } + } else { // 如果是去掉全选则清空checkbox选项绑定数组 + $that.ownerApplyInvoiceInfo.detailIds = []; + } + }, } }); })(window.vc); \ No newline at end of file