From a31deb55464435b01fa45487b354ca2350780868 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 二月 2020 12:36:56 +0800
Subject: [PATCH] 隶属小区修改
---
WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 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 26ecbda..7b394f2 100644
--- a/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
+++ b/WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html
@@ -1,46 +1,41 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
- <div class="row">
- <div class="col-lg-4" style="background: #fff;">
- <div id="orgTree" class=""></div>
+ <div class="row" v-show="orgManageInfo.showBelongCommunity == false">
+ <div class="col-lg-3">
+ <div id="orgTree" class="" style="background: #fff;"></div>
</div>
- <div class="col-lg-8">
+ <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;"
+ <!--<button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
v-on:click="_moreCondition()">{{orgManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}
- </button>
+ </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 class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ョ粍缁嘔D"
+ v-model="orgManageInfo.conditions.orgId"
+ class=" form-control">
</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>
+ <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.orgName"
+ <input type="text" placeholder="璇烽�夋嫨灏忓尯"
+ v-model="orgManageInfo.conditions.communityId"
class=" form-control">
</div>
</div>
@@ -51,17 +46,6 @@
</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>
@@ -89,7 +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-right">鎿嶄綔</th>
</tr>
</thead>
<tbody>
@@ -98,15 +82,22 @@
<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">
+ <td class="text-right">
+
+
+ <div class="btn-group" v-if="org.allowOperation == 'T'">
<button class="btn-white btn btn-xs" v-on:click="_openEditOrgModel(org)">
淇敼
</button>
</div>
- <div class="btn-group" v-if="org.orgLevel != 1">
+ <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">
+ <button class="btn-white btn btn-xs" v-on:click="_openBeyondCommunity(org)">
+ 闅跺睘灏忓尯
</button>
</div>
</td>
@@ -130,6 +121,10 @@
</div>
</div>
+ <div v-if="orgManageInfo.showBelongCommunity == true">
+ <vc:create name="orgCommunityManage"></vc:create>
+ </div>
+
<vc:create name="addOrg"
callBackListener=""
callBackFunction=""
@@ -137,4 +132,5 @@
<vc:create name="editOrg"></vc:create>
<vc:create name="deleteOrg"></vc:create>
+
</div>
--
Gitblit v1.8.0