|
|
@@ -506,6 +506,10 @@ $('#btnOrderSearch').on('click', function () {
|
|
|
fnSearchList();
|
|
|
});
|
|
|
|
|
|
+// 날짜백업
|
|
|
+var preStDate;
|
|
|
+var preEdDate;
|
|
|
+
|
|
|
var fnSearchList = function () {
|
|
|
var ordNo = $('#condition').val();
|
|
|
var stDate = $('#stDate').val();
|
|
|
@@ -555,6 +559,15 @@ var fnSearchList = function () {
|
|
|
}
|
|
|
|
|
|
gagaPaging.init('searchForm', fnSearchCallBack, 'orderListPagination', $('#searchForm').find('#pageSize').val());
|
|
|
+
|
|
|
+ // 주문번호 있을 시 날짜정보 없앰
|
|
|
+ if ($('#search').val() == 'searchOrdNo' && !gagajf.isNull(ordNo)) {
|
|
|
+ preStDate = stDate;
|
|
|
+ preEdDate = edDate;
|
|
|
+ $('#stDate').val(null);
|
|
|
+ $('#edDate').val(null);
|
|
|
+ }
|
|
|
+
|
|
|
gagaPaging.load($("#searchForm input[name=pageNo]").val());
|
|
|
};
|
|
|
|
|
|
@@ -566,6 +579,14 @@ var fnSearchCallBack = function(result){
|
|
|
|
|
|
gridOptionsOrderList.api.setRowData(result.orderList);
|
|
|
gagaPaging.createPagination(result.pageing.pageable);
|
|
|
+
|
|
|
+ // 날짜정보 원복
|
|
|
+ if ($('#search').val() == 'searchOrdNo' && !gagajf.isNull($('#condition').val())) {
|
|
|
+ $('#stDate').val(preStDate);
|
|
|
+ $('#edDate').val(preEdDate);
|
|
|
+ preStDate == null;
|
|
|
+ preEdDate == null;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 엑셀조회
|