From 9f7091d2bf6e1353e3e747f3db49a0b933c2bd1d Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 11 11월 2021 21:38:10 +0900
Subject: [PATCH] 사용자 관리 부서 상세 백앤드 수정
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 527d5ed..2e2c309 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -132,6 +132,21 @@
makeTag += "</ul>";
break;
+ case "USE_DEPARTMENT_LIST" :
+ makeTag += "<ul class='ul-not-comma'>";
+
+ if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
+ makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ }else{
+ makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ }
+ makeTag += "</ul>";
+ break;
+
case "CONFIG" :
makeTag += '<a ng-click="event.modify(data.id)"><i class="fa fa-pencil fa-lg" uib-tooltip="�닔�젙"></i></a>';
break;
@@ -330,15 +345,31 @@
case "DEPARTMENT_MODIFY":
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
- makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartment(data.id)'>" + scope.data.departmentName + "</span>";
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.departmentModify(data.id)'>" + scope.data.departmentName + "</span>";
}
else {
makeTag += "<span class='titlename cursor table-word-break-all'>" + scope.data.departmentName + "</span>";
}
break;
- case "DEPARTMENT_OPTION" :
- makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change=''><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ case "DEPARTMENT_COUNT":
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartmentCount(data.id)'>" + scope.data.departmentCount + "</span>";
+ }
+ else {
+ makeTag += "<span class='titlename cursor table-word-break-all'>" + scope.data.departmentCount + "</span>";
+ }
+ break;
+
+ case "DEPARTMENT_OPTION":
+ makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ /*if (scope.data.departmentId != null){
+ makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ }
+ else{
+ makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option>遺��꽌瑜� �꽑�깮 �븯�꽭�슂.</option>"
+ makeTag +="<option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ }*/
break;
case "LEVEL_OPTION" :
@@ -350,6 +381,33 @@
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
break;
+ case "COMPANYFIELD_MODIFY" :
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ else {
+ makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>";
+ }
+ break;
+
+ case "ISPFIELD_MODIFY" :
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ else {
+ makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>";
+ }
+ break;
+
+ case "HOSTINGFIELD_MODIFY" :
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ else {
+ makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>";
+ }
+ break;
+
case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
var values = [];
--
Gitblit v1.8.0