优化完成物业费功能

WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.html

@@ -102,19 +102,7 @@
                                     <button class="btn-white btn btn-xs dropdown-toggle" data-toggle="dropdown"
                                             aria-haspopup="true" aria-expanded="false">变更业主
                                     </button>
-                                    <!--<div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#"
-                                           v-on:click="_openEditOwnerModel(owner)">修改业主</a>
-                                        <a class="dropdown-item" href="#"
-                                           v-on:click="_openDelOwnerModel(owner)">删除业主</a>
-                                        <a class="dropdown-item" href="#"
-                                            v-on:click="_openAddOwnerRoom(owner)">添加房屋</a>
-                                        <a class="dropdown-item" href="#">删除房屋</a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#"
-                                            v-on:click="_openHireParkingSpace(owner)">车位出租</a>
-                                        <a class="dropdown-item" href="#">车位出售</a>
-                                    </div>-->
+
 
                                     <div class="dropdown-menu p-4 text-muted" style="max-width: 200px;">
                                         <p style="margin:10px 0;">
@@ -140,7 +128,7 @@
                                         </p>
                                         <p style="margin:10px 0;">
                                             <a  href="#"
-                                                v-on:click="_openHireParkingSpace(owner)">缴物业费</a>
+                                                v-on:click="_openPayPropertyFee(owner)">缴物业费</a>
                                             <span >|</span>
                                             <a  href="#"
                                                 v-on:click="_openSellParkingSpace(owner)">缴停车费</a>
@@ -189,6 +177,7 @@
         emitChooseRoom="listOwner"
         emitLoadData="listOwner"
         roomFlag="1"
+        showSearchCondition="false"
         ></vc:create>
 
 </div>

WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.js

@@ -34,7 +34,7 @@
             });
 
             vc.on('listOwner','chooseRoom',function(_room){
-                 vc.jumpToPage("/flow/propertyFeeFlow?ownerId="+_currentOwnerId+"&roomId="+_room.roomId);
+                 vc.jumpToPage("/flow/propertyFeeFlow?ownerId="+vc.component.listOwnerInfo._currentOwnerId+"&roomId="+_room.roomId);
             });
         },
         methods:{
@@ -111,16 +111,14 @@
                              param,
                              function(json,res){
                                 var listRoomData =JSON.parse(json);
-
-                                vc.component.listRoomData.total = listRoomData.total;
-                                vc.component.listRoomData.records = listRoomData.records;
-                                vc.component.listRoomData.rooms = listRoomData.rooms;
+                                var rooms = listRoomData.rooms;
                                 if(rooms.length == 1){
                                       vc.jumpToPage("/flow/propertyFeeFlow?ownerId="+_owner.ownerId+"&roomId="+rooms[0].roomId);
                                 }else if(rooms.length == 0){
                                     vc.message("当前业主未查询到房屋信息");
                                 }else{
-                                    vc.emit('listRoom','',listRoomData);
+
+                                    vc.emit('searchRoom','showOwnerRooms',rooms);
                                 }
                              },function(errInfo,error){
                                 console.log('请求失败处理');

WebService/src/main/resources/components/propertyPackage/view-main-fee/viewMainFee.html

@@ -4,15 +4,21 @@
             <div class="ibox-title">
                 <h5>{{mainFeeInfo.feeName}}信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchRoomModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择房屋</button>
+                    <!--<button type="button" class="btn btn-primary btn-sm"
+                            v-on:click="openSearchRoomModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择房屋</button>-->
                     <button type="button" class="btn btn-primary btn-sm"
                             v-if="mainFeeInfo.feeId != null && mainFeeInfo.feeId != ''"
                             style="margin-left:10px" v-on:click="openPayModel()">
                         <i class="glyphicon glyphicon-plus" ></i> 缴费</button>
+
+                    <button type="button" class="btn btn-primary btn-sm"
+                            v-on:click="_openCallBackOwner()">
+                        返回</button>
                 </div>
             </div>
             <div class="ibox-content">
+
                 <div class="row">
                     <div class="col-sm-4">
                         <div class="form-group">
@@ -20,65 +26,27 @@
                             <label class="">{{mainFeeInfo.feeId}}</label>
                         </div>
                     </div>
-                    <div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label">小区楼编号：</label>
-                            <label class="">{{mainFeeInfo.floorNum}}</label>
-                        </div>
-                    </div>
-                    <div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >房屋ID：</label>
-                            <label class="">{{mainFeeInfo.roomId}}</label>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="row">
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >房屋编号：</label>
                             <label class="">{{mainFeeInfo.roomNum}}</label>
                         </div>
                     </div>
-                    <div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >业主ID：</label>
-                            <label class="">{{mainFeeInfo.ownerId}}</label>
-                        </div>
-                    </div>
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label">业主名称：</label>
                             <label class="">{{mainFeeInfo.ownerName}}</label>
                         </div>
                     </div>
-
-
                 </div>
                 <div class="row">
-                    <div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >联系电话：</label>
-                            <label class="">{{mainFeeInfo.link}}</label>
-                        </div>
-                    </div>
-                    <div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >建筑面积：</label>
-                            <label class="">{{mainFeeInfo.builtUpArea}} 平方米</label>
-                        </div>
-                    </div>
+
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >费用开始时间：</label>
                             <label class="">{{mainFeeInfo.startTime}}</label>
                         </div>
                     </div>
-
-
-                </div>
-                <div class="row">
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >费用到期时间：</label>
@@ -91,16 +59,15 @@
                             <label class="">{{mainFeeInfo.amount}}</label>
                         </div>
                     </div>
-
                 </div>
             </div>
         </div>
     </div>
-    <vc:create name="searchRoom"
+    <!--<vc:create name="searchRoom"
                emitChooseRoom="viewMainFee"
                emitLoadData="propertyFee"
                roomFlag="1"
-    ></vc:create>
+    ></vc:create>-->
     <vc:create name="propertyPay"
                emitReloadFee="viewMainFee"
     ></vc:create>

WebService/src/main/resources/components/propertyPackage/view-main-fee/viewMainFee.js

@@ -27,6 +27,16 @@
             }
         },
         _initMethod:function(){
+             //加载 业主信息
+            var _ownerId = vc.getParam('ownerId')
+            var _roomId = vc.getParam('roomId')
+
+            if(vc.notNull(_roomId)){
+                vc.component.loadMainFeeInfo({
+                    roomId:_roomId,
+                    ownerId:_ownerId,
+                });
+            }
 
         },
         _initEvent:function(){
@@ -79,6 +89,9 @@
                                 console.log('请求失败处理');
                              }
                            );
+            },
+            _openCallBackOwner:function(){
+                vc.jumpToPage("/flow/ownerFlow");
             }
 
         }

WebService/src/main/resources/components/roomPackage/search-room/searchRoom.html

@@ -12,7 +12,7 @@
                 <div class=" row">
                     <div class="col-lg-12">
                         <div class="ibox ">
-                            <div class="row">
+                            <div class="row" v-if="searchRoomInfo.showSearchCondition == 'true'">
 
                                 <div class="col-sm-6 m-b-xs">
                                     <div class="input-group">

WebService/src/main/resources/components/roomPackage/search-room/searchRoom.js

@@ -3,7 +3,8 @@
         propTypes: {
            emitChooseRoom:vc.propTypes.string,
            emitLoadData:vc.propTypes.string,
-           roomFlag:vc.propTypes.string // 如果 1 表示查询售卖房屋 2 表示查询未售卖房屋
+           roomFlag:vc.propTypes.string, // 如果 1 表示查询售卖房屋 2 表示查询未售卖房屋
+           showSearchCondition:vc.propTypes.string='true'
 
         },
         data:{
@@ -11,7 +12,8 @@
                 rooms:[],
                 _currentRoomNum:'',
                 _currentFloorNum:'',
-                floorNumInputReadonly:false
+                floorNumInputReadonly:false,
+                showSearchCondition:$props.showSearchCondition,
             }
         },
         _initMethod:function(){
@@ -29,7 +31,10 @@
                 vc.component.searchRoomInfo._currentFloorNum = _floorInfo.floorNum;
                 vc.component.searchRoomInfo.floorNumInputReadonly = true;
                 vc.component.searchRooms();
-
+            });
+            vc.on('searchRoom','showOwnerRooms',function(_rooms){
+                $('#searchRoomModel').modal('show');
+                vc.component.searchRoomInfo.rooms=_rooms;
             });
         },
         methods:{

WebService/src/main/resources/views/propertyFeeFlow.html

@@ -5,7 +5,7 @@
       xmlns:vc="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8"/>
-    <title>物业费 |java110</title>
+    <title>缴物业费|java110</title>
     <vc:create name="commonTop"></vc:create>
     <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
 </head>