优化设备未包含小区ID查询bug

wuxw

2019-11-21 620d850d08121f3ca8a2e3e921e94eeff4d85595

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

@@ -1,4 +1,57 @@
<div id="component" >

    <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-link btn-sm" style="margin-right:10px;"
                                v-on:click="_moreCondition()">{{listParkingSpaceInfo.moreCondition == true?'隐藏':'更多'}}
                        </button>
                    </div>
                </div>
                <div class="ibox-content" >
                    <div class="row">
                        <div class="col-sm-4">
                            <div class="form-group">
                                <input type="text" placeholder="请填写车位ID" class="form-control form-control-sm"
                                       v-model="listParkingSpaceInfo.conditions.psId">
                            </div>
                        </div>
                        <div class="col-sm-3">
                            <select class="form-control-sm form-control input-s-sm inline"
                                    v-model="listParkingSpaceInfo.conditions.typeCd">
                                <option selected value="">请选择状态</option>
                                <option value="1001">地上停车</option>
                                <option value="2001">地下停车</option>
                            </select>
                        </div>
                        <div class="col-sm-4">
                            <div class="form-group">
                                <input type="text" placeholder="请填写面积" class="form-control form-control-sm"
                                       v-model="listParkingSpaceInfo.conditions.area">
                            </div>
                        </div>
                        <div class="col-sm-1">
                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRoomMethod()"><i
                                    class="glyphicon glyphicon-search"></i> 查询
                            </button>
                        </div>
                    </div>
                    <div class="row" v-if="listParkingSpaceInfo.moreCondition">
                        <div class="col-sm-4">
                            <div class="form-group">
                                <input type="text" placeholder="请填写车位编号" class=" form-control" v-model="listParkingSpaceInfo.num">
                            </div>
                        </div>

                    </div>
                </div>
            </div>
        </div>
    </div>

    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
@@ -8,14 +61,6 @@

                        <form>
                            <div class="form-row">
                                <div class="col-8 input-group input-group-sm">
                                    <input type="text" placeholder="请填写车位编号" class=" form-control" v-model="listParkingSpaceInfo.num">
                                    <div class="input-group-prepend">
                                        <button type="button" class="btn btn-primary btn-sm"  v-on:click="queryParkingSpaceMethod()">
                                            <i class="glyphicon glyphicon-search"></i> 马上查询</button>
                                    </div>
                                </div>

                                <div class="col">
                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddParkingSpaceModal(-1)">
                                        <i class="glyphicon glyphicon-plus"></i>
@@ -38,10 +83,7 @@
                            <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>
@@ -54,19 +96,13 @@
                                {{parkingSpace.num}}
                            </td>
                            <td>
                                {{parkingSpace.typeCd == '1001'?'地上停车位':'地下停车位'}}
                                {{vc.component._viewParkingTypeCd(parkingSpace.typeCd)}}
                            </td>
                            <td>
                                {{vc.component._viewParkingSpaceState(parkingSpace.state)}}
                            </td>
                            <td>
                                {{parkingSpace.area}}
                            </td>
                            <td>
                                {{parkingSpace.userName}}
                            </td>
                            <td>
                                {{parkingSpace.remark}}
                            </td>
                            <td class="text-right">
                                <div class="btn-group">