From fbcad460c73917d721f7008bd724d6eaabf8d089 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 일, 05 12월 2021 14:00:04 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js index a6a44a2..c40379b 100644 --- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js +++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js @@ -16,7 +16,7 @@ formSubmit : formSubmit, // �뤌 �쟾�넚 formCheck : formCheck, // �뤌 泥댄겕 changeTemplate : changeTemplate, - showEmailTemplate : showEmailTemplate, + // showEmailTemplate : showEmailTemplate, }; $scope.vm = { @@ -82,6 +82,7 @@ if (result.data.message.status === "success") { SweetAlert.success($filter("translate")("issue.succeededIssueMail"), $filter("translate")("issue.sentToTheSelectedUser")); // "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�" $scope.fn.cancel(); + $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId}); } else { SweetAlert.error($filter("translate")("issue.failedIssueMail"), result.data.message.message); // "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣" @@ -134,26 +135,42 @@ elements[i].className = "TemplateIMG"; } } - } - function showEmailTemplate() { const div1 = document.getElementById('Email-Template1'); const div2 = document.getElementById('Email-Template2'); + const div3 = document.getElementById('Email-Template3'); + const div4 = document.getElementById('Email-Template4'); - if(div1.style.display === 'none') { + + if(div1.style.display === 'none' && div4.style.display === 'none') { div1.style.display = 'block'; - } else if (div1.style.display === 'block') { + div4.style.display = 'block'; + } else if (div1.style.display === 'block' && div4.style.display === 'block') { div1.style.display = 'none'; + div4.style.display = 'none'; } - if (div2.style.display == 'none') { + + if (div2.style.display === 'none' && div4.style.display === 'none') { div2.style.display = 'block'; - } else if (div2.style.display == 'block') { + div4.style.display = 'block' + } else if (div2.style.display === 'block' && div4.style.display === 'block'){ div2.style.display = 'none'; + div4.style.display = 'none' + } + + if (div3.style.display == 'none' && div4.style.display === 'none') { + div3.style.display = 'block'; + div4.style.display = 'block'; + } else if (div3.style.display === 'block' && div4.style.display === 'block'){ + div3.style.display = 'none'; + div4.style.display = 'none'; + } + + if (div4.style.display == 'none' || div4.style.display === 'block') { + div4.style.display = 'block'; + } else { + div4.style.display = 'none'; } } }]); }); -// $("Email-Template1").toggle(500) // show -// document.getElementById("Email-Template1").style.display = "none"; // hide -// $("Email-Template2").toggle(500) ; // show -// document.getElementById("Email-Template2").style.display = "none"; // hide \ No newline at end of file -- Gitblit v1.8.0