From fe1b9e8b4e54fb22022a0d13cc57b72bc8ba9840 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 05 11월 2021 19:12:00 +0900
Subject: [PATCH] "부서 관리" 및 "사용자 관리" 프론트 완료
---
src/main/webapp/views/workspace/workspaceDepartmentConfig.html | 67 +++++++++++----------------------
1 files changed, 23 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
index cb4b263..39c51bf 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -1,4 +1,4 @@
-<div class="row" ng-controller="workspaceDepartmentConfigController">
+<!--<div class="row" ng-controller="workspaceDepartmentConfigController">
<div class="col-lg-12">
<div class="projects-list">
<div class="project-box">
@@ -36,11 +36,11 @@
</div>
<div class="col-lg-3 text-center b-r">
<div class="el-tablo highlight">
- <!--
+ <!–
<div class="label" translate="managementWorkspace.waitForParticipation">
李몄뿬 ��湲�
</div>
- -->
+ –>
<div class="label" translate="managementWorkspace.withdrawal">
�깉�눜
</div>
@@ -66,9 +66,9 @@
</div>
</div>
</div>
-</div>
+</div>-->
-<div class="row">
+<div class="row" ng-controller="workspaceDepartmentConfigController">
<div class="col-lg-12">
<div class="element-box">
<div class="searchdiv">
@@ -76,36 +76,18 @@
<div class="row">
<div class="col-xl-2">
<div class="form-group">
- <label translate="common.name">�씠由�</label>
- <input class="form-control" type="text" ng-model="vm.search.name" maxlength="10">
- </div>
- </div>
-
- <div class="col-xl-3">
- <div class="form-group">
- <label translate="common.status">�긽�깭</label>
- <ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name="statuses"
- selected-model="vm.search.statuses"
- extra-settings="{ stringTypeOption : true }"
- options="vm.options.statuses"></ng-dropdown-multiselect>
- </div>
- </div>
-
- <div class="col-xl-3">
- <div class="form-group">
- <label translate="common.email">�씠硫붿씪</label>
- <input class="form-control" type="text" ng-model="vm.search.account" maxlength="50">
+ <label translate="common.departmentName">遺��꽌紐�</label>
+ <input class="form-control" type="text" ng-model="vm.search.departmentName" maxlength="10">
</div>
</div>
<div class="col-xl-4">
<div class="form-group form-buttons-w2">
- <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
+ <button class="btn btn-xlg btn-navy" ng-click="fn.getDepartmentList(0)">
<i class="os-icon os-icon-ui-37"></i>
<span translate="common.search">寃��깋</span>
</button>
- <button class="btn btn-xlg btn-white" ng-click="fn.initSearch()">
+ <button class="btn btn-xlg btn-white" ng-click="fn.initSearchDepartment()">
<i class="os-icon os-icon-grid-18"></i>
<span translate="common.reset">珥덇린�솕</span>
</button>
@@ -132,28 +114,25 @@
</label>
</div>
</div>
- <!--<div class="col-sm-6 text-right">
- <div class="btn-group">
- <button aria-expanded="false"
- aria-haspopup="true"
- class="btn btn-secondary dropdown-toggle"
- data-toggle="dropdown"
- type="button">異붽�湲곕뒫
- </button>
- <div aria-labelledby="dropdownMenuButton2"
- class="dropdown-menu"
- x-placement="bottom-start"
- style="position: absolute; transform: translate3d(0px, 30px, 0px); top: 0px; left: 0px; will-change: transform;">
- <a class="dropdown-item" href="#"> �궘�젣</a>
+ <div class="col-sm-6 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')">
+ <form class="form-inline justify-content-sm-end pull-right ng-pristine ng-valid" method="post" action="/departmentManage/downloadExcel" name="departmentManageListForm">
+ <input type="hidden" name="conditions" autocomplete="off">
+ <div class="btn-group">
+ <button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">異붽�湲곕뒫</span>
+ </button>
+ <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="departmentManageListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ </div>
</div>
- </div>
- </div>-->
+ </form>
+ </div>
</div>
</div>
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs"
- event="vm.tableEvent"></js-table>
+ <js-table data="vm.responseData.data" table-configs="vm.tableConfigs2"
+ event="vm.tableEvent2"></js-table>
</div>
<div class="controls-below-table text-center">
--
Gitblit v1.8.0