From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 bdfe108..6c72b87 100644
--- a/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
+++ b/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
@@ -1,5 +1,5 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
- <div class="row">
+ <div class="row" v-show="orgManageInfo.showBelongCommunity == false">
<div class="col-lg-3">
<div id="orgTree" class="" style="background: #fff;"></div>
</div>
@@ -73,8 +73,7 @@
<th class="text-center">缁勭粐鍚嶇О</th>
<th class="text-center">缁勭粐绾у埆</th>
<th class="text-center">涓婄骇缁勭粐</th>
- <th class="text-center">闅跺睘灏忓尯</th>
- <th class="text-center">鎿嶄綔</th>
+ <th class="text-right">鎿嶄綔</th>
</tr>
</thead>
<tbody>
@@ -83,8 +82,10 @@
<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">{{org.belongCommunityName}}</td>
- <td class="text-center">
+ <td class="text-right">
+ <div v-if="org.allowOperation == 'F' && org.belongCommunityId == '9999'">
+ 闅跺睘鎵�鏈夊皬鍖�
+ </div>
<div class="btn-group" v-if="org.allowOperation == 'T'">
<button class="btn-white btn btn-xs" v-on:click="_openEditOrgModel(org)">
淇敼
@@ -93,6 +94,11 @@
<div class="btn-group" v-if="org.allowOperation == 'T'">
<button class="btn-white btn btn-xs" v-on:click="_openDeleteOrgModel(org)">
鍒犻櫎
+ </button>
+ </div>
+ <div class="btn-group" v-if="org.orgLevel == 2 && org.allowOperation == 'T'">
+ <button class="btn-white btn btn-xs" v-on:click="_openBeyondCommunity(org)">
+ 闅跺睘灏忓尯
</button>
</div>
</td>
@@ -116,6 +122,10 @@
</div>
</div>
+ <div v-if="orgManageInfo.showBelongCommunity == true">
+ <vc:create name="orgCommunityManage"></vc:create>
+ </div>
+
<vc:create name="addOrg"
callBackListener=""
callBackFunction=""
@@ -123,4 +133,5 @@
<vc:create name="editOrg"></vc:create>
<vc:create name="deleteOrg"></vc:create>
+
</div>
--
Gitblit v1.8.0