From 7ae30b7ac631cf506a22e9d4b60a3b0a07fa2d27 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 23 2월 2022 18:03:41 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa --- src/main/webapp/views/issue/issueListNormal.html | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html index 8e645ab..148e665 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,33 @@ </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"> + <div class="form-group"> + <label> <span translate="common.registrationDate">�벑濡앹씪</span></label> + <input type="text" + readonly + class="form-control input-sm input-readonly" + ng-model="vm.search.registerDateRange" + 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