From 620d850d08121f3ca8a2e3e921e94eeff4d85595 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 16:35:32 +0800
Subject: [PATCH] 优化设备未包含小区ID查询bug
---
WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 94fcbc6..aca7ed7 100644
--- a/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
+++ b/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>
--
Gitblit v1.8.0