From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index f668b2d..a9f1527 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -27,7 +27,7 @@
account : "", // �씠硫붿씪
statuses : [], // �긽�깭 - Y, N
levels : [], // �벑湲�
- departments: [] // 遺��꽌
+ departments: [], // 遺��꽌
};
$scope.vm.options = {
@@ -45,6 +45,7 @@
selectedPageRowCount : String(10)
};
+ $scope.vm.managerYn = false;
$scope.vm.levels = [];
$scope.vm.departments = [];
$scope.vm.tableConfigs = [];
@@ -176,23 +177,13 @@
var idx = 0;
angular.forEach($scope.vm.responseData.data, function (data) {
- // data.levelId = $scope.vm.levels[idx].fieldKey;
- //data.department = $scope.vm.departments[idx];
-
+ if (data.managerYn === "Y") {
+ $scope.vm.managerYn = true;
+ }
data.levels = [];
data.departments = [];
data.levels = $scope.vm.levels.slice();
data.departments = $scope.vm.departments.slice();
- /*if(result.data.data[idx].departmentId == null){
- data.departments = $scope.vm.departments.slice();
- data.departments.unshift({
- fieldKey : 'd',
- fieldValue : '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.'
- });
- result.data.data[idx].departmentId = 'd';
- } else{
- data.departments = $scope.vm.departments.slice();
- }*/
idx++;
});
}
@@ -273,9 +264,9 @@
// �궗�슜�옄媛� �냽�빐�엳�뒗 遺��꽌 �닔�젙 �뙘�뾽
function modifyUserDepartments(id, userId) {
$uibModal.open({
- templateUrl : 'views/workspace/workspaceDepartmentModify.html',
- size : "xlg",
- controller : 'workspaceDepartmentModifyController',
+ templateUrl : 'views/workspace/workspaceUserDepartmentModify.html',
+ size : "md",
+ controller : 'workspaceUserDepartmentModifyController',
backdrop : 'static',
windowClass : 'workflow-window',
resolve : {
--
Gitblit v1.8.0