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 | 100 ++++++++++++++-----------------------------------
1 files changed, 29 insertions(+), 71 deletions(-)
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 9b3f8b8..6fdc84d 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -13,17 +13,18 @@
<div class="form-group">
<small translate="issue.sendIssueSelectedUsers">�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
<div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.mailUsers">
- <span>{{user.name}}({{user.account}})</span>
- <span class="select3-selection__choice__remove"
- ng-click="fn.removeMailTarget($index)">횞</span>
- </span>
+ <span class="select3-selection__choice" ng-repeat="user in vm.form.mailUsers">
+ <span>{{user.name}}({{user.account}})</span>
+ <span class="select3-selection__choice__remove"
+ ng-click="fn.removeMailTarget($index)">횞</span>
+ </span>
</div>
<js-input-autocomplete data-input-name="mailUsers"
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,13 +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">�씠硫붿씪 �뀥�뵆由�
- <div class="mt-20">
- <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/btn_naver.PNG" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
- <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/btn_google.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
- <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/btn_kakao.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
- </div>
+ <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,63 +70,4 @@
ng-click="fn.formSubmit()"><span translate="issue.sendMail">�씠硫붿씪 諛쒖넚</span>
</button>
</div>
-</div>
-
-<!-- <js-autocomplete-single data-input-name="issue"-->
-<!-- selected-model="vm.form.issues"-->
-<!-- search="vm.issueName"-->
-<!-- source="fn.getIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"-->
-<!-- page="vm.autoCompletePage.issue.page"-->
-<!-- total-page="vm.autoCompletePage.issue.totalPage"-->
-<!-- input-disabled="false"-->
-<!-- translation-texts="{ empty : 'common.emptyIssue' }"-->
-<!-- extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',-->
-<!-- type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
-
-
-<!-- <ng-dropdown-multiselect class="multiSelect cursor"-->
-<!-- data-input-name="companyFieldsEmail"-->
-<!-- selected-model="vm.form.companyFieldsEmail.concat(vm.form.ispFieldsEmail,vm.form.hostingFieldsEmail)"-->
-<!-- extra-settings="{ stringTypeOption : true }"-->
-<!-- options="vm.options.companyFieldsEmail"></ng-dropdown-multiselect>-->
-
-<!-- <span class="issue-detail-label" translate="companyField.info"></span>-->
-<!-- <input ng-if="vm.form.companyFieldsEmail != null"-->
-<!-- type="text"-->
-<!-- class="form-control"-->
-<!-- kr-input-->
-<!-- autocomplete="off"-->
-<!-- ng-model="vm.form.companyFieldsEmail">-->
-
-<!-- <span class="issue-detail-label" translate="ispField.info"></span>-->
-<!-- <input ng-if="vm.form.ispFieldsEmail != null"-->
-<!-- type="text"-->
-<!-- class="form-control"-->
-<!-- kr-input-->
-<!-- autocomplete="off"-->
-<!-- ng-model="vm.form.ispFieldsEmail">-->
-
-<!-- <span class="issue-detail-label" translate="hostingField.info"></span>-->
-<!-- <input ng-if="vm.form.hostingFieldsEmail != null"-->
-<!-- type="text"-->
-<!-- class="form-control"-->
-<!-- kr-input-->
-<!-- autocomplete="off"-->
-<!-- ng-model="vm.form.hostingFieldsEmail">-->
-
-<!-- <h6>{{vm.form.companyFieldsEmail}}</h6>-->
-<!-- <span>{{vm.form.id}}===============</span>-->
-<!-- <h6>{{vm.form.ispFieldsEmail}}===============</h6>-->
-<!-- <span>===============</span>-->
-<!-- <h6>{{vm.form.hostingFieldsEmail}}</h6>-->
-<!-- <div style="display: flex; text-align: center">-->
-<!-- �뀥�뵆由�1-->
-<!-- </div>-->
-<!-- <div style="border: 1px #111111; margin-left: 20px; box-sizing: border-box;">-->
-<!-- �뀥�뵆由�2-->
- <!-- <div style="border: 1px #111111; margin-left: 20px; box-sizing: border-box;">-->
-<!-- </div>-->
-<!-- <div style="border: 1px #111111; margin-left: 20px; box-sizing: border-box;">-->
-<!-- �뀥�뵆由�3-->
-<!-- </div>-->
-<!-- </div>-->
+</div>
\ No newline at end of file
--
Gitblit v1.8.0