From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/issue/issueListNormal.html | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 8e645ab..0d13530 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -87,6 +87,12 @@
<span ng-click="vm.search.completeDateRange = ''">횞</span>
</p>
+ <!-- 湲곌컙 -->
+ <p ng-if="$root.isDefined(vm.search.dateRange)">
+ {{vm.search.dateRange}}
+ <span ng-click="vm.search.dateRange = ''">횞</span>
+ </p>
+
<!-- �벑濡앹씪 -->
<p ng-if="$root.isDefined(vm.search.registerDateRange)">
{{vm.search.registerDateRange}}
@@ -264,6 +270,19 @@
</div>
</div>
+ <div class="col-lg-3">
+ <div class="form-group">
+ <label> <span translate="common.dateRange">湲곌컙</span></label>
+ <input type="text"
+ readonly
+ class="form-control input-sm input-readonly"
+ ng-model="vm.search.dateRange"
+ modal-form-auto-scroll
+ date-format="YY-MM-DD"
+ parent-el="'#createdWidget'"
+ date-range-picker>
+ </div>
+ </div>
<div class="col-lg-3" ng-repeat="customField in vm.customFields">
--
Gitblit v1.8.0