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

wuxw

2019-11-21 620d850d08121f3ca8a2e3e921e94eeff4d85595

 WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html

@@ -14,19 +14,17 @@
                    <div class="row">
                        <div class="col-sm-4">
                            <div class="form-group ">
                                    <select class="custom-select" v-model="orgManageInfo.conditions.orgLevel">
                                        <option selected disabled value="">必填，请选择组织级别</option>
                                        <option value="1">公司级</option>
                                        <option value="2">分公司级</option>
                                        <option value="3">部门级</option>
                                    <select class="custom-select" v-model="orgManageInfo.conditions.headOrgId">
                                        <option selected  value="">必填，请选择总公司</option>
                                        <option v-for="headOrg in orgManageInfo.headOrg" :value="headOrg.orgId">{{headOrg.orgName}}</option>
                                    </select>
                            </div>
                        </div>
                        <div class="col-sm-4" >
                            <div class="form-group">
                                <select class="custom-select" v-model="orgManageInfo.conditions.parentOrgId">
                                    <option selected disabled value="">必填，请选择上级组织</option>
                                    <option v-for="parentOrg in orgManageInfo.parentOrg" :value="parentOrg.orgId">{{parentOrg.parentOrgName}}</option>
                                <select class="custom-select" v-model="orgManageInfo.conditions.branchOrgId">
                                    <option selected  value="">必填，请选择分公司</option>
                                    <option v-for="branchOrg in orgManageInfo.branchOrg" :value="branchOrg.orgId">{{branchOrg.orgName}}</option>
                                </select>
                            </div>
                        </div>
@@ -39,7 +37,7 @@

                        <div class="col-sm-1">
                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOrgMethod()">
                                <i class="glyphicon glyphicon-search"></i> 查询
                                <i class="glyphicon glyphicon-search"></i>
                            </button>
                        </div>
                    </div>
@@ -65,7 +63,7 @@
                    <div class="ibox-tools" style="top:10px;">
                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOrgModal()">
                            <i class="glyphicon glyphicon-plus"></i>
                            添加组织
                            添加
                        </button>
                    </div>
                </div>
@@ -87,14 +85,14 @@
                        <tr v-for="org in orgManageInfo.orgs">
                            <td class="text-center">{{org.orgId}}</td>
                            <td class="text-center">{{org.orgName}}</td>
                            <td class="text-center">{{org.orgLevel}}</td>
                            <td class="text-center">{{org.parentOrgId}}</td>
                            <td class="text-center">{{org.orgLevelName}}</td>
                            <td class="text-center">{{org.orgLevel == 1 ? '无' : org.parentOrgName}}</td>
                            <td class="text-center">
                                <div class="btn-group">
                                <div class="btn-group" v-if="org.orgLevel != 1">
                                    <button class="btn-white btn btn-xs" v-on:click="_openEditOrgModel(org)">修改</button>
                                </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteOrgModel(org)">删除
                                <div class="btn-group" v-if="org.orgLevel != 1">
                                    <button class="btn-white btn btn-xs"  v-on:click="_openDeleteOrgModel(org)">删除
                                    </button>
                                </div>
                            </td>