加入车位出租和 出售功能

WebService/src/main/resources/components/ownerPackage/viewOwnerInfo/viewOwnerInfo.html

@@ -8,6 +8,10 @@
                             v-on:click="_callBackListOwner(viewOwnerInfo.ownerId)">
                         返回
                     </button>
+                    <button type="button" class="btn btn-primary btn-sm" v-if="viewOwnerInfo.ownerId==''"
+                            v-on:click="_openChooseOwner()">
+                        选择业主
+                    </button>
                 </div>
             </div>
             <div class="ibox-content">
@@ -77,4 +81,9 @@
             </div>
         </div>
     </div>
+
+    <vc:create name="searchOwner"
+               emitChooseOwner="viewOwnerInfo"
+               emitLoadData="viewOwnerInfo"
+    ></vc:create>
 </div>

WebService/src/main/resources/components/ownerPackage/viewOwnerInfo/viewOwnerInfo.js

@@ -34,6 +34,10 @@
                 }*/
             });
 
+            vc.on('viewOwnerInfo','chooseOwner',function(_owner){
+                vc.copyObject(_owner,vc.component.viewOwnerInfo);
+            });
+
             vc.on('viewOwnerInfo','callBackOwnerInfo',function(_info){
                 vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewOwnerInfo);
             });
@@ -83,6 +87,9 @@
             },
             errorLoadImg:function(){
                 vc.component.viewOwnerInfo.ownerPhoto="/img/noPhoto.gif";
+            },
+            _openChooseOwner:function(){
+                vc.emit('searchOwner','openSearchOwnerModel',{});
             }
 
         }

WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html

@@ -6,7 +6,9 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{listParkingSpaceInfo.moreCondition == true?'隐藏':'更多'}}
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content" >
@@ -31,7 +33,7 @@
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <select class="custom-select" v-model="listParkingSpaceInfo.conditions.state">
-                                    <option selected disabled value="">必填，请选择车位状态</option>
+                                    <option selected value="">必填，请选择车位状态</option>
                                     <option value="S">出售</option>
                                     <option value="H">出租</option>
                                     <option value="F">空闲</option>
@@ -114,6 +116,12 @@
                                 {{parkingSpace.area}}
                             </td>
                             <td class="text-right">
+                                <div class="btn-group" v-if="parkingSpace.state =='F'">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openToSellParkingSpaceModel(parkingSpace)">出租</button>
+                                </div>
+                                <div class="btn-group" v-if="parkingSpace.state =='F'">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openToSellParkingSpaceModel(parkingSpace)">出售</button>
+                                </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditParkingSpaceModel(parkingSpace)">修改</button>
                                 </div>

WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.js

@@ -87,6 +87,12 @@
             _openEditParkingSpaceModel: function (_parkingSpace) {
                 vc.emit('editParkingSpace', 'openEditParkingSpaceModal', _parkingSpace);
             },
+            _openToSellParkingSpaceModel:function(_parkingSpace){ // 出售
+                vc.jumpToPage('/flow/sellParkingSpaceFlow?'+vc.objToGetParam(_parkingSpace));
+            },
+            _openToHireParkingSpaceModel:function(_parkingSpace){ //出租
+                vc.jumpToPage('/flow/hireParkingSpaceFlow?'+vc.objToGetParam(_parkingSpace));
+            },
             _viewParkingSpaceState: function (state) {
                 if (state == 'F') {
                     return "空闲";

WebService/src/main/resources/components/parkingSpacePackage/search-parkingSpace/searchParkingSpace.html

@@ -15,12 +15,13 @@
 
                                 <div class="col-sm-6 m-b-xs">
                                     <div class="input-group" v-if="searchParkingSpaceInfo.psFlag == 'SH'">
-                                        <input placeholder="输入车牌号" type="text" v-model="searchParkingSpaceInfo.carNum" class="form-control form-control-sm">
+                                        <input placeholder="请输入车牌号" type="text" v-model="searchParkingSpaceInfo.carNum" class="form-control form-control-sm">
                                     </div>
                                 </div>
                                 <div class="col-sm-6">
                                     <div class="input-group">
-                                        <input placeholder="输入停车位编号" type="text" v-model="searchParkingSpaceInfo.num" class="form-control form-control-sm">
+                                        <input placeholder="请输入停车场" type="text" v-model="searchParkingSpaceInfo.areaNum" class="form-control form-control-sm">
+                                        <input placeholder="请输入停车位编号" type="text" v-model="searchParkingSpaceInfo.num" class="form-control form-control-sm">
                                         <span class="input-group-append">
                                             <button type="button" class="btn btn-sm btn-primary" v-on:click="searchParkingSpaces()">查询</button>
                                         </span>

WebService/src/main/resources/components/parkingSpacePackage/search-parkingSpace/searchParkingSpace.js

@@ -12,6 +12,7 @@
                 total:0,
                 records:1,
                 num:'',
+                areaNum:'',
                 carNum:'',
                 psFlag:$props.parkingSpaceFlag,
                 showSearchCondition:$props.showSearchCondition
@@ -42,6 +43,7 @@
                         row:_row,
                         communityId:vc.getCurrentCommunity().communityId,
                         num:vc.component.searchParkingSpaceInfo.num,
+                        areaNum:vc.component.searchParkingSpaceInfo.areaNum,
                         carNum:vc.component.searchParkingSpaceInfo.carNum,
                         state:$props.parkingSpaceFlag
                     }

WebService/src/main/resources/components/parkingSpacePackage/view-select-parkingSpace/viewSelectParkingSpace.html

@@ -3,7 +3,7 @@
         <div class="ibox ">
             <div class="ibox-title">
                 <h5>停车位信息</h5>
-                <div class="ibox-tools" style="top:10px;">
+                <div class="ibox-tools" style="top:10px;" v-if="parkingSpaceInfo.psId == ''">
                     <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchParkingSpaceModel()">
                         <i class="glyphicon glyphicon-search"></i> 选择车位</button>
                 </div>
@@ -24,8 +24,8 @@
                     </div>
                     <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >类型：</label>
-                            <label class="">{{parkingSpaceInfo.typeCd == 1001 ? '地下停车位' : '地上停车位'}}</label>
+                            <label class="col-form-label" >停车场：</label>
+                            <label class="">{{parkingSpaceInfo.areaNum}}</label>
                         </div>
                     </div>
 

WebService/src/main/resources/components/parkingSpacePackage/view-select-parkingSpace/viewSelectParkingSpace.js

@@ -12,11 +12,11 @@
             parkingSpaceInfo:{
                 flowComponent:'viewSelectParkingSpace',
                 num:'',
-                typeCd:'',
                 area:'',
                 state:'',
                 stateName:'',
                 remark:'',
+                areaNum:'',
                 psId:''
             }
         },
@@ -40,11 +40,10 @@
             },
             loadParkingSpaceData:function(){
                vc.component.parkingSpaceInfo.psId = vc.getParam("psId");
-               vc.component.parkingSpaceInfo.name = vc.getParam("name");
-               vc.component.parkingSpaceInfo.age = vc.getParam("age");
-               vc.component.parkingSpaceInfo.sex = vc.getParam("sex");
-               vc.component.parkingSpaceInfo.userName = vc.getParam("userName");
-               vc.component.parkingSpaceInfo.link = vc.getParam("link");
+               vc.component.parkingSpaceInfo.num = vc.getParam("num");
+               vc.component.parkingSpaceInfo.area = vc.getParam("area");
+               vc.component.parkingSpaceInfo.state = vc.getParam("state");
+               vc.component.parkingSpaceInfo.areaNum = vc.getParam("areaNum");
 
                if(vc.component.parkingSpaceInfo.psId != ''){
                   vc.emit($props.callBackComponent,'notify',vc.component.parkingSpaceInfo);

java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml

@@ -125,6 +125,9 @@
             <if test="num !=null and num != ''">
                 and t.num= #{num}
             </if>
+            <if test="areaNum !=null and areaNum != ''">
+                and pa.num= #{areaNum}
+            </if>
             <if test="psId !=null and psId != ''">
                 and t.ps_id= #{psId}
             </if>
@@ -215,6 +218,9 @@
         <if test="num !=null and num != ''">
             and t.num= #{num}
         </if>
+        <if test="areaNum !=null and areaNum != ''">
+            and pa.num= #{areaNum}
+        </if>
         <if test="psId !=null and psId != ''">
             and t.ps_id= #{psId}
         </if>