From a550970bd616ea5c1e81baaffb51073fc5cc1512 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 13 Apr 2021 18:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96diamante?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplifyFeeReceipt/simplifyFeeReceipt.html  |  4 ++++
 .../simplifyFeeReceipt/simplifyFeeReceipt.js    | 17 ++++++++++++++++-
 .../pages/property/printPayFee/printPayFee.html |  3 ++-
 .../pages/property/printPayFee/printPayFee.js   |  5 ++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

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()">
                 打印小票
             </button>
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_printApplyFeeReceipt()">
+                申请单
+            </button>
         </div>
     </div>
     <div class="margin-top">
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 @@
     <div>
         <div>
             <div class=" text-center">
-                <div style="color:#000;font-size:36px">{{printPayFeeInfo.communityName}} 收据单</div>
+                <div style="color:#000;font-size:36px">{{printPayFeeInfo.communityName}} {{printPayFeeInfo.apply ==
+                    'Y'?'申请单':'收据单'}}</div>
                 <span style="color:#000;font-size:20px">单号：{{printPayFeeInfo.receiptNum}}</span>
             </div>
             <div class="row " style="color:#000;font-size:20px">
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;