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/scripts/app/workspace/workspaceUserConfig.controller.js | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index d7cf0ac..1c6cfd5 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -47,6 +47,7 @@
};
$scope.vm.levels = [];
+ $scope.vm.departments = [];
$scope.vm.tableConfigs = [];
$scope.vm.responseData = {
data : []
@@ -56,7 +57,7 @@
$scope.vm.tableEvent = {
modifyUserWorkspace : modifyUserWorkspace, // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
modifyLevel : modifyLevel, // �궗�슜�옄 �벑湲됰챸 蹂�寃�
- //modifyDepartment : modifyDepartment // 遺��꽌 蹂�寃�
+ departmentModify : departmentModify // 遺��꽌 蹂�寃�
};
// �궗�슜�옄 �벑湲� �닔�젙
@@ -65,6 +66,24 @@
templateUrl : 'views/workspace/workspaceLevelModify.html',
size : "md",
controller : 'levelModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ //levelName : [$scope.vm.form.]
+ };
+ }
+ }
+ });
+ }
+
+ // 遺��꽌 �닔�젙
+ function departmentModify(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentModify.html',
+ size : "md",
+ controller : 'departmentModifyController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -212,7 +231,9 @@
angular.forEach($scope.vm.responseData.data, function (data) {
// data.levelId = $scope.vm.levels[idx].fieldKey;
data.levels = [];
+ data.departments = [];
data.levels = $scope.vm.levels.slice();
+ data.departments = $scope.vm.departments.slice();
idx++;
});
}
@@ -251,12 +272,12 @@
// 遺��꽌 紐⑸줉
function getDepartments() {
var deferred = $q.defer();
+ $scope.vm.departments = [];
UserWorkspace.departmentFind($resourceProvider.getContent({},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.search.departments = result.data.data;
angular.forEach(result.data.data, function (department) {
$scope.vm.departments.push({
fieldKey : department.id,
--
Gitblit v1.8.0