From 235dc86c096fcf06b0ff5d4ac31f754f44fc320e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 08 11월 2021 18:00:41 +0900
Subject: [PATCH] 업체 관리 백엔드 수정

---
 src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js |   43 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index 51cd538..9da25a4 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -36,7 +36,6 @@
                         fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
                     }, {
                         fieldKey : "N",
-                        //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
                         fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
                     }]
                 };
@@ -47,6 +46,7 @@
                 };
 
                 $scope.vm.levels = [];
+                $scope.vm.departments = [];
                 $scope.vm.tableConfigs = [];
                 $scope.vm.responseData = {
                     data : []
@@ -56,7 +56,7 @@
                 $scope.vm.tableEvent = {
                     modifyUserWorkspace : modifyUserWorkspace,   //  �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
                     modifyLevel : modifyLevel,   //  �궗�슜�옄 �벑湲됰챸 蹂�寃�
-                    //modifyDepartment : modifyDepartment //  遺��꽌 蹂�寃�
+                    departmentModify : departmentModify //  遺��꽌 蹂�寃�
                 };
 
                 //  �궗�슜�옄 �벑湲� �닔�젙
@@ -65,6 +65,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 () {
@@ -181,7 +199,7 @@
 
                             return statuses;
                         })(),
-                        levels : (function () {
+                        levelIds : (function () {
                             var levels = [];
 
                             angular.forEach($scope.vm.search.levels, function (level) {
@@ -190,7 +208,7 @@
 
                             return levels;
                         })(),
-                        departments : (function () {
+                        departmentIds : (function () {
                             var departments = [];
 
                             angular.forEach($scope.vm.search.departments, function (department) {
@@ -210,11 +228,19 @@
 
                             var idx = 0;
                             angular.forEach($scope.vm.responseData.data, function (data) {
-                                data.levelId = 3; /*$scope.vm.levels[idx].id;*/
+                                // data.levelId = $scope.vm.levels[idx].fieldKey;
+                                //data.department = $scope.vm.departments[idx];
+
                                 data.levels = [];
+                                data.departments = [];
                                 data.levels = $scope.vm.levels.slice();
+                                data.departments = $scope.vm.departments.slice();
                                 idx++;
                             });
+                            /*if(result.data.data[idx-1].departmentId == 0){
+                                //console.log($scope.vm.tableConfigs);
+                                //result.data.data[idx-1].department.fieldValue = '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.';
+                            }*/
                         }
                         else {
                             SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -231,7 +257,6 @@
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
 
                         if (result.data.message.status === "success") {
-                            $scope.vm.search.levels = result.data.data;
                             angular.forEach(result.data.data, function (level) {
                                 $scope.vm.levels.push({
                                     fieldKey : level.id,
@@ -240,7 +265,7 @@
                             });
                         }
                         else {
-                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
+                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullLevelList"), result.data.message.message, "error"); // �슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣
                         }
 
                         deferred.resolve(result.data.data);
@@ -252,12 +277,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,
@@ -266,7 +291,7 @@
                             });
                         }
                         else {
-                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
+                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message, "error"); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
                         }
 
                         deferred.resolve(result.data.data);

--
Gitblit v1.8.0