From 4fb5816b684f0b7b36da4e51c3db0d93de5b9971 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 08 11월 2021 19:08:14 +0900
Subject: [PATCH] 업체 관리 프론트 수정
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 26 +++++++++-----------------
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 2 +-
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 9 +++++++++
src/main/webapp/scripts/components/companyField/companyField.service.js | 2 +-
4 files changed, 20 insertions(+), 19 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 e475259..a18aa93 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -366,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 = [];
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 8019895..bca5967 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -51,7 +51,7 @@
manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
email : $scope.vm.form.email, //�씠硫붿씪
- desc : $scope.vm.form.desc //鍮꾧퀬
+ memo : $scope.vm.form.memo //鍮꾧퀬
};
CompanyField.add($resourceProvider.getContent(content,
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 4e80b88..99d318e 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -68,35 +68,27 @@
.setDName("name")
.setDType("renderer")
.setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDRenderer("COMPANYFIELD_MODIFY"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.manager")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("manager")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.tel")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("tel")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.email")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("email")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.desc")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("memo")
+ .setDAlign("text-center"));
}
// �뾽泥� 愿�由� 紐⑸줉 議고쉶
diff --git a/src/main/webapp/scripts/components/companyField/companyField.service.js b/src/main/webapp/scripts/components/companyField/companyField.service.js
index 2783235..109e6ab 100644
--- a/src/main/webapp/scripts/components/companyField/companyField.service.js
+++ b/src/main/webapp/scripts/components/companyField/companyField.service.js
@@ -32,7 +32,7 @@
return response;
});
},
- remove : function (conditions) {
+ removes : function (conditions) {
return $http.post("companyField/remove", conditions).then(function (response) {
$log.debug("�뾽泥� �궘�젣 寃곌낵 : ", response);
return response;
--
Gitblit v1.8.0