From 836af5be0ec8b59171d7c7ffa392a6bd234f0af7 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 12 1월 2022 20:24:51 +0900 Subject: [PATCH] 업체 정보 일괄 import 기능 --- src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js index 902cadf..fa84c74 100644 --- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js +++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js @@ -19,6 +19,7 @@ add : add, //�뾽泥� �깮�꽦 makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶 removes : removes, //�뾽泥� �궘�젣 + importExcel : importExcel, // �뿊�� import 湲곕뒫 �뙘�뾽 �샇異� }; // 蹂��닔 @@ -45,6 +46,11 @@ // �뾽泥� 愿�由� 由ъ뒪�듃 遺덈윭�삤湲� $scope.$on("getPageList", function () { + $scope.fn.getPageList(0); + }); + + // �뾽泥� 紐⑸줉 �뜲�씠�꽣 媛깆떊 + $scope.$on("getCompanyFieldList", function () { $scope.fn.getPageList(0); }); @@ -157,24 +163,28 @@ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶 result.data.data.forEach(function (data) { if (data.tel != null && data.tel !== "") { - var tels = data.tel.substr(1, data.tel.indexOf("]")-1); - var telArr = tels.split(","); + if (data.tel.indexOf("[") !== -1){ + var tels = data.tel.substr(1, data.tel.indexOf("]")-1); + var telArr = tels.split(","); - 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 (telArr[i] === "") { - telArr.splice(i,1); + 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 (telArr[i] === "") { + telArr.splice(i,1); + } } + data.tel = telArr.join(); } - data.tel = telArr.join(); } }); // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� result.data.data.forEach(function (data) { if (data.email != null && data.email !== "") { - data.email = data.email.substr(1, data.email.indexOf("]")-1); + if (data.email.indexOf("[") !== -1){ + data.email = data.email.substr(1, data.email.indexOf("]")-1); + } } }); @@ -219,6 +229,16 @@ }); } + // �뿊�� import �뙘�뾽 �샇異� + function importExcel() { + $uibModal.open({ + templateUrl : 'views/companyField/companyFieldExcelImport.html', + size : "lg", + controller : 'companyFieldImportExcelController', + backdrop : 'static' + }); + } + // �뾽泥� �궘�젣 function removes() { var removeIds = []; -- Gitblit v1.8.0