From 7a6ab8668bc96dc9f0f4520b83461a948c785751 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 21 12월 2021 14:44:38 +0900
Subject: [PATCH] 이슈 리스트 상세 검색 수정

---
 src/main/webapp/views/issue/issueListNormal.html |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index a903afe..2f018a6 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -47,6 +47,12 @@
                                                 <issue-search-field-key-view-element lists="vm.issueStatuses"
                                                                                      keys="vm.search.issueStatusIds"></issue-search-field-key-view-element>
 
+                                                <!-- �씠�뒋 踰덊샇 -->
+                                                <p ng-if="$root.isDefined(vm.search.issueNumber)">
+                                                    {{vm.search.issueNumber}}
+                                                    <span ng-click="vm.search.issueNumber = ''">횞</span>
+                                                </p>
+
                                                 <!--    �씠�뒋 �궡�슜   -->
                                                 <p ng-if="$root.isDefined(vm.search.description)">
                                                     {{vm.search.description}}
@@ -86,6 +92,10 @@
                                                     {{vm.search.registerDateRange}}
                                                     <span ng-click="vm.search.registerDateRange = ''">횞</span>
                                                 </p>
+
+                                                <!-- �떞�떦遺��꽌 -->
+                                                <issue-search-array-view-element lists="vm.departments"
+                                                                                 type="'department'"></issue-search-array-view-element>
 
                                                 <!--    �뀓�뒪�듃 �엯�젰 �븘�뱶   -->
                                                 <issue-search-custom-field-view-element
@@ -154,12 +164,12 @@
                                                     <div class="form-group">
                                                         <label> <span translate="issue.issueNumber">�씠�뒋 踰덊샇</span></label>
                                                         <input type="text"
-                                                               name="name"
+                                                               name="issueNumber"
                                                                class="form-control input-sm"
                                                                autocomplete="off"
                                                                kr-input
                                                                maxlength="20"
-                                                               ng-model="vm.search.combinationIssueNumber">
+                                                               ng-model="vm.search.issueNumber">
                                                     </div>
                                                 </div>
 
@@ -420,8 +430,8 @@
 
                             <!--    �슦痢�  -->
                             <div class="col-5" >
-                                <span class="issue-detail-label" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �븯�쐞 �씠�뒋 �닲湲곌린</span>
-                                <label class='switch' style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
+                                <span class="issue-detail-label" ng-if="vm.listMode === 0" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �븯�쐞 �씠�뒋 �닲湲곌린</span>
+                                <label class='switch' ng-if="vm.listMode === 0" style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
                                     <span class='slider round'></span>
                                 </label>
                                 <span class="issue-detail-label" style="position: relative; left: 5.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �셿猷� �씠�뒋 �닲湲곌린</span>
@@ -439,12 +449,12 @@
                                         </button>
                                         <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                              x-placement="bottom-start" >
-                                            <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+                                            <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
 
                                             <a class="dropdown-item cursor" ng-click="fn.importExcel()"> <span translate="common.importExcel">Excel Import</span></a>
                                             <a class="dropdown-item cursor" ng-click="fn.modifyMultiIssueStatus()"> <span translate="common.updateIssueStatus">�씠�뒋 �긽�깭 蹂�寃�</span></a>
                                             <a class="dropdown-item cursor" ng-click="fn.addIssueTableConfig()"> <span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></a>
-                                            <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+                                            <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
                                         </div>
                                     </div>
                                 </form>

--
Gitblit v1.8.0