From 9a77ac9debf994f7fdb1941a808636e7fe7be2b0 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 13 1월 2022 18:13:01 +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 |   25 +++++++++++++++++++++++--
 1 files changed, 23 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..7aac655 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,7 +163,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 +183,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 +230,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