From 192a3725792baeab40584f01d6b55837ad5dec8a Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 08 11월 2021 20:39:42 +0900 Subject: [PATCH] 업체 관리 프론트 수정 --- src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 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..a18aa93 100644 --- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js +++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js @@ -330,15 +330,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 +366,15 @@ 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 "ISSUE_CUSTOM_FIELD_VALUE_VIEW" : var values = []; -- Gitblit v1.8.0