From 61e04dab3ae87c037cd63dc132289c1f244ea0ef Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 24 Jun 2020 16:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8D=95=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/billManage/billManage.html | 21 ++++++++++---------
 .../pages/property/billManage/billManage.js   |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/pages/property/billManage/billManage.html b/public/pages/property/billManage/billManage.html
index 004c77067..c0b1459e6 100644
--- a/public/pages/property/billManage/billManage.html
+++ b/public/pages/property/billManage/billManage.html
@@ -19,16 +19,16 @@
                             </div>
                         </div>
                         <div class="col-sm-4">
-                            <select class="custom-select" v-model="billManageInfo.conditions.typeCd">
-                                <option selected value="">请选择信息类型</option>
-                                <option v-for="(item,index) in billManageInfo.typeCds" :key="index"
-                                    v-bind:value="item.statusCd">{{item.name}}
-                                </option>
+                            <select class="custom-select" v-model="billManageInfo.conditions.curBill">
+                                <option selected value="">请选择账单类型</option>
+                                <option value="T">当期账单</option>
+                                <option value="F">往期账单</option>
+
                             </select></div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入员工名称"
-                                    v-model="billManageInfo.conditions.userName" class=" form-control">
+                                <input type="text" placeholder="请输入账单名称"
+                                    v-model="billManageInfo.conditions.billName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-1">
@@ -83,12 +83,13 @@
                         <tbody>
                             <tr v-for="bill in billManageInfo.bills">
                                 <td class="text-center">{{bill.billId}}</td>
-                                <td class="text-center">{{bill.configName}}</td>
+                                <td class="text-center">{{bill.feeName}}</td>
                                 <td class="text-center">{{bill.billName}}</td>
                                 <td class="text-center">{{bill.receivable}}元</td>
                                 <td class="text-center">{{bill.curReceivable}}元</td>
-                                <td class="text-center">{{bill.billTime}}元</td>
-                                <td class="text-center">{{bill.curBill == 'T'?'当前账单':'历史账单'}}</td>
+                                <td class="text-center">{{bill.receipts}}元</td>
+                                <td class="text-center">{{bill.billTime}}</td>
+                                <td class="text-center">{{bill.curBill == 'T'?'当期账单':'往期账单'}}</td>
                                 <td class="text-right">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
diff --git a/public/pages/property/billManage/billManage.js b/public/pages/property/billManage/billManage.js
index 3bf07088c..09ed34a71 100644
--- a/public/pages/property/billManage/billManage.js
+++ b/public/pages/property/billManage/billManage.js
@@ -14,8 +14,8 @@
                 title: '',
                 conditions: {
                     title: '',
-                    typeCd: '',
-                    userName: '',
+                    curBill: '',
+                    billName: '',
                     billId: '',
 
                 }