diff --git a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html index f33374675..49bb93778 100644 --- a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html +++ b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html @@ -34,6 +34,10 @@ v-on:click="_printFeeSmallReceipt()"> 打印小票 +
diff --git a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js index a4d3ea692..5a28eefe2 100644 --- a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js +++ b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js @@ -114,7 +114,22 @@ if (receiptids.endsWith(',')) { receiptids = receiptids.substring(0, receiptids.length - 1); } - window.open("/print.html#/pages/property/printPayFee?receiptIds=" + receiptids); + window.open("/print.html#/pages/property/printPayFee?receiptIds=" + receiptids+"&apply=N"); + }, + + _printApplyFeeReceipt: function (_receipt) { + if ($that.simplifyFeeReceiptInfo.selectReceipts.length < 1) { + vc.toast('请选择'); + return; + } + let receiptids = ''; + $that.simplifyFeeReceiptInfo.selectReceipts.forEach(item => { + receiptids += (item + ','); + }) + if (receiptids.endsWith(',')) { + receiptids = receiptids.substring(0, receiptids.length - 1); + } + window.open("/print.html#/pages/property/printPayFee?receiptIds=" + receiptids+"&apply=Y"); }, _printFeeSmallReceipt:function(){ diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html index c4bbb719d..2257a49d0 100644 --- a/public/pages/property/printPayFee/printPayFee.html +++ b/public/pages/property/printPayFee/printPayFee.html @@ -2,7 +2,8 @@
-
{{printPayFeeInfo.communityName}} 收据单
+
{{printPayFeeInfo.communityName}} {{printPayFeeInfo.apply == + 'Y'?'申请单':'收据单'}}
单号:{{printPayFeeInfo.receiptNum}}
diff --git a/public/pages/property/printPayFee/printPayFee.js b/public/pages/property/printPayFee/printPayFee.js index 7bb4af260..17d0a0ed2 100644 --- a/public/pages/property/printPayFee/printPayFee.js +++ b/public/pages/property/printPayFee/printPayFee.js @@ -14,7 +14,8 @@ content: '', qrImg: '', payObjName:'', - feeReceipt:[] + feeReceipt:[], + apply:'N' }, printFlag: '0' }, @@ -23,6 +24,8 @@ $that.printPayFeeInfo.receiptId = vc.getParam('receiptId'); $that.printPayFeeInfo.receiptIds = vc.getParam('receiptIds'); + $that.printPayFeeInfo.apply = vc.getParam('apply'); + //$that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date()); $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name;