From fb0491479b2f1155a458f9cbd65b55d9c5a62e69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 13:06:40 +0900
Subject: [PATCH] 부서관리와 등급관리 삭제 시 충돌 버그 해결
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 49adc78..11d3190 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -18,7 +18,7 @@
$scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearchDepartment = initSearchDepartment; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
- $scope.fn.removes = removes; // 遺��꽌 �궘�젣
+ $scope.fn.removeDepartments = removeDepartments; // 遺��꽌 �궘�젣
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -69,7 +69,7 @@
.setDRenderer("DEPARTMENT_MODIFY"));
$scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentEx")
- .setHWidth("width-120-p")
+ .setHWidth("width-100-p bold")
.setDAlign("text-center")
.setDName("departmentDescription"));
$scope.vm.tableConfigs2.push($tableProvider.config()
@@ -139,9 +139,9 @@
// 遺��꽌 �닔�젙
function departmentModify(id) {
$uibModal.open({
- templateUrl : 'views/workspace/departmentModify.html',
+ templateUrl : 'views/workspace/workspaceDepartmentModify.html',
size : "md",
- controller : 'departmentModifyController',
+ controller : 'workspaceDepartmentModifyController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -171,7 +171,7 @@
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣 �뙘�뾽
- function removes() {
+ function removeDepartments() {
var removeIds = [];
angular.forEach($scope.vm.responseData.data, function (data) {
@@ -192,7 +192,7 @@
// �궘�젣 �븣由�
SweetAlert.swal({
title : $filter("translate")("managementWorkspace.deleteDepartment"), // "遺��꽌 �궘�젣"
- text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ text : $filter("translate")("managementWorkspace.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -231,7 +231,6 @@
}
$scope.fn.makeTableConfigs();
- $scope.fn.getDepartmentList();
}
]);
--
Gitblit v1.8.0