From 3fe6c84a4922cca94b948060d34d60e4e9ae8547 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 18 十月 2019 19:12:59 +0800
Subject: [PATCH] 优化组织显示问题
---
WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 5235c74..aca7ed7 100644
--- a/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
+++ b/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
@@ -13,33 +13,38 @@
<div class="ibox-content">
<div class="row">
<div class="col-sm-4">
- <div class="form-group">
- <input type="text" placeholder="璇疯緭鍏ョ粍缁嘔D" v-model="orgManageInfo.conditions.orgId"
- class=" form-control">
+ <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="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-3">
- <div class="form-group">
- <input type="text" placeholder="璇疯緭鍏ョ粍缁囩骇鍒�" v-model="orgManageInfo.conditions.orgLevel"
- 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> 鏌ヨ
+ <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="璇疯緭鍏ヤ笂绾х粍缁�" v-model="orgManageInfo.conditions.parentOrgId"
+ <input type="text" placeholder="璇疯緭鍏ョ粍缁嘔D" v-model="orgManageInfo.conditions.orgId"
class=" form-control">
</div>
</div>
@@ -58,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>
@@ -74,22 +79,20 @@
<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">{{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