From 9f955be440cad5e6b868800ff0a0acd17c0a3004 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 15:30:35 +0900
Subject: [PATCH] - issue_company 테이블에 컬럼 추가 및 'tel' 컬럼 사이즈 변경 - 이슈 추가,수정 시 업체 추가된 항목들 추가 - 하위이슈 페이징 오류 수정
---
src/main/webapp/views/issue/issueDetail.html | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 111 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index e050dd6..00d275b 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -341,6 +341,51 @@
</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>
</div>
</div>
<div class="issue-detail-label">
@@ -492,7 +537,23 @@
<!--<div class="col-md-1">
<button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
</div>-->
- <div class="btn-group offset-11">
+ <div class="col-md-3 mt-2">
+ <div class="dataTables_length">
+ <label>
+ <select name="relPageRow"
+ tabindex="-1"
+ class="form-control form-control-sm"
+ ng-change="fn.changeDetailPageRowCount()"
+ ng-model="vm.subPage.selectedRelPageRowCount">
+ <option value="10">10</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ </select> {{vm.subPage.selectedRelPage}}-{{vm.responseData.relTotalPage}} /
+ {{vm.responseData.relTotalCount | number}}<span translate="common.few">嫄�</span>
+ </label>
+ </div>
+ </div>
+ <div class="btn-group" style="left: 975px; padding: 5px">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
class="btn btn-secondary dropdown-toggle"
@@ -541,10 +602,25 @@
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>
+ </div>
+ <div class="controls-below-table text-center">
+ <ul uib-pagination
+ boundary-links-numbes="true"
+ items-per-page="vm.subPage.selectedRelPageRowCount"
+ total-items="vm.responseData.relTotalCount"
+ ng-model="vm.subPage.selectedRelPage"
+ max-size="10"
+ ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
+ class="pagination pagination-sm"
+ previous-text="<"
+ next-text=">"
+ first-text=""
+ last-text="">
+ </ul>
</div>
</div>
@@ -561,7 +637,23 @@
<div class="col-sm-1">
<button class="btn btn-darkgrey offset-10" ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
</div>-->
- <div class="btn-group offset-11">
+ <div class="col-md-5 mt-2">
+ <div class="dataTables_length">
+ <label>
+ <select name="downPageRow"
+ tabindex="-1"
+ class="form-control form-control-sm"
+ ng-change="fn.changeDetailPageRowCount()"
+ ng-model="vm.subPage.selectedDownPageRowCount">
+ <option value="10">10</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ </select> {{vm.subPage.selectedDownPage}}-{{vm.responseData.downTotalPage}} /
+ {{vm.responseData.downTotalCount | number}}<span translate="common.few">嫄�</span>
+ </label>
+ </div>
+ </div>
+ <div class="btn-group" style="left: 730px; padding: 5px">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
class="btn btn-secondary dropdown-toggle"
@@ -600,11 +692,26 @@
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>
</div>
+ <div class="controls-below-table text-center">
+ <ul uib-pagination
+ boundary-links-numbes="true"
+ items-per-page="vm.subPage.selectedDownPageRowCount"
+ total-items="vm.responseData.downTotalCount"
+ ng-model="vm.subPage.selectedDownPage"
+ max-size="10"
+ ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
+ class="pagination pagination-sm"
+ previous-text="<"
+ next-text=">"
+ first-text=""
+ last-text="">
+ </ul>
+ </div>
</div>
<h6 class="todo-content-subheader mt-30" translate="common.content">�궡�슜</h6>
--
Gitblit v1.8.0