From f7ff7deb390e1d8924c2861332f1499f306085e5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 15 Dec 2020 11:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=B5=B7=E5=8D=97?=
 =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=85=AC=E5=8F=B8=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/searchOwner/searchOwner.html     | 13 ++--
 .../property/searchOwner/searchOwner.js       | 76 +++++++++----------
 .../pages/property/feeReceipt/feeReceipt.html | 68 ++++++++---------
 .../pages/property/listOwner/listOwner.html   |  4 +
 .../property/listOwnerCar/listOwnerCar.html   | 12 +--
 5 files changed, 90 insertions(+), 83 deletions(-)

diff --git a/public/components/property/searchOwner/searchOwner.html b/public/components/property/searchOwner/searchOwner.html
index 3e697b315..236c60266 100644
--- a/public/components/property/searchOwner/searchOwner.html
+++ b/public/components/property/searchOwner/searchOwner.html
@@ -16,8 +16,8 @@
 
                                 <div class="col-sm-7 m-b-xs">
                                     <div class="input-group">
-                                        <input placeholder="输入业主ID" type="text"
-                                               v-model="searchOwnerInfo._currentOwnerId"
+                                        <input placeholder="输入房屋编号楼栋-单元-房屋" type="text"
+                                               v-model="searchOwnerInfo.roomName"
                                                class="form-control form-control-sm">
                                     </div>
                                 </div>
@@ -37,8 +37,8 @@
                                 <table class="table table-striped">
                                     <thead>
                                     <tr>
-                                        <th>业主ID</th>
                                         <th>名称</th>
+                                        <th>房屋编号</th>
                                         <th>性别</th>
                                         <th>年龄</th>
                                         <th>身份证</th>
@@ -49,13 +49,14 @@
                                     </thead>
                                     <tbody>
                                     <tr v-for="owner in searchOwnerInfo.owners">
-                                        <td>
-                                            {{owner.memberId}}
-                                        </td>
+                                       
 
                                         <td>
                                             {{owner.name}}
                                         </td>
+                                        <td>
+                                            {{owner.roomName}}
+                                        </td>
                                         <td>
                                             {{owner.sex == 0 ? '男' : '女'}}
                                         </td>
diff --git a/public/components/property/searchOwner/searchOwner.js b/public/components/property/searchOwner/searchOwner.js
index 606341633..860e221f7 100644
--- a/public/components/property/searchOwner/searchOwner.js
+++ b/public/components/property/searchOwner/searchOwner.js
@@ -1,63 +1,63 @@
-(function(vc){
+(function (vc) {
     vc.extends({
         propTypes: {
-           emitChooseOwner:vc.propTypes.string,
-           emitLoadData:vc.propTypes.string
+            emitChooseOwner: vc.propTypes.string,
+            emitLoadData: vc.propTypes.string
         },
-        data:{
-            searchOwnerInfo:{
-                owners:[],
-                _currentOwnerName:'',
-                _currentOwnerId:''
+        data: {
+            searchOwnerInfo: {
+                owners: [],
+                _currentOwnerName: '',
+                roomName: ''
             }
         },
-        _initMethod:function(){
+        _initMethod: function () {
 
         },
-        _initEvent:function(){
-            vc.on('searchOwner','openSearchOwnerModel',function(_param){
+        _initEvent: function () {
+            vc.on('searchOwner', 'openSearchOwnerModel', function (_param) {
                 console.log("打开业主成员界面")
                 $('#searchOwnerModel').modal('show');
                 vc.component._refreshSearchOwnerData();
-                vc.component._loadAllOwnerInfo(1,10);
+                vc.component._loadAllOwnerInfo(1, 10);
             });
         },
-        methods:{
-            _loadAllOwnerInfo:function(_page,_row,_name){
+        methods: {
+            _loadAllOwnerInfo: function (_page, _row, _name) {
                 var param = {
-                    params:{
-                        page:_page,
-                        row:_row,
-                        communityId:vc.getCurrentCommunity().communityId,
-                        name:_name,
-                        ownerId:vc.component.searchOwnerInfo._currentOwnerId,
-                        ownerTypeCd:'1001'
+                    params: {
+                        page: _page,
+                        row: _row,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        name: _name,
+                        roomName: vc.component.searchOwnerInfo.roomName,
+                        ownerTypeCd: '1001'
                     }
                 };
 
                 //发送get请求
-               vc.http.get('searchOwner',
-                            'listOwner',
-                             param,
-                             function(json){
-                                var _ownerInfo = JSON.parse(json);
-                                vc.component.searchOwnerInfo.owners = _ownerInfo.owners;
-                             },function(){
-                                console.log('请求失败处理');
-                             }
-                           );
+                vc.http.get('searchOwner',
+                    'listOwner',
+                    param,
+                    function (json) {
+                        var _ownerInfo = JSON.parse(json);
+                        vc.component.searchOwnerInfo.owners = _ownerInfo.owners;
+                    }, function () {
+                        console.log('请求失败处理');
+                    }
+                );
             },
-            chooseOwner:function(_owner){
-                vc.emit($props.emitChooseOwner,'chooseOwner',_owner);
-                vc.emit($props.emitLoadData,'listOwnerData',{
-                    ownerId:_owner.ownerId
+            chooseOwner: function (_owner) {
+                vc.emit($props.emitChooseOwner, 'chooseOwner', _owner);
+                vc.emit($props.emitLoadData, 'listOwnerData', {
+                    ownerId: _owner.ownerId
                 });
                 $('#searchOwnerModel').modal('hide');
             },
-            searchOwners:function(){
-                vc.component._loadAllOwnerInfo(1,10,vc.component.searchOwnerInfo._currentOwnerName);
+            searchOwners: function () {
+                vc.component._loadAllOwnerInfo(1, 10, vc.component.searchOwnerInfo._currentOwnerName);
             },
-            _refreshSearchOwnerData:function(){
+            _refreshSearchOwnerData: function () {
                 vc.component.searchOwnerInfo._currentOwnerName = "";
             }
         }
diff --git a/public/pages/property/feeReceipt/feeReceipt.html b/public/pages/property/feeReceipt/feeReceipt.html
index cfdbdbab6..b8e9342c7 100644
--- a/public/pages/property/feeReceipt/feeReceipt.html
+++ b/public/pages/property/feeReceipt/feeReceipt.html
@@ -19,19 +19,19 @@
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="收费对象" v-model="feeReceiptManageInfo.conditions.roomId"
-                                       class=" form-control" placeholder="请输入房屋或车位信息">
+                                    class=" form-control" placeholder="请输入房屋或车位信息">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <input type="text" v-model="feeReceiptManageInfo.conditions.receiptId" class=" form-control"
-                                   placeholder="请输入收据ID">
+                                placeholder="请输入收据ID">
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeReceiptMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_printFeeReceipts(feeReceiptManageInfo.conditions)">
+                                v-on:click="_printFeeReceipts(feeReceiptManageInfo.conditions)">
                                 <i class="fa fa-files-o"></i> 打印
                             </button>
                         </div>
@@ -40,15 +40,13 @@
                         <div class="col-sm-3">
                             <div class="form-group input-group">
                                 <input type="text" placeholder="请选择开始时间"
-                                       v-model="feeReceiptManageInfo.conditions.qstartTime"
-                                       class="form-control startTime">
+                                    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">
+                                    v-model="feeReceiptManageInfo.conditions.qendTime" class="form-control endTime">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -85,41 +83,43 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">费用类型</th>
-                            <th class="text-center">收费对象</th>
-                            <th class="text-center">总金额</th>
-                            <th class="text-center">缴费时间</th>
-                            <th class="text-center">收据ID</th>
-                            <th class="text-center">操作</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">费用类型</th>
+                                <th class="text-center">房屋</th>
+                                <th class="text-center">车位</th>
+                                <th class="text-center">总金额</th>
+                                <th class="text-center">缴费时间</th>
+                                <th class="text-center">收据ID</th>
+                                <th class="text-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="feeReceipt in feeReceiptManageInfo.feeReceipts">
-                            <td class="text-center">{{feeReceipt.objType == '3333'? '房屋费':'车位费'}}</td>
-                            <td class="text-center">{{feeReceipt.objName}}</td>
-                            <td class="text-center">{{feeReceipt.amount}}</td>
-                            <td class="text-center">{{feeReceipt.createTime}}</td>
-                            <td class="text-center">{{feeReceipt.receiptId}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
+                            <tr v-for="feeReceipt in feeReceiptManageInfo.feeReceipts">
+                                <td class="text-center">{{feeReceipt.objType == '3333'? '房屋费':'车位费'}}</td>
+                                <td class="text-center">{{feeReceipt.roomName}}</td>
+                                <td class="text-center">{{feeReceipt.carNum}}</td>
+                                <td class="text-center">{{feeReceipt.amount}}</td>
+                                <td class="text-center">{{feeReceipt.createTime}}</td>
+                                <td class="text-center">{{feeReceipt.receiptId}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_printFeeReceipt(feeReceipt)">补打收据
-                                    </button>
-                                </div>
-                                <!-- <div v-if="feeReceipt.objType == '6666'" class="btn-group">
+                                        </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>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/listOwner/listOwner.html b/public/pages/property/listOwner/listOwner.html
index 2364b3709..0ce0a1029 100644
--- a/public/pages/property/listOwner/listOwner.html
+++ b/public/pages/property/listOwner/listOwner.html
@@ -101,6 +101,7 @@
                             <tr>
                                 <th>业主ID</th>
                                 <th data-hide="phone">名称</th>
+                                <th data-hide="phone">房屋编号</th>
                                 <th data-hide="phone">性别</th>
                                 <th data-hide="phone">年龄</th>
                                 <th data-hide="phone">身份证</th>
@@ -120,6 +121,9 @@
                                 <td>
                                     {{owner.name}}
                                 </td>
+                                <td>
+                                    {{owner.roomName}}
+                                </td>
                                 <td>
                                     {{owner.sex == 0 ? '男' : '女'}}
                                 </td>
diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html
index 297df6299..10701f64f 100644
--- a/public/pages/property/listOwnerCar/listOwnerCar.html
+++ b/public/pages/property/listOwnerCar/listOwnerCar.html
@@ -41,7 +41,7 @@
                             </button>
                         </div>
                     </div>
-                    
+
                 </div>
             </div>
         </div>
@@ -57,8 +57,7 @@
                         <form>
                             <div class="form-row">
                                 <div class="col">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                        v-on:click="_addOwnerCar()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_addOwnerCar()">
                                         <i class="fa fa-plus"></i>
                                         添加
                                     </button>
@@ -74,6 +73,7 @@
                         <thead>
                             <tr>
                                 <th>车牌号</th>
+                                <th>房屋号</th>
                                 <th data-hide="phone">车辆品牌</th>
                                 <th data-hide="phone">车辆类型</th>
                                 <th data-hide="phone">颜色</th>
@@ -90,6 +90,9 @@
                                 <td>
                                     {{car.carNum}}
                                 </td>
+                                <td>
+                                    {{car.roomName}}
+                                </td>
                                 <td>
                                     {{car.carBrand}}
                                 </td>
@@ -127,8 +130,7 @@
                                             v-on:click="_addCarParkingSpace(car)">续租车位</button>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_toPayFee(car)">费用</button>
+                                        <button class="btn-white btn btn-xs" v-on:click="_toPayFee(car)">费用</button>
                                     </div>
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"