From 71a5ce92795fb1a4fbff5fceab8135ec98a691e5 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:07:52 +0900
Subject: [PATCH] 이슈 목록 조회 방식 - 전체이슈 보기 / 상위 이슈만 보기 / 하위 이슈만 보기로 수정
---
src/main/webapp/views/issue/issueSendMailPartners.html | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 40eb4af..eeba1c9 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -11,35 +11,38 @@
<div class="modal-body">
<form role="form" name="issueSendForm">
<div class="form-group">
- <small translate="issue.sendIssueSelectedUsers">�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
+ <div ng-if="vm.form.account[0].account.length < 1" class="help-block form-text text-danger"
+ translate="issue.sendIssueSelectedNotPartners">�빐�떦 �씠�뒋�뿉 �냽�빐 �엳�뒗 �뙆�듃�꼫 �떞�떦�옄媛� �뾾�뒿�땲�떎.</div>
+ <small ng-if="vm.form.account[0].account.length > 0" translate="issue.sendIssueSelectedPartners">�빐�떦 �씠�뒋�뿉 �냽�빐 �엳�뒗 �뙆�듃�꼫 �떞�떦�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</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" ng-repeat="user in vm.form.account[0].account track by $index">
+ <span>{{vm.form.account[0].name[$index]}}({{user}})</span>
<span class="select3-selection__choice__remove"
ng-click="fn.removeMailTarget($index)">횞</span>
</span>
</div>
- <label class="issue-label mt-10">
+ <!--<label class="issue-label mt-10">
<span translate="issue.selectPartners">�뾽泥� �꽑�깮</span> <code class="highlighter-rouge">*</code>
</label>
<js-input-autocomplete data-input-name="mailUsers"
owl-auto-focus
target=".auto-complete-i0nput"
- selected-model="vm.form.mailUsers"
+ selected-model="vm.form.account[0].account"
custom-input="true"
search="vm.userName"
page="vm.autoCompletePage.user.page"
total-page="vm.autoCompletePage.user.totalPage"
- source="fn.getMailTargetAll(vm.form.mailUsers)"
+ source="fn.getMailTargetAll(vm.form.account[0])"
translation-texts="{ empty : 'common.emptyCompanyPartners'}"
- input-disabled="vm.form.mailUsers == null"
+ input-disabled="vm.form.account[0].account == null"
+ broad-cast="getMailTarget"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
- type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
+ type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>-->
<div class="form-group mb10 mt-20">
<label for="emailTemplateForm" class="issue-label">
- <span translate="issue.partners">�뾽泥� �씠硫붿씪</span> <code class="highlighter-rouge">*</code>
+ <span translate="issue.selectTemplate">�뀥�뵆由� �꽑�깮</span> <code class="highlighter-rouge">*</code>
</label>
<select id="emailTemplateForm"
name="emailTemplate"
@@ -73,6 +76,53 @@
ng-model="vm.html"
target=".note-editable"></summernote>
</div>
+
+ <div class="form-group mgb5 mt-10">
+ <label class="issue-label"><span translate="common.attachFiles">�뙆�씪 泥⑤�</span></label>
+ <div class="filebox input-group">
+ <input class="upload-name form-control"
+ placeholder="{{'users.pleaseSelectFile' | translate}}"
+ tabindex="-1"
+ disabled="disabled">
+ <label for="uploadFileField"><span
+ translate="common.selectFile">�뙆�씪�꽑�깮</span></label>
+ <input id="uploadFileField"
+ tabindex="-1"
+ type="file"
+ class="form-control"
+ multiple
+ ng-file-select="fn.onFileSelect($files)">
+ </div>
+
+ <div class="select2-selection__choicediv">
+ <div class="select2-selection__choice2" ng-repeat="file in vm.form.files">
+ <div class="select2-selection__choice2__remove" ng-click="fn.removeUploadFile($index)">
+ 횞
+ </div>
+ <div class="ssg-items ssg-items-blocks">
+ <div class="ssg-item">
+ <div class="item-icon">
+ <!-- 臾몄꽌 -->
+ <i class="os-icon os-icon-file-text" ng-if="file.fileType == 'DOC'"></i>
+ <!-- 誘몃뵒�뼱 -->
+ <i class="os-icon os-icon-film" ng-if="file.fileType == 'MEDIA'"></i>
+ <!-- �씠誘몄�(�뾽濡쒕뱶 �쟾) -->
+ <i class="os-icon os-icon-documents-07"
+ ng-if="file.fileType == 'IMAGE'"></i>
+ <!-- 湲고� -->
+ <i class="os-icon os-icon-ui-51" ng-if="file.fileType == 'ETC'"></i>
+ </div>
+ <div class="item-name">
+ <small>{{file.name}}</small>
+ </div>
+ <div class="item-amount">
+ ({{file.size/1024/1024 | number:2}} MB)
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</form>
</div>
--
Gitblit v1.8.0