From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index fef5e19..d3acb3c 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -17,7 +17,8 @@
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //�뾽泥� �깮�꽦
- removes : removes //�뾽泥� �궘�젣
+ makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
+ removes : removes, //�뾽泥� �궘�젣
};
// 蹂��닔
@@ -31,6 +32,11 @@
$scope.vm.search = {
name : "", // �뾽泥대챸
+ };
+
+ $scope.vm.page = {
+ selectedPage : 0,
+ selectedPageRowCount : String(10)
};
$scope.vm.responseData = {
@@ -48,6 +54,13 @@
$scope.fn.getPageList(0);
}
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ function makeSearchConditions() {
+ return{
+ name: $scope.vm.search.name
+ };
+ }
+
// �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
@@ -62,35 +75,32 @@
.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")
+ .setHName("companyField.url")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.memo")
+ .setHWidth("bold")
+ .setDName("memo")
+ .setDAlign("text-center"));
}
// �뾽泥� 愿�由� 紐⑸줉 議고쉶
@@ -109,9 +119,8 @@
currentPage = selectedPage;
}
- var conditions = {
- name : $scope.vm.search.name //�뾽泥대챸
- };
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = $scope.fn.makeSearchConditions();
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
CompanyField.find($resourceProvider.getContent(conditions,
@@ -123,7 +132,7 @@
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣
}
});
}
@@ -133,7 +142,7 @@
$uibModal.open({
templateUrl : 'views/companyField/companyFieldAdd.html',
size : "md",
- controller : 'companyFieldModifyController',
+ controller : 'companyFieldAddController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -182,8 +191,8 @@
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("managementWorkspace.deleteDepartment"), // "�뾽泥� �궘�젣"
- text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ title : $filter("translate")("companyField.delete"), // "�뾽泥� �궘�젣"
+ text : $filter("translate")("companyField.wantToDeleteSelectCompanyField"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -222,7 +231,7 @@
}
$scope.fn.makeTableConfigs();
- //$scope.fn.getPageList();
+ $scope.fn.getPageList();
}
]);
}
--
Gitblit v1.8.0