车位售卖完成

WebService/src/main/resources/components/add-car/addCar.html

@@ -0,0 +1,51 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>车辆信息</h5>
+            </div>
+            <div class="ibox-content">
+                <div>
+                    <div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">车牌号</label>
+                            <div class="col-sm-10">
+                                <input v-model="addCarInfo.carNum" type="text" placeholder="必填，请填写车牌号" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">车品牌</label>
+                            <div class="col-sm-10">
+                                <input v-model="addCarInfo.carBrand" type="text" placeholder="必填，请填写车品牌，如 宝马X6" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">车类型</label>
+                            <div class="col-sm-10">
+                                <select class="custom-select" v-model="addCarInfo.carType">
+                                    <option selected  disabled value="">必填，请选择类型</option>
+                                    <option value="9901">家用小汽车</option>
+                                    <option value="9902">客车</option>
+                                    <option value="9903">货车</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">颜色</label>
+                            <div class="col-sm-10">
+                                <input v-model="addCarInfo.carColor" type="text" placeholder="必填，请填写车颜色，如白色" class="form-control">
+                            </div>
+                        </div>
+
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">备注</label>
+                            <div class="col-sm-10">
+                                <textarea v-model="addCarInfo.remark" type="text" placeholder="请填写备注信息" rows="3" class="form-control"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/add-car/addCar.js

@@ -0,0 +1,38 @@
+/**
+    权限组
+**/
+(function(vc){
+
+    vc.extends({
+        data:{
+            addCarInfo:{
+                carNum:'',
+                carBrand:'',
+                carType:'',
+                carColor:'',
+                remark:""
+            }
+        },
+        watch:{
+            otherInfo:{
+                deep: true,
+                handler:function(){
+                    vc.emit('sellCar','notify',vc.component.addCarInfo);
+
+                }
+             }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+
+
+        },
+        methods:{
+
+
+        }
+    });
+
+})(window.vc);

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

@@ -45,7 +45,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="parkingSpace in listParkingSpaceInfo.parkingSpaces">
+                        <tr v-for="parkingSpace in searchParkingSpaceInfo.parkingSpaces">
                             <td>
                                 {{parkingSpace.psId}}
                             </td>

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

@@ -0,0 +1,80 @@
+<div id = "searchParkingSpaceModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="searchParkingSpaceModelLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title" id="searchParkingSpaceModelLabel">选择停车位</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class=" row">
+                    <div class="col-lg-12">
+                        <div class="ibox ">
+                            <div class="row">
+
+                                <div class="col-sm-6 m-b-xs">
+
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="input-group">
+                                        <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>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive" style="margin-top:15px">
+                                <table class="table table-striped">
+                                    <thead>
+                                    <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>
+                                        <th data-hide="phone">备注</th>
+                                        <th class="text-right">操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr v-for="parkingSpace in searchParkingSpaceInfo.parkingSpaces">
+                                        <td>
+                                            {{parkingSpace.psId}}
+                                        </td>
+
+                                        <td>
+                                            {{parkingSpace.num}}
+                                        </td>
+                                        <td>
+                                            {{parkingSpace.typeCd == '1001'?'地上停车位':'地下停车位'}}
+                                        </td>
+                                        <td>
+                                            {{vc.component._viewParkingSpaceState(parkingSpace.state)}}
+                                        </td>
+                                        <td>
+                                            {{parkingSpace.area}}
+                                        </td>
+                                        <td>
+                                            {{parkingSpace.userName}}
+                                        </td>
+                                        <td>
+                                            {{parkingSpace.remark}}
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-primary btn-xs" v-on:click="chooseParkingSpace(parkingSpace)">选择</button>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,79 @@
+(function(vc){
+    vc.extends({
+        propTypes: {
+           emitChooseParkingSpace:vc.propTypes.string,
+           emitLoadData:vc.propTypes.string,
+           parkingSpaceFlag:vc.propTypes.string // 如果 S 表示查询售卖停车位 H 出租停车位 F 表示查询未售卖未出租停车位
+        },
+        data:{
+            searchParkingSpaceInfo:{
+                parkingSpaces:[],
+                total:0,
+                records:1,
+                num:''
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+            vc.on('searchParkingSpace','openSearchParkingSpaceModel',function(_param){
+                console.log("打开业主成员界面")
+                $('#searchParkingSpaceModel').modal('show');
+                vc.component._refreshSearchParkingSpaceData();
+                vc.component._loadAllParkingSpaceInfo(1,10);
+            });
+        },
+        methods:{
+            _loadAllParkingSpaceInfo:function(_page,_row){
+
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_row,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        num:vc.component.searchParkingSpaceInfo.num,
+                        state:$props.parkingSpaceFlag
+                    }
+                };
+
+                //发送get请求
+               vc.http.get('searchParkingSpace',
+                            'listParkingSpace',
+                             param,
+                             function(json){
+                                var _parkingSpaceInfo = JSON.parse(json);
+                                vc.component.searchParkingSpaceInfo.parkingSpaces = _parkingSpaceInfo.parkingSpaces;
+                             },function(){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            chooseParkingSpace:function(_parkingSpace){
+                vc.emit($props.emitChooseParkingSpace,'chooseParkingSpace',_parkingSpace);
+                vc.emit($props.emitLoadData,'listParkingSpaceData',{
+                    psId:_parkingSpace.psId
+                });
+                $('#searchParkingSpaceModel').modal('hide');
+            },
+            searchParkingSpaces:function(){
+                vc.component._loadAllParkingSpaceInfo(1,15);
+            },
+            _refreshSearchParkingSpaceData:function(){
+                vc.component.searchParkingSpaceInfo.num = "";
+            },
+            _viewParkingSpaceState:function(state){
+                if(state == 'F'){
+                    return "空闲";
+                }else if(state == 'S'){
+                    return "已售卖";
+                }else if(state == 'H'){
+                    return "已出租";
+                }else{
+                    return "未知";
+                }
+            },
+        }
+
+    });
+})(window.vc);

WebService/src/main/resources/components/sell-car/sellCar.html

@@ -0,0 +1,19 @@
+<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+
+    <vc:create name="addCar"></vc:create>
+
+    <!-- 选择 业主信息 -->
+    <vc:create name="sellRoomSelectOwner"
+               callBackComponent = "sellCar"
+    ></vc:create>
+
+    <!-- 选择停车位 -->
+    <vc:create name="viewSelectParkingSpace"
+               callBackComponent="sellCar"
+    ></vc:create>
+
+    <div class="">
+        <button class="btn btn-primary float-right" type="button" v-on:click="doSellCar()" ><i class="fa fa-check"></i>&nbsp;我要售卖</button>
+    </div>
+
+</div>

WebService/src/main/resources/components/sell-car/sellCar.js

@@ -0,0 +1,89 @@
+/**
+    入驻小区
+**/
+(function(vc){
+    vc.extends({
+        data:{
+            sellCarInfo:{
+                ownerId:'',
+                carNum:'',
+                carBrand:'',
+                carType:'',
+                carColor:'',
+                remark:"",
+                psId:''
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+            vc.on('sellCar','notify',function(_param){
+                  vc.copyObject(_param,vc.component.sellCarInfo.ownerInfo);
+            });
+        },
+        methods:{
+            sellCarValidate:function(){
+                        return vc.validate.validate({
+                            sellCarInfo:vc.component.sellCarInfo
+                        },{
+                            'sellCarInfo.ownerId':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"未选择业主"
+                                }
+                            ],
+                            'sellCarInfo.roomId':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"未选择房屋"
+                                }
+                            ],
+                            'sellCarInfo.state':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"未选择出售状态"
+                                }
+                            ],
+
+
+                        });
+             },
+
+            doSellCar:function(){
+                //
+                if(!vc.component.sellCarValidate()){
+                    vc.message(vc.validate.errInfo);
+                    return ;
+                }
+
+                vc.component.sellCarInfo.communityId=vc.getCurrentCommunity().communityId;
+            vc.http.post(
+                    'sellCar',
+                    'sell',
+                    JSON.stringify(vc.component.sellCarInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            vc.jumpToPage("/flow/ownerCarFlow?" + vc.objToGetParam(vc.component.sellCarInfo.ownerInfo));
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                     });
+
+            }
+        }
+    });
+})(window.vc);

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

@@ -0,0 +1,64 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>停车位信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchParkingSpaceModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择车位</button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >车位ID：</label>
+                            <label class="">{{parkingSpaceInfo.psId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">编号：</label>
+                            <label class="">{{parkingSpaceInfo.num}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >类型：</label>
+                            <label class="">{{parkingSpaceInfo.typeCd == 1001 ? '地下停车位' : '地上停车位'}}</label>
+                        </div>
+                    </div>
+
+
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >车位状态：</label>
+                            <label class="">{{parkingSpaceInfo.state}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >面积：</label>
+                            <label class="">{{parkingSpaceInfo.area}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">备注：</label>
+                            <label class="">{{parkingSpaceInfo.remark}}</label>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <vc:create name="searchParkingSpace"
+               emitChooseParkingSpace="viewSelectParkingSpace"
+               emitLoadData="sellRoomOther"
+               parkingSpaceFlag="'F'"
+    ></vc:create>
+</div>

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

@@ -0,0 +1,51 @@
+/**
+    权限组
+**/
+(function(vc){
+
+    vc.extends({
+        propTypes: {
+            callBackComponent:vc.propTypes.string
+        },
+        data:{
+            parkingSpaceInfo:{
+                num:'',
+                typeCd:'',
+                area:'',
+                state:'',
+                remark:'',
+                psId:''
+            }
+        },
+        _initMethod:function(){
+            //根据请求参数查询 查询 业主信息
+            vc.component.loadParkingSpaceData();
+        },
+        _initEvent:function(){
+            vc.on('viewSelectParkingSpace','chooseParkingSpace',function(_parkingSpace){
+                vc.component.parkingSpaceInfo = _parkingSpace;
+                vc.emit($props.callBackComponent,'notify',_parkingSpace);
+            });
+
+        },
+        methods:{
+
+            openSearchParkingSpaceModel(){
+                vc.emit('searchParkingSpace','openSearchParkingSpaceModel',{});
+            },
+            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");
+
+               if(vc.component.parkingSpaceInfo.psId != ''){
+                  vc.emit($props.callBackComponent,'notify',vc.component.parkingSpaceInfo);
+               }
+            }
+        }
+    });
+
+})(window.vc);

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

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:vc="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <title>车位出售|java110</title>
+    <vc:create name="commonTop"></vc:create>
+</head>
+<body>
+<vc:create name="bodyTop"></vc:create>
+<div id="wrapper">
+    <vc:create name="menu"></vc:create>
+
+
+    <div id="page-wrapper" class="gray-bg dashbard-1">
+        <div class="row border-bottom">
+            <vc:create name="nav"></vc:create>
+        </div>
+        <!-- id="component" -->
+        <div class="wrapper wrapper-content animated fadeInRight">
+            <vc:create name="sellCar"></vc:create>
+        </div>
+
+        <vc:create name="copyright"></vc:create>
+
+    </div>
+</div>
+
+<vc:create name="commonBottom"></vc:create>
+</body>
+</html>

java110-bean/src/main/java/com/java110/dto/ParkingSpaceDto.java

@@ -23,6 +23,7 @@ private String communityId;
 private String userId;
 
 
+
     private Date createTime;
 
     private String statusCd = "0";