From cce55de190a635e3a00a0402cd84f84ba26abdcc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 9 Nov 2020 09:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A5=E6=89=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/property/feeReceipt/feeReceipt.html | 63 +++++++++++--------
 .../pages/property/feeReceipt/feeReceipt.js   |  1 +
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/public/pages/property/feeReceipt/feeReceipt.html b/public/pages/property/feeReceipt/feeReceipt.html
index 9c2caa500..3df1dd084 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-2">
+                        <div class="col-sm-4">
                             <select class="custom-select" v-model="feeReceiptManageInfo.conditions.objType">
                                 <option selected value="">请选择预存类型</option>
                                 <option value="3333">房屋费</option>
@@ -18,37 +18,16 @@
                             </select>
 
                         </div>
-                        <div class="col-sm-2">
+                        <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="收费对象" v-model="feeReceiptManageInfo.conditions.roomId"
                                     class=" form-control" placeholder="请输入房屋或车位信息">
                             </div>
                         </div>
 
-                        <div class="col-sm-2">
-                            <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 class="col-sm-2">
-                            <div class="form-group input-group">
-                                <input type="text" placeholder="请选择月份"
-                                    v-model="feeReceiptManageInfo.conditions.month" class="form-control startTime">
-                            </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 class="col-sm-4">
+                            <input type="text" v-model="feeReceiptManageInfo.conditions.receiptId" class=" form-control"
+                                placeholder="请输入收据ID">
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeReceiptMethod()">
@@ -56,7 +35,37 @@
                             </button>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group input-group">
+                                <input type="text" placeholder="请选择月份" v-model="feeReceiptManageInfo.conditions.month"
+                                    class="form-control startTime">
+                            </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-4">
+
+                        </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>
@@ -92,7 +101,7 @@
                                 <td class="text-center">{{feeReceipt.createTime}}</td>
                                 <td class="text-center">{{feeReceipt.receiptId}}</td>
                                 <td class="text-center">
-                                    <div  class="btn-group">
+                                    <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_printFeeReceipt(feeReceipt)">补打收据</button>
                                     </div>
diff --git a/public/pages/property/feeReceipt/feeReceipt.js b/public/pages/property/feeReceipt/feeReceipt.js
index c8b11aa78..4ace062dc 100644
--- a/public/pages/property/feeReceipt/feeReceipt.js
+++ b/public/pages/property/feeReceipt/feeReceipt.js
@@ -20,6 +20,7 @@
                     type:'',
                     roomId:'',
                     communityId: vc.getCurrentCommunity().communityId,
+                    receiptId:''
                 }
             }
         },