From 9c283e735476f1106262de58b4042f30acf61a45 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 14:54:27 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueSendMailPartners.html | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index ed4011a..6fdc84d 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -24,6 +24,7 @@
owl-auto-focus
target=".auto-complete-i0nput"
selected-model="vm.form.mailUsers"
+ custom-input="true"
search="vm.userName"
page="vm.autoCompletePage.user.page"
total-page="vm.autoCompletePage.user.totalPage"
@@ -33,14 +34,29 @@
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
<div class="Template-area mt-20">
- <label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�</label>
- <div class="mt-20">
- <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
- <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
- <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
- </div>
- <input class="btn-toggled btn-primary table-bordered" style="float: left" type="button" value="�뀥�뵆由�" ng-click="fn.showEmailTemplate()">
+ <div class="form-group mb10">
+ <label for="emailTemplateForm" class="issue-label">
+ <span translate="common.emailTemplate">�씠硫붿씪 �뀥�뵆由�</span>
+ </label>
+ <select id="emailTemplateForm"
+ name="emailTemplate"
+ class="form-control input-sm issue-select-label"
+ ng-model="vm.emailTemplateType"
+ ng-change="fn.onChangeEmailTemplate()"
+ required>
+ <option ng-repeat="emailTemplate in vm.emailTemplates"
+ value="{{emailTemplate.templateType}}"
+ translate="{{emailTemplate.title}}">
+ </option>
+ </select>
+ </div>
</div>
+ <summernote
+ class="summernote"
+ lang="ko-KR"
+ config="vm.options"
+ ng-model="vm.html"
+ target=".note-editable"></summernote>
</div>
</form>
</div>
@@ -53,9 +69,5 @@
ng-disabled="fn.formCheck(issueSendForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="issue.sendMail">�씠硫붿씪 諛쒖넚</span>
</button>
- </div>
- <div>
- <img style="height: 350px; width: 330px; display: none; margin: 0 auto;" class="mt-20" id="Email-Template1" src="assets/images/email-temp-detail.png">
- <img style="height: 350px; width: 330px; display: none; margin: 0 auto;" class="mt-20 mb-30" id="Email-Template2" src="assets/images/email-temp.png">
</div>
</div>
\ No newline at end of file
--
Gitblit v1.8.0