From a227dd7df7f84a5cfb7218042a6f844991dcfb96 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 09 2월 2022 14:53:41 +0900
Subject: [PATCH] - isp, 호스팅 엑셀 import 기능 추가
---
src/main/webapp/scripts/app/ispField/ispFieldList.controller.js | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
index 37a760c..d7df780 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
@@ -19,7 +19,8 @@
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //ISP �깮�꽦
removes : removes, //ISP �궘�젣
- makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶
+ makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
+ importExcel : importExcel, // �뿊�� import 湲곕뒫 �뙘�뾽 �샇異�
};
// 蹂��닔
@@ -46,6 +47,11 @@
// iSP 愿�由� 由ъ뒪�듃 遺덈윭�삤湲�
$scope.$on("getPageList", function () {
+ $scope.fn.getPageList(0);
+ });
+
+ // iSP 紐⑸줉 �뜲�씠�꽣 媛깆떊
+ $scope.$on("getIspFieldList", function () {
$scope.fn.getPageList(0);
});
@@ -136,8 +142,8 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
if (data.tel != null && data.tel !== "") {
var tels = data.tel;
if (data.tel.indexOf("[") !== -1){
@@ -147,20 +153,25 @@
for (var i = 0; i < telArr.length; i++) {
let hyphen = telArr[i].trim();
- telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ }
if (telArr[i] === "") {
telArr.splice(i,1);
}
}
data.tel = telArr.join();
+ data.tel = data.tel.replace(/\,/g,"</br>");
}
- });
-
- // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
- result.data.data.forEach(function (data) {
- if (data.email != null && data.email !== "") {
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
if (data.email.indexOf("[") !== -1){
data.email = data.email.substr(1, data.email.indexOf("]")-1);
+ }
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
}
}
});
@@ -266,6 +277,16 @@
});
}
+ // �뿊�� import �뙘�뾽 �샇異�
+ function importExcel() {
+ $uibModal.open({
+ templateUrl : 'views/ispField/ispFieldExcelImport.html',
+ size : "lg",
+ controller : 'ispFieldImportExcelController',
+ backdrop : 'static'
+ });
+ }
+
function makeSearchConditions() {
var conditions = {
name: $scope.vm.search.name
--
Gitblit v1.8.0