From bc9b18c49ee50fe31e460aba8e881981f3ac56e2 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Thu, 7 Apr 2022 18:09:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/frame/deleteOrg/deleteOrg.js | 52 +++++++-------- .../batchPayFeeOrder/batchPayFeeOrder.html | 25 +++++++ .../batchPayFeeOrder/batchPayFeeOrder.js | 66 ++++++++++++++++++- 3 files changed, 115 insertions(+), 28 deletions(-) diff --git a/public/components/frame/deleteOrg/deleteOrg.js b/public/components/frame/deleteOrg/deleteOrg.js index 1899bda06..f9f556a70 100755 --- a/public/components/frame/deleteOrg/deleteOrg.js +++ b/public/components/frame/deleteOrg/deleteOrg.js @@ -1,52 +1,50 @@ -(function(vc,vm){ +(function(vc, vm) { vc.extends({ - data:{ - deleteOrgInfo:{ + data: { + deleteOrgInfo: { } }, - _initMethod:function(){ + _initMethod: function() { - }, - _initEvent:function(){ - vc.on('deleteOrg','openDeleteOrgModal',function(_params){ + }, + _initEvent: function() { + vc.on('deleteOrg', 'openDeleteOrgModal', function(_params) { vc.component.deleteOrgInfo = _params; $('#deleteOrgModel').modal('show'); }); }, - methods:{ - deleteOrg:function(){ - //vc.component.deleteOrgInfo.communityId=vc.getCurrentCommunity().communityId; - vc.http.post( - 'deleteOrg', - 'delete', - JSON.stringify(vc.component.deleteOrgInfo), - { - emulateJSON:true - }, - function(json,res){ + methods: { + deleteOrg: function() { + vc.http.apiPost( + '/org.deleteOrg', + JSON.stringify(vc.component.deleteOrgInfo), { + emulateJSON: true + }, + function(json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); - if(res.status == 200){ + let _json = JSON.parse(json); + if (_json.code == 0) { //关闭model $('#deleteOrgModel').modal('hide'); - vc.emit('orgManage','listOrg',{}); - return ; + vc.emit('orgManage', 'listOrg', {}); + return; } - vc.toast(json); - }, - function(errInfo,error){ + vc.toast(_json.msg); + }, + function(errInfo, error) { console.log('请求失败处理'); vc.toast(json); - }); + }); }, - closeDeleteOrgModel:function(){ + closeDeleteOrgModel: function() { $('#deleteOrgModel').modal('hide'); } } }); -})(window.vc,window.vc.component); +})(window.vc, window.vc.component); \ No newline at end of file diff --git a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html index 5711e281a..a3e9b626d 100644 --- a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html +++ b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html @@ -1,4 +1,29 @@
+
+
+
+
+
查询条件
+
+
+
+
+
+ 收费对象 +
+
+
+
+ + {{item}} + +
+
+
+
+
+
+
diff --git a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js index 0419bbcc2..c612296fd 100644 --- a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js +++ b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js @@ -5,6 +5,7 @@ data: { batchPayFeeOrderInfo: { batchFees: [], + allBatchFees: [], selectPayFeeIds: [], feePrices: 0.00, communityId: vc.getCurrentCommunity().communityId, @@ -16,7 +17,9 @@ primeRates: [], toFixedSign: 1, // 编码映射-应收款取值标识 receivedAmountSwitch: '', - offlinePayFeeSwitch: '1' + offlinePayFeeSwitch: '1', + payerObjNames: [], + payObjs: [] } }, watch: { @@ -74,10 +77,14 @@ item.receivedAmount = item.receivableAmount; }); let toFixedSign = _fees[0].val; + + $that.batchPayFeeOrderInfo.allBatchFees = $that.batchPayFeeOrderInfo.batchFees; // 防止后台设置有误 if (toFixedSign == 1 || toFixedSign == 2 || toFixedSign == 3 || toFixedSign == 4 || toFixedSign == 5) { $that.batchPayFeeOrderInfo.toFixedSign = toFixedSign; } + + $that._pushPayObjs(); $that._doComputeTotalFee(); }, function() { @@ -85,6 +92,63 @@ } ); }, + _pushPayObjs: function() { + let _allBatchFees = $that.batchPayFeeOrderInfo.allBatchFees; + let _payObjs = $that.batchPayFeeOrderInfo.payObjs; + let _payerObjNames = $that.batchPayFeeOrderInfo.payerObjNames; + let _payerObjName = ''; + _allBatchFees.forEach(_fee => { + _payerObjName = ''; + _fee.feeAttrs.forEach(item => { + if (item.specCd == '390012') { + _payerObjName = item.value; + } + }) + if (_payerObjName && !$that._hasPayObjsIn(_payerObjName)) { + _payObjs.push(_payerObjName); + _payerObjNames.push(_payerObjName); + } + }); + }, + _chanagePayerObjName: function() { + let _allBatchFees = $that.batchPayFeeOrderInfo.allBatchFees; + $that.batchPayFeeOrderInfo.batchFees = []; + _allBatchFees.forEach(_fee => { + _payerObjName = ''; + _fee.feeAttrs.forEach(item => { + if (item.specCd == '390012') { + _payerObjName = item.value; + } + }) + if (_payerObjName && $that._hasPayObjNamesIn(_payerObjName)) { + $that.batchPayFeeOrderInfo.batchFees.push(_fee) + } + }); + + $that._doComputeTotalFee(); + }, + _hasPayObjsIn: function(_payerObjName) { + let _payObjs = $that.batchPayFeeOrderInfo.payObjs; + let _hasIn = false; + _payObjs.forEach(item => { + if (item == _payerObjName) { + _hasIn = true; + } + }); + + return _hasIn; + }, + _hasPayObjNamesIn: function(_payerObjName) { + let _payObjs = $that.batchPayFeeOrderInfo.payerObjNames; + let _hasIn = false; + _payObjs.forEach(item => { + if (item == _payerObjName) { + _hasIn = true; + } + }); + console.log(_payerObjName, _hasIn) + return _hasIn; + }, _payFee: function() { if (vc.component.batchPayFeeOrderInfo.selectPayFeeIds.length <= 0) { vc.toast('未选择费用');