diff --git a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html index 5ca5715d8..94ec64b12 100644 --- a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html +++ b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.html @@ -23,7 +23,7 @@ - + {{item.feeName}} diff --git a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js index 804817e70..802badf11 100644 --- a/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js +++ b/public/components/property/exportCarFeeImportExcel/exportCarFeeImportExcel.js @@ -122,7 +122,8 @@ params: { page: 1, row: 100, - communityId: vc.getCurrentCommunity().communityId + communityId: vc.getCurrentCommunity().communityId, + isDefault:'F' } }; diff --git a/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js b/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js index 6dba6c2bc..6532331ec 100644 --- a/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js +++ b/public/components/property/exportFeeImportExcel/exportFeeImportExcel.js @@ -98,7 +98,8 @@ params: { page: 1, row: 150, - communityId: vc.getCurrentCommunity().communityId + communityId: vc.getCurrentCommunity().communityId, + } }; @@ -122,7 +123,8 @@ params: { page: 1, row: 100, - communityId: vc.getCurrentCommunity().communityId + communityId: vc.getCurrentCommunity().communityId, + isDefault:'F' } }; diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html index 1877f41d9..ad4673588 100755 --- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html +++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html @@ -65,12 +65,12 @@ - + - + + 批量审核 + @@ -78,48 +78,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + {{payFee.payerObjName}} {{payFee.feeName}} {{payFee.cycles}} @@ -145,7 +153,7 @@ - + diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js index b119437d8..792933a8b 100755 --- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js +++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js @@ -8,6 +8,7 @@ data: { payFeeAuditManageInfo: { payFees: [], + selectFeeDetailIds:[], payObjTypes: [], total: 0, records: 1, @@ -25,6 +26,18 @@ curPayFee: {} } }, + watch: { // 监视双向绑定的数据数组 + payFeeAuditManageInfo: { + handler() { // 数据数组有变化将触发此函数 + if ($that.payFeeAuditManageInfo.selectFeeDetailIds.length == $that.payFeeAuditManageInfo.payFees.length) { + document.querySelector('#quan').checked = true; + } else { + document.querySelector('#quan').checked = false; + } + }, + deep: true // 深度监视 + } + }, _initMethod: function() { vc.component._listPayFees(DEFAULT_PAGE, DEFAULT_ROWS); //vc.component._listFeeType(); @@ -50,6 +63,7 @@ var param = { params: vc.component.payFeeAuditManageInfo.conditions }; + $that.payFeeAuditManageInfo.selectFeeDetailIds = []; //发送get请求 vc.http.apiGet('/payFeeAudit/queryPayFeeAudit', param, @@ -111,17 +125,31 @@ }, _openAuditFeeModal: function(_payFee) { // 打开 审核框 $that.payFeeAuditManageInfo.curPayFee = _payFee; + $that.payFeeAuditManageInfo.selectFeeDetailIds = []; + vc.emit('audit', 'openAuditModal', {}); + }, + _batchAuditFees:function(){ + if($that.payFeeAuditManageInfo.selectFeeDetailIds.length<1){ + vc.toast('请选择费用'); + return; + } + $that.payFeeAuditManageInfo.curPayFee = {}; vc.emit('audit', 'openAuditModal', {}); }, _auditFee: function(_param) { //2020 审核通过 3030 未审核 let _state = _param.state == '1100' ? '2020' : '3030'; + let _feeDetailId = ""; + if($that.payFeeAuditManageInfo.selectFeeDetailIds.length>0){ + _feeDetailId = $that.payFeeAuditManageInfo.selectFeeDetailIds.join(','); + }else{ + _feeDetailId = $that.payFeeAuditManageInfo.curPayFee.detailId; + } let _data = { state: _state, message: _param.remark, - feeDetailId: $that.payFeeAuditManageInfo.curPayFee.detailId, + feeDetailId: _feeDetailId, communityId: vc.getCurrentCommunity().communityId, - feeId: $that.payFeeAuditManageInfo.curPayFee.feeId }; vc.http.apiPost( '/payFeeAudit/savePayFeeAudit', @@ -134,6 +162,8 @@ if (_json.code == 0) { //关闭model vc.component._listPayFees(DEFAULT_PAGE, DEFAULT_ROWS); + $that.payFeeAuditManageInfo.selectFeeDetailIds = []; + $that.payFeeAuditManageInfo.curPayFee = {}; vc.toast("保存成功"); return; } else { @@ -158,6 +188,18 @@ feeId: _feeDetail.feeId } vc.emit('returnPayFee', 'openReturnPayFeeModel', _feeDetail); + }, + checkAll: function(e) { + let checkObj = document.querySelectorAll('.checkItem'); // 获取所有checkbox项 + if (e.target.checked) { // 判定全选checkbox的勾选状态 + for (var i = 0; i < checkObj.length; i++) { + if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中 + $that.payFeeAuditManageInfo.selectFeeDetailIds.push(checkObj[i].value); + } + } + } else { // 如果是去掉全选则清空checkbox选项绑定数组 + $that.payFeeAuditManageInfo.selectFeeDetailIds = []; + } } } });