代码同步

src/main/webapp/WEB-INF/views/ota/order/orderInfo/view.jsp

@@ -20,65 +20,95 @@
         <div class="widget-body">
             <div class="widget-main">
                 <form name="frmSearch" id="frmSearch" target="_self" class="form-inline searchCondition">
-                    <label> 下单时间:&nbsp;
-                        <input name="search_LIKE_orderCreateTime" class="form-control" placeholder="请输入下单时间"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 同程订单流水号:&nbsp;
-                        <input name="search_LIKE_orderSerialId" class="form-control" placeholder="请输入同程订单流水号"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 订单来源:&nbsp;
-                        <input name="search_LIKE_source" class="form-control" placeholder="请输入订单来源"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 订单id:&nbsp;
-                        <input name="search_LIKE_orderId" class="form-control" placeholder="请输入订单id"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 航班号:&nbsp;
-                        <input name="search_LIKE_flightNos" class="form-control" placeholder="请输入航班号"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 乘机人:&nbsp;
-                        <input name="search_LIKE_passengers" class="form-control" placeholder="请输入乘机人"
-                               type="text">
-                    </label> <br/>
-                    <label>
-                        订单状态:&nbsp;
-                        <x:dictData dictCode="Order_Status" var="order_status">
-                            <x:select defaultOption="请选择" hasDefault="true" var="order_status"
-                                      items="${order_status}" id="order_status" name="search_EQ_orderStatus"
-                                      className="form-control">
-                                <x:option value="${order_status.code }" text="${order_status.name }"
-                                          selected=""></x:option>
-                            </x:select>
-                        </x:dictData>
-                    </label>&nbsp;&nbsp;
-                    <label> 起始机场:&nbsp;
-                        <input name="search_LIKE_dport" class="form-control" placeholder="请输入起始机场"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 抵达机场:&nbsp;
-                        <input name="search_LIKE_aport" class="form-control" placeholder="请输入抵达机场"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 起飞日期:&nbsp;
-                        <input name="search_LIKE_takeOffTime" class="form-control" placeholder="请输入起飞日期"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 到达日期:&nbsp;
-                        <input name="search_LIKE_arrivalTime" class="form-control" placeholder="请输入到达日期"
-                               type="text">
-                    </label>&nbsp;&nbsp;
-                    <label> 操作人:&nbsp;
-                        <input name="search_LIKE_operator" class="form-control" placeholder="请输入操作人"
-                               type="text">
-                    </label>
-
-                    <button id="btnSearch" type="button" class="btn btn-primary btn-sm form-control">
-                        <i class="ace-icon fa fa-search icon-on-right bigger-110"></i>
-                    </button>
+                    <div class="clearfix">
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 下单时间:</label>
+                                <input name="search_LIKE_orderCreateTime" class="form-control date-picker"  data-date-format="yyyy-mm-dd"
+                                       type="text" placeholder="请输入下单时间">
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 同程订单流水号:</label>
+                                <input name="search_LIKE_orderSerialId" class="form-control" placeholder="请输入同程订单流水号"
+                                       type="text">
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 订单来源:</label>
+                                <input name="search_LIKE_source" class="form-control" placeholder="请输入订单来源"
+                                       type="text">
+
+                        </div>
+                        <%--<div class="grid4">
+                            <label> 订单id:&nbsp;
+                                <input name="search_LIKE_orderId" class="form-control" placeholder="请输入订单id"
+                                       type="text">
+                            </label>
+                        </div>--%>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 航班号:</label>
+                                <input name="search_LIKE_flightNos" class="form-control" placeholder="请输入航班号"
+                                       type="text">
+
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 乘机人:</label>
+                                <input name="search_LIKE_passengers" class="form-control" placeholder="请输入乘机人"
+                                       type="text">
+
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right">
+                                订单状态:</label>
+                                <x:dictData dictCode="Order_Status" var="order_status">
+                                    <x:select defaultOption="请选择" hasDefault="true" var="order_status"
+                                              items="${order_status}" id="order_status" name="search_EQ_orderStatus"
+                                              className="form-control">
+                                        <x:option value="${order_status.code }" text="${order_status.name }"
+                                                  selected=""></x:option>
+                                    </x:select>
+                                </x:dictData>
+
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 起始机场:</label>
+                                <input name="search_LIKE_dport" class="form-control" placeholder="请输入起始机场"
+                                       type="text">
+
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 抵达机场:</label>
+                                <input name="search_LIKE_aport" class="form-control" placeholder="请输入抵达机场"
+                                       type="text">
+
+                        </div>
+                        <div class="grid4">
+                            <%--<div class="input-group">--%>
+                                <label class="col-sm-4 control-label no-padding-right"> 起飞日期:</label>
+                                    <input name="search_LIKE_takeOffTime" class="form-control date-picker"  data-date-format="yyyy-mm-dd"
+                                           type="text" placeholder="请输入起飞日期">
+                                    <%--<span class="input-group-addon">
+                                        <i class="fa fa-calendar bigger-110"></i>
+                                    </span>--%>
+
+                            <%--</div>--%>
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 到达日期:</label>
+                                <input name="search_LIKE_arrivalTime" class="form-control date-picker"  data-date-format="yyyy-mm-dd"
+                                       type="text" placeholder="请输入到达日期">
+
+                        </div>
+                        <div class="grid4">
+                            <label class="col-sm-4 control-label no-padding-right"> 操作人:</label>
+                                <input name="search_LIKE_operator" class="form-control" placeholder="请输入操作人"
+                                       type="text">
+
+                        </div>
+                        <div class="grid4">
+                            <button id="btnSearch" type="button" class="btn btn-primary btn-sm form-control">
+                                <i class="ace-icon fa fa-search icon-on-right bigger-110"></i>
+                            </button>
+                        </div>
+                    </div><br/>
                 </form>
             </div>
         </div>
@@ -280,6 +310,11 @@
                     });
                 });
 
+                $('.date-picker').datepicker({
+                    autoclose: true,
+                    todayHighlight: true
+                })
+
             });
 
         });