From 56c40ebd05a576e6f7c40ac10c78ac0463cf4074 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 11:41:13 +0900
Subject: [PATCH] 이슈 업체메일보내기 클릭 시 업체/isp/hosting 이메일 다 안가져오는 문제 해결("업체 선택" 항목은 제거 처리)
---
src/main/webapp/views/issue/issueDetail.html | 129 +++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 2bbc36d..404e999 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -87,7 +87,7 @@
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
<span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
- <span class="cursor" ng-click="fn.issueBack()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
+ <span class="cursor" ng-click="fn.goParentIssue()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
</span>
<div class="">
@@ -102,12 +102,13 @@
</div>
</span>
<a class="show-ticket-info cursor">
- <i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
+ <i class="os-icon os-icon-email-2-at2 mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="吏곸젒 �옉�꽦�븳 硫붿씪 蹂대궡湲�"></i>
+ <i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="�뾽泥� 硫붿씪 蹂대궡湲�"></i>
<i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 蹂�寃� �씠�젰 �긽�꽭 蹂닿린"></i>
- <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"
- ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 諛쒖깮 �삁�빟 �븯湲�"></i>
+<!-- <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"-->
+<!-- ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 諛쒖깮 �삁�빟 �븯湲�"></i>-->
<i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
- ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
+ ng-if="vm.viewer.modifyPermissionCheck" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
<span ng-if="vm.issueIds.length != 0 && vm.issueIds.length != 1" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
@@ -314,11 +315,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="companyField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueCompanyVos)">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].email}}</span>
</div>
</div>
</div>
@@ -337,6 +347,51 @@
<div class="">
<span translate="companyField.memo">鍮꾧퀬</span>:
<span>{{vm.viewer.issueCompanyVos[0].memo}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.companyType">湲곗뾽援щ텇</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].companyTypeName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.parentSector">�뾽醫�(��遺꾨쪟)</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].parentSectorName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.childSector">�뾽醫�(以묐텇瑜�)</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].childSectorName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.region">吏��뿭</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].regionName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.status">�긽�깭</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].statusName}}</span>
</div>
</div>
</div>
@@ -384,11 +439,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="ispField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueIspVos)">{{vm.viewer.issueIspVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueIspVos[0].email}}</span>
</div>
</div>
</div>
@@ -455,11 +519,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="hostingField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueHostingVos)">{{vm.viewer.issueHostingVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueHostingVos[0].email}}</span>
</div>
</div>
</div>
@@ -498,12 +571,12 @@
tabindex="-1"
class="form-control form-control-sm"
ng-change="fn.changeDetailPageRowCount()"
- ng-model="vm.page.selectedRelPageRowCount">
+ ng-model="vm.subPage.selectedRelPageRowCount">
<option value="10">10</option>
<option value="50">50</option>
<option value="100">100</option>
- </select> {{vm.page.selectedRelPage}}-{{vm.responseData.relPage.totalPage}} /
- {{vm.responseData.relPage.totalCount | number}}<span translate="common.few">嫄�</span>
+ </select> {{vm.subPage.selectedRelPage}}-{{vm.responseData.relTotalPage}} /
+ {{vm.responseData.relTotalCount | number}}<span translate="common.few">嫄�</span>
</label>
</div>
</div>
@@ -524,8 +597,8 @@
<!-- �뿰愿� �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
- <js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
- event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
+ <js-rel data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
+ event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-rel>
<div class="row" ng-if="vm.viewer.modifyPermissionCheck">
<div class="col-sm-4">
@@ -556,7 +629,7 @@
ng-click="fn.addRelationIssue()"
translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button>
<button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
- ng-click="fn.addRelationIssueForm(vm.viewer.id)">
+ ng-click="fn.addRelationIssueForm(vm.viewer.id, vm.viewer.issueTypeVo.id)">
<i class="os-icon os-icon-plus"><span></span></i>
</button>
</div>
@@ -564,11 +637,11 @@
<div class="controls-below-table text-center">
<ul uib-pagination
boundary-links-numbes="true"
- items-per-page="vm.page.selectedRelPageRowCount"
- total-items="vm.responseData.relPage.totalCount"
- ng-model="vm.page.selectedRelPage"
+ items-per-page="vm.subPage.selectedRelPageRowCount"
+ total-items="vm.responseData.relTotalCount"
+ ng-model="vm.subPage.selectedRelPage"
max-size="10"
- ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)"
+ ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
class="pagination pagination-sm"
previous-text="<"
next-text=">"
@@ -598,12 +671,12 @@
tabindex="-1"
class="form-control form-control-sm"
ng-change="fn.changeDetailPageRowCount()"
- ng-model="vm.page.selectedDownPageRowCount">
+ ng-model="vm.subPage.selectedDownPageRowCount">
<option value="10">10</option>
<option value="50">50</option>
<option value="100">100</option>
- </select> {{vm.page.selectedDownPage}}-{{vm.responseData.downPage.totalPage}} /
- {{vm.responseData.downPage.totalCount | number}}<span translate="common.few">嫄�</span>
+ </select> {{vm.subPage.selectedDownPage}}-{{vm.responseData.downTotalPage}} /
+ {{vm.responseData.downTotalCount | number}}<span translate="common.few">嫄�</span>
</label>
</div>
</div>
@@ -625,8 +698,8 @@
<!-- �븯�쐞 �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
- <js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
- event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
+ <js-down data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
+ event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-down>
<div class="row" ng-if="vm.viewer.modifyPermissionCheck">
<div class="col-sm-6">
@@ -646,7 +719,7 @@
ng-click="fn.addDownIssue()"
translate="issue.addDownIssue">異붽�</button>
<button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
- ng-click="fn.addDownIssueForm(vm.viewer.id)">
+ ng-click="fn.addDownIssueForm(vm.viewer.id, vm.viewer.issueTypeVo.id)">
<i class="os-icon os-icon-plus"><span></span></i>
</button>
</div>
@@ -654,11 +727,11 @@
<div class="controls-below-table text-center">
<ul uib-pagination
boundary-links-numbes="true"
- items-per-page="vm.page.selectedDownPageRowCount"
- total-items="vm.responseData.downPage.totalCount"
- ng-model="vm.page.selectedDownPage"
+ items-per-page="vm.subPage.selectedDownPageRowCount"
+ total-items="vm.responseData.downTotalCount"
+ ng-model="vm.subPage.selectedDownPage"
max-size="10"
- ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)"
+ ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
class="pagination pagination-sm"
previous-text="<"
next-text=">"
--
Gitblit v1.8.0