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 | 54 +++++++++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 4e80b88..d3acb3c 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -17,8 +17,8 @@
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //�뾽泥� �깮�꽦
+ makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
removes : removes, //�뾽泥� �궘�젣
- makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶
};
// 蹂��닔
@@ -54,6 +54,13 @@
$scope.fn.getPageList(0);
}
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ function makeSearchConditions() {
+ return{
+ name: $scope.vm.search.name
+ };
+ }
+
// �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
@@ -68,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"));
}
// �뾽泥� 愿�由� 紐⑸줉 議고쉶
@@ -115,9 +119,8 @@
currentPage = selectedPage;
}
- var conditions = {
- name : $scope.vm.search.name //�뾽泥대챸
- };
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = $scope.fn.makeSearchConditions();
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
CompanyField.find($resourceProvider.getContent(conditions,
@@ -225,13 +228,6 @@
});
}
});
- }
-
- function makeSearchConditions() {
- var conditions = {
- name: $scope.vm.search.name
- }
- return conditions;
}
$scope.fn.makeTableConfigs();
--
Gitblit v1.8.0