From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 목, 09 12월 2021 14:35:15 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/app/issue/issueAdd.controller.js | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js index 5dbac8d..5da56d6 100644 --- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js @@ -69,6 +69,7 @@ companyManager : "", // �뾽泥� �떞�떦�옄 companyTel : "", // �뾽泥� �쟾�솕踰덊샇 companyEmail : "", // �뾽泥� �씠硫붿씪 + companyUrl : "", // �뾽泥� url companyMemo : "", // �뾽泥� 鍮꾧퀬 ispId : -1, // ISP ID ispName : "", // ISP 紐� @@ -76,12 +77,14 @@ ispManager : "", // ISP �떞�떦�옄 ispTel : "", // ISP �쟾�솕踰덊샇 ispEmail : "", // ISP �씠硫붿씪 + ispUrl : "", // url ispMemo : "", // ISP 鍮꾧퀬 hostingId : -1, // �샇�뒪�똿 ID hostingName : "", // �샇�뒪�똿紐� 寃��깋 hostingManager : "", // �샇�뒪�똿 �떞�떦�옄 hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇 hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪 + hostingUrl : "", // url hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬 autoCompletePage : { @@ -385,13 +388,32 @@ // �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set) $scope.$on("companyFieldEvent", function (event, result) { + var ispFieldVos = result[0].ispFieldVos[0]; + var hostingFieldVos = result[0].hostingFieldVos[0]; + $scope.vm.companyId = result[0].id; $scope.vm.companyName = result[0].name; $scope.vm.companyManager = result[0].manager; $scope.vm.companyTel = result[0].tel; $scope.vm.companyEmail = result[0].email; + $scope.vm.companyUrl = result[0].url; $scope.vm.companyMemo = result[0].memo; + $scope.vm.ispName = ispFieldVos.name; + $scope.vm.ispCode = ispFieldVos.code; + $scope.vm.ispManager = ispFieldVos.manager; + $scope.vm.ispTel = ispFieldVos.tel; + $scope.vm.ispEmail = ispFieldVos.email; + $scope.vm.ispUrl = ispFieldVos.url; + $scope.vm.ispMemo = ispFieldVos.memo; + + $scope.vm.hostingName = hostingFieldVos.name; + $scope.vm.hostingCode = hostingFieldVos.code; + $scope.vm.hostingManager = hostingFieldVos.manager; + $scope.vm.hostingTel = hostingFieldVos.tel; + $scope.vm.hostingEmail = hostingFieldVos.email; + $scope.vm.hostingUrl = hostingFieldVos.url; + $scope.vm.hostingMemo = hostingFieldVos.memo; }); // ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set) @@ -402,6 +424,7 @@ $scope.vm.ispManager = result[0].manager; $scope.vm.ispTel = result[0].tel; $scope.vm.ispEmail = result[0].email; + $scope.vm.ispUrl = result[0].url; $scope.vm.ispMemo = result[0].memo; }); @@ -413,6 +436,7 @@ $scope.vm.hostingManager = result[0].manager; $scope.vm.hostingTel = result[0].tel; $scope.vm.hostingEmail = result[0].email; + $scope.vm.hostingUrl = result[0].url; $scope.vm.hostingMemo = result[0].memo; }); @@ -506,6 +530,7 @@ manager : $scope.vm.companyManager, tel : $scope.vm.companyTel, email :$scope.vm.companyEmail, + url :$scope.vm.companyUrl, memo : $scope.vm.companyMemo }); } @@ -526,6 +551,7 @@ manager : $scope.vm.ispManager, tel : $scope.vm.ispTel, email :$scope.vm.ispEmail, + url :$scope.vm.ispUrl, memo : $scope.vm.ispMemo }; @@ -548,6 +574,7 @@ manager : $scope.vm.hostingManager, tel : $scope.vm.hostingTel, email :$scope.vm.hostingEmail, + url :$scope.vm.hostingUrl, memo : $scope.vm.hostingMemo }; } @@ -728,7 +755,6 @@ }); break; } - $scope.vm.form.issueCustomFields.push(issueTypeCustomField); }); } -- Gitblit v1.8.0