From 5b9a89a5fdc89f1bf2da833b054e4813efea1347 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 20 十二月 2019 17:59:08 +0800
Subject: [PATCH] 优化菜单不显示问题
---
WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html | 214 +++++++++++++++++++++++++++--------------------------
1 files changed, 109 insertions(+), 105 deletions(-)
diff --git a/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html b/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
index 1ab3836..a1ccf68 100644
--- a/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
+++ b/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
@@ -1,119 +1,123 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<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()">{{orgManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}
- </button>
- </div>
- </div>
- <div class="ibox-content">
- <div class="row">
- <div class="col-sm-4">
- <div class="form-group ">
- <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.branchOrgId">
- <option selected value="">蹇呭～锛岃閫夋嫨鍒嗗叕鍙�</option>
- <option v-for="branchOrg in orgManageInfo.branchOrg" :value="branchOrg.orgId">{{branchOrg.orgName}}</option>
- </select>
- </div>
- </div>
- <div class="col-sm-3">
- <div class="form-group">
- <input type="text" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" v-model="orgManageInfo.conditions.orgName"
- class=" form-control">
- </div>
- </div>
-
- <div class="col-sm-1">
- <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOrgMethod()">
- <i class="glyphicon glyphicon-search"></i> 鏌ヨ
- </button>
- </div>
- </div>
- <div class="row">
- <div class="col-sm-4" v-if="orgManageInfo.moreCondition == true">
- <div class="form-group">
- <input type="text" placeholder="璇疯緭鍏ョ粍缁嘔D" v-model="orgManageInfo.conditions.orgId"
- class=" form-control">
- </div>
- </div>
- </div>
-
-
- </div>
- </div>
+ <div class="col-lg-3" >
+ <div id="orgTree" class="" style="background: #fff;"></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-on:click="_openAddOrgModal()">
- <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"
- >
- <thead>
- <tr>
- <th class="text-center">缁勭粐ID</th>
- <th class="text-center">缁勭粐鍚嶇О</th>
- <th class="text-center">缁勭粐绾у埆</th>
- <th class="text-center">涓婄骇缁勭粐</th>
- <th class="text-center">鎿嶄綔</th>
- </tr>
- </thead>
- <tbody>
- <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">
- <div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openEditOrgModel(org)">淇敼</button>
+ <div class="col-lg-9">
+ <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()">{{orgManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}
+ </button>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <div class="row">
+ <div class="col-sm-4" v-if="orgManageInfo.moreCondition == true">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ョ粍缁嘔D"
+ v-model="orgManageInfo.conditions.orgId"
+ class=" form-control">
+ </div>
</div>
- <div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openDeleteOrgModel(org)">鍒犻櫎
+
+ <div class="col-sm-4">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ョ粍缁囧悕绉�"
+ v-model="orgManageInfo.conditions.orgName"
+ class=" form-control">
+ </div>
+ </div>
+ <div class="col-sm-3" v-if="orgManageInfo.moreCondition == true">
+ <div class="form-group">
+ <input type="text" placeholder="璇烽�夋嫨灏忓尯"
+ v-model="orgManageInfo.conditions.communityId"
+ class=" form-control">
+ </div>
+ </div>
+
+ <div class="col-sm-1">
+ <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOrgMethod()">
+ <i class="glyphicon glyphicon-search"></i>
</button>
</div>
- </td>
+ </div>
+ <div class="row">
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="7">
- <ul class="pagination float-right"></ul>
- </td>
- </tr>
- </tfoot>
- </table>
- <!-- 鍒嗛〉 -->
- <vc:create name="pagination"></vc:create>
+ </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-on:click="_openAddOrgModal()">
+ <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"
+ >
+ <thead>
+ <tr>
+ <th class="text-center">缁勭粐ID</th>
+ <th class="text-center">缁勭粐鍚嶇О</th>
+ <th class="text-center">缁勭粐绾у埆</th>
+ <th class="text-center">涓婄骇缁勭粐</th>
+ <th class="text-center">鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody>
+ <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.orgLevelName}}</td>
+ <td class="text-center">{{org.orgLevel == 1 ? '鏃�' : org.parentOrgName}}</td>
+ <td class="text-center">
+ <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" v-if="org.orgLevel != 1">
+ <button class="btn-white btn btn-xs" v-on:click="_openDeleteOrgModel(org)">
+ 鍒犻櫎
+ </button>
+ </div>
+ </td>
+
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan="7">
+ <ul class="pagination float-right"></ul>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ <!-- 鍒嗛〉 -->
+ <vc:create name="pagination"></vc:create>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
-
<vc:create name="addOrg"
callBackListener=""
--
Gitblit v1.8.0