优化 单元信息

WebService/src/main/resources/components/floorPackage/floor-manage/listFloor.html

@@ -27,7 +27,7 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入楼栋编号"
+                                <input type="text" placeholder="请输入楼栋名称"
                                        v-model="listFloorInfo.conditions.floorName" class=" form-control">
                             </div>
                         </div>

WebService/src/main/resources/components/servicePackage/serviceImpl-manage/serviceImplManage.js

@@ -14,10 +14,9 @@
                 name:'',
                 conditions:{
                     businessTypeCd:'',
-name:'',
-invokeType:'',
-messageTopic:'',
-
+                    name:'',
+                    invokeType:'',
+                    messageTopic:'',
                 }
             }
         },

WebService/src/main/resources/components/unitPackage/add-unit/addUnit.html

@@ -1,4 +1,5 @@
-<div id = "addUnitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addUnitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -8,11 +9,13 @@
                         <div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">单元编号</label>
-                                <div class="col-sm-10"><input v-model="addUnitInfo.unitNum" type="text" placeholder="必填，请填写单元编号" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="addUnitInfo.unitNum" 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="addUnitInfo.layerCount" type="number" placeholder="必填，请填写单元总层数" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="addUnitInfo.layerCount" type="number"
+                                                              placeholder="必填，请填写单元总层数" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">电梯</label>
@@ -26,11 +29,16 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addUnitInfo.remark" type="text" placeholder="请填写备注信息" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="addUnitInfo.remark" type="text"
+                                                              placeholder="请填写备注信息" class="form-control"></div>
                             </div>
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="addUnit()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="addUnit()"><i
+                                        class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/unitPackage/unit-manage/unit.html

@@ -1,8 +1,78 @@
 <div id="component" >
-    <vc:create name="unitSelectFloor"></vc:create>
+    <!--<vc:create name="unitSelectFloor"></vc:create>-->
+
+    <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()">更多
+                         </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+
+                        <div class="col-sm-4">
+                            <input type="text" placeholder="请选择楼栋"
+                                   v-model="unitInfo.conditions.floorName" class=" form-control">
+                            <div class="input-group-prepend">
+                                <button type="button" class="btn btn-primary btn-sm"
+                                        v-on:click="_openChooseFloorMethod()"><i
+                                        class="glyphicon glyphicon-search"></i> 选择
+                                </button>
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入单元编号"
+                                       v-model="unitInfo.conditions.unitNum" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入总层数"
+                                       v-model="unitInfo.conditions.layerCount" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryUnitMethod()"><i
+                                    class="glyphicon glyphicon-search" ></i> 查询
+                            </button>
+                        </div>
+
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="unitInfo.moreCondition == true">
+                            <select class="custom-select" v-model="unitInfo.conditions.lift">
+                                <option selected disabled value="">必填，请选择是否有电梯</option>
+                                <option value="1010">有</option>
+                                <option value="2020">无</option>
+                            </select>
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+
     <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-if="unitInfo。conditions.floorId != null && unitInfo。conditions.floorId != ''"
+                                style="margin-left:10px" v-on:click="openAddUnitModel()">
+                            <i class="glyphicon glyphicon-plus" ></i> 添加单元</button>
+                    </div>
+                </div>
                 <div class="ibox-content">
 
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
@@ -61,6 +131,15 @@
             </div>
         </div>
     </div>
+
+    <vc:create name="searchFloor"
+               emitChooseFloor="unit"
+               emitLoadData="unit"
+    ></vc:create>
+    <vc:create name="addUnit"
+               callBackListener=""
+               callBackFunction=""
+    ></vc:create>
     <!-- 删除员工权限 -->
     <vc:create name="editUnit"></vc:create>
     <vc:create name="deleteUnit"></vc:create>

WebService/src/main/resources/components/unitPackage/unit-manage/unit.js

@@ -5,14 +5,27 @@
             unitInfo:{
                 units:[],
                 _currentFloorId:'',
+                moreCondition:false,
+                conditions:{
+                    floorId:'',
+                    floorName:'',
+                    unitNum:'',
+                    layerCount:'',
+                    lift:'',
+                }
             }
         },
         _initMethod:function(){
 
         },
         _initEvent:function(){
+            vc.on('unit','chooseFloor',function(_param){
+                vc.component.conditions.floorId = _param.floorId;
+                vc.component.conditions.floorName = _param.floorName;
+            });
 
             vc.on('unit','loadUnit',function(_param){
+                vc.component.conditions.floorId = _param.floorId;
                 vc.component._loadUnits(_param);
             });
             vc.on('unit','loadData',function(_param){
@@ -22,23 +35,21 @@
         methods:{
             _loadUnits:function(_param){
                 vc.component.unitInfo._currentFloorId=_param.floorId;
+                vc.component.unitInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
                 var param = {
-                    params:{
-                        floorId:_param.floorId,
-                        communityId:vc.getCurrentCommunity().communityId
-                    }
-                };
+                    params:vc.component.unitInfo.conditions
+               };
              //发送get请求
-            vc.http.get('unit',
-                         'loadUnits',
-                          param,
-                          function(json){
-                             var _unitInfo = JSON.parse(json);
-                             vc.component.unitInfo.units = _unitInfo;
-
-                          },function(){
-                             console.log('请求失败处理');
-                          });
+                vc.http.get('unit',
+                     'loadUnits',
+                      param,
+                      function(json){
+                         var _unitInfo = JSON.parse(json);
+                         vc.component.unitInfo.units = _unitInfo;
+                      },
+                      function(){
+                         console.log('请求失败处理');
+                      });
             },
             _openDeleteUnitModel:function(_unit){
                 _unit.floorId = vc.component.unitInfo._currentFloorId;
@@ -47,6 +58,21 @@
             _openEditUnitModel:function(_unit){
                 _unit.floorId = vc.component.unitInfo._currentFloorId;
                 vc.emit('editUnit','openUnitModel',_unit);
+            },
+            _openChooseFloorMethod:function(){
+                vc.emit('searchFloor','openSearchFloorModel',{});
+            },
+            openAddUnitModel(){
+                vc.emit('addUnit','addUnitModel',{
+                    floorId:vc.component.unitInfo.conditions.floorId
+                });
+            },
+            _moreCondition:function(){
+                if(vc.component.unitInfo.moreCondition){
+                    vc.component.unitInfo.moreCondition = false;
+                }else{
+                    vc.component.unitInfo.moreCondition = true;
+                }
             }
         }
     });