From 491455286747cb100caee9ca12d9b5a94077b85e Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 18 1월 2022 10:07:11 +0900 Subject: [PATCH] 이슈 추가/수정 시 ISP, 호스팅 이름 못 불러오는 문제 해결 (custom-input) --- src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 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..c641fac 100644 --- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js +++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js @@ -15,10 +15,12 @@ $scope.fn = { getPageList : getPageList, // �뾽泥� 愿�由� 由ъ뒪�듃 makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙 + changePageRowCount : changePageRowCount, // �럹�씠吏� 蹂�寃� initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕 add : add, //�뾽泥� �깮�꽦 makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶 removes : removes, //�뾽泥� �궘�젣 + importExcel : importExcel, // �뿊�� import 湲곕뒫 �뙘�뾽 �샇異� }; // 蹂��닔 @@ -48,6 +50,11 @@ $scope.fn.getPageList(0); }); + // �뾽泥� 紐⑸줉 �뜲�씠�꽣 媛깆떊 + $scope.$on("getCompanyFieldList", function () { + $scope.fn.getPageList(0); + }); + // 寃��깋 議곌굔 珥덇린�솕 function initSearch() { $scope.vm.search.name = ""; @@ -59,6 +66,11 @@ return{ name: $scope.vm.search.name }; + } + + // �럹�씠吏� 蹂�寃� + function changePageRowCount() { + $scope.fn.getPageList(0); } // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙 @@ -157,7 +169,10 @@ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶 result.data.data.forEach(function (data) { if (data.tel != null && data.tel !== "") { - var tels = data.tel.substr(1, data.tel.indexOf("]")-1); + var tels = data.tel; + if (data.tel.indexOf("[") !== -1){ + tels = data.tel.substr(1, data.tel.indexOf("]")-1); + } var telArr = tels.split(","); for (var i = 0; i < telArr.length; i++) { @@ -174,7 +189,9 @@ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 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 +236,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