From 1108cd7a791440098537420bafd6ef1e350d78f2 Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: Mon, 23 Nov 2020 11:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=89=93=E7=A5=A8=E6=8D=AE=E3=80=81?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7=E5=B0=8F=E6=95=B0=E7=82=B9=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/property/feeReceipt/feeReceipt.html | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/public/pages/property/feeReceipt/feeReceipt.html b/public/pages/property/feeReceipt/feeReceipt.html
index 6a6ef71b3..aa3dd7a25 100644
--- a/public/pages/property/feeReceipt/feeReceipt.html
+++ b/public/pages/property/feeReceipt/feeReceipt.html
@@ -10,7 +10,7 @@
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-4">
+                        <div class="col-sm-3">
                             <select class="custom-select" v-model="feeReceiptManageInfo.conditions.objType">
                                 <option selected value="">请选择预存类型</option>
                                 <option value="3333">房屋费</option>
@@ -25,12 +25,12 @@
                             </div>
                         </div>
 
-                        <div class="col-sm-4">
-                            <!-- <select class="custom-select" v-model="feeReceiptManageInfo.conditions.state">
-                                <option selected value="">请选择状态</option>
-                                <option value="1001">未使用</option>
-                                <option value="2002">已使用</option>
-                            </select>-->
+                        <div class="col-sm-3">
+                            <input type="text" v-model="feeReceiptManageInfo.conditions.receiptId" class=" form-control"
+                                placeholder="请输入收据ID">
+                        </div>
+                        <div class="col-sm-2">
+
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeReceiptMethod()">
@@ -38,7 +38,42 @@
                             </button>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col-sm-3">
+                            <div class="form-group input-group">
+                                <input type="text" placeholder="请选择开始时间" v-model="feeReceiptManageInfo.conditions.qstartTime"
+                                    class="form-control startTime">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group input-group">
+                                <input type="text" placeholder="请选择结束时间" v-model="feeReceiptManageInfo.conditions.qendTime"
+                                    class="form-control endTime">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
 
+                                <select class="custom-select" v-model="feeReceiptManageInfo.conditions.type">
+                                    <option selected value="">请选择打印类型</option>
+                                    <option value="1">装修单据</option>
+                                    <option value="2">押金单据 </option>
+                                    <option value="3">日常收费 </option>
+                                    <option value="4">车辆单据 </option>
+                                    <option value="5">公摊费票据 </option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
+
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                v-on:click="_printFeeReceipts(feeReceiptManageInfo.conditions)">
+                                <i class="glyphicon glyphicon-search"></i> 打印
+                            </button>
+                        </div>
+                    </div>
 
                 </div>
             </div>
@@ -78,6 +113,10 @@
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_printFeeReceipt(feeReceipt)">补打收据</button>
                                     </div>
+                                    <!-- <div v-if="feeReceipt.objType == '6666'" class="btn-group">
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_printFeeReceipt(feeReceipt)">补打收据(车)</button>
+                                    </div> -->
                                 </td>
                             </tr>
                         </tbody>