|
|
@@ -2,73 +2,137 @@
|
|
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
|
|
<head>
|
|
|
<th:block th:include="include :: header('订单基础 订单的基础信息列表')" />
|
|
|
+ <th:block th:include="include :: datetimepicker-css" />
|
|
|
</head>
|
|
|
<body class="gray-bg">
|
|
|
- <div class="container-div">
|
|
|
+ <div class="container-div">
|
|
|
<div class="row">
|
|
|
<div class="col-sm-12 search-collapse">
|
|
|
- <form id="formId">
|
|
|
- <div class="select-list">
|
|
|
- <ul>
|
|
|
- <li>
|
|
|
- <p>订单所属 订单的所属公司：</p>
|
|
|
- <input type="text" name="orderBelong"/>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <p>订单号：</p>
|
|
|
- <input type="text" name="orderNumber"/>
|
|
|
- </li>
|
|
|
- <li class="select-time">
|
|
|
- <p>订单生成时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderCreationTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderCreationTime]"/>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <p>订单状态：</p>
|
|
|
- <select name="orderStatus" th:with="type=${@dict.getType('order_type')}">
|
|
|
+ <form id="formId" class="form-horizontal m">
|
|
|
+ <div class="row">
|
|
|
+ <div class="form-group col-sm-3">
|
|
|
+ <label class="control-label col-sm-4">订单所属：</label>
|
|
|
+ <div class="input-group col-sm-8">
|
|
|
+ <input class="form-control" type="text" name="orderBelong"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="form-group col-sm-3 row">
|
|
|
+ <label class="control-label col-sm-4">订单号：</label>
|
|
|
+ <div class="input-group col-sm-8">
|
|
|
+ <input class="form-control" type="text" name="orderNumber"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="form-group col-sm-5">
|
|
|
+ <label class="control-label col-sm-3">订单生成时间：</label>
|
|
|
+ <div class="input-daterange input-group col-sm-9">
|
|
|
+ <input type="text" class="input-sm form-control" id="dp-s-orderCreate" name="params[beginOrderCreationTime]" placeholder="yyyy-MM-dd"/>
|
|
|
+ <span class="input-group-addon">到</span>
|
|
|
+ <input type="text" class="input-sm form-control" id="dp-e-orderCreate" name="params[endOrderCreationTime]" placeholder="yyyy-MM-dd"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="row">
|
|
|
+ <div class="form-group col-sm-3">
|
|
|
+ <label class="control-label col-sm-4">订单状态：</label>
|
|
|
+ <div class="input-group col-sm-8">
|
|
|
+ <select class="form-control " name="orderStatus" th:with="type=${@dict.getType('order_type')}">
|
|
|
<option value="">所有</option>
|
|
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
|
|
</select>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <p>到货地址：</p>
|
|
|
- <input type="text" name="shippingAddress"/>
|
|
|
- </li>
|
|
|
- <li class="select-time">
|
|
|
- <p>过信用时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginPassCreditTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endPassCreditTime]"/>
|
|
|
- </li>
|
|
|
- <li class="select-time">
|
|
|
- <p>期望到货开始时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedStartTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedStartTime]"/>
|
|
|
- </li>
|
|
|
- <li class="select-time">
|
|
|
- <p>期望到货结束时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedEndTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedEndTime]"/>
|
|
|
- </li>
|
|
|
- <li class="select-time">
|
|
|
- <p>订单结束时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderEndTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderEndTime]"/>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <p>订单所属：</p>
|
|
|
- <input type="text" name="belongTo"/>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
|
|
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
|
|
- </li>
|
|
|
- </ul>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="form-group col-sm-5">
|
|
|
+ <label class="control-label col-sm-3">过信用时间：</label>
|
|
|
+ <div class="input-daterange input-group col-sm-9">
|
|
|
+ <input type="text" class="input-sm form-control" id="dp-s-passCredit" name="params[beginPassCreditTime]" placeholder="yyyy-MM-dd"/>
|
|
|
+ <span class="input-group-addon">到</span>
|
|
|
+ <input type="text" class="input-sm form-control " id="dp-e-passCredit" name="params[beginPassCreditTime]" placeholder="yyyy-MM-dd"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div class="form-group col-sm-3">
|
|
|
+ <label class="control-label col-sm-4">订单所属：</label>
|
|
|
+ <div class="input-group col-sm-8">
|
|
|
+ <input class="form-control" type="text" name="belongTo"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+ <div class="row">
|
|
|
+ <div class="form-group col-sm-5">
|
|
|
+ <label class="control-label col-sm-3">订单结束时间：</label>
|
|
|
+ <div class="input-daterange input-group col-sm-9">
|
|
|
+ <input type="text" class="input-sm form-control" id="dp-s-orderEnd" name="pparams[beginOrderEndTime]" placeholder="yyyy-MM-dd"/>
|
|
|
+ <span class="input-group-addon">到</span>
|
|
|
+ <input type="text" class="input-sm form-control " id="dp-e-orderEnd" name="params[endOrderEndTime]" placeholder="yyyy-MM-dd"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="col-sm-1"></div>
|
|
|
+ <div class="form-group col-sm-2">
|
|
|
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
|
|
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <!--<div class="select-list">-->
|
|
|
+ <!--<ul>-->
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>订单所属 订单的所属公司：</p>-->
|
|
|
+ <!--<input type="text" name="orderBelong"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>订单号：</p>-->
|
|
|
+ <!--<input type="text" name="orderNumber"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li class="select-time">-->
|
|
|
+ <!--<p>订单生成时间：</p>-->
|
|
|
+ <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderCreationTime]"/>-->
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderCreationTime]"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>订单状态：</p>-->
|
|
|
+ <!--<select name="orderStatus" th:with="type=${@dict.getType('order_type')}">-->
|
|
|
+ <!--<option value="">所有</option>-->
|
|
|
+ <!--<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
|
|
|
+ <!--</select>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>到货地址：</p>-->
|
|
|
+ <!--<input type="text" name="shippingAddress"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li class="select-time">-->
|
|
|
+ <!--<p>过信用时间：</p>-->
|
|
|
+ <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginPassCreditTime]"/>-->
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endPassCreditTime]"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li class="select-time">-->
|
|
|
+ <!--<p>期望到货开始时间：</p>-->
|
|
|
+ <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedStartTime]"/>-->
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedStartTime]"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li class="select-time">-->
|
|
|
+ <!--<p>期望到货结束时间：</p>-->
|
|
|
+ <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedEndTime]"/>-->
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedEndTime]"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li class="select-time">-->
|
|
|
+ <!--<p>订单结束时间：</p>-->
|
|
|
+ <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderEndTime]"/>-->
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderEndTime]"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>订单所属：</p>-->
|
|
|
+ <!--<input type="text" name="belongTo"/>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>-->
|
|
|
+ <!--<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>-->
|
|
|
+ <!--</li>-->
|
|
|
+ <!--</ul>-->
|
|
|
+ <!--</div>-->
|
|
|
</form>
|
|
|
</div>
|
|
|
|
|
|
@@ -92,6 +156,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<th:block th:include="include :: footer" />
|
|
|
+ <th:block th:include="include :: datetimepicker-js" />
|
|
|
<script th:inline="javascript">
|
|
|
var editFlag = [[${@permission.hasPermi('order:orderbase:edit')}]];
|
|
|
//var removeFlag = [[${@permission.hasPermi('order:orderbase:remove')}]];
|
|
|
@@ -187,6 +252,85 @@
|
|
|
};
|
|
|
$.table.init(options);
|
|
|
});
|
|
|
+ //订单开始时间
|
|
|
+ $("#dp-s-orderCreate").datetimepicker({
|
|
|
+ format: 'yyyy-mm-dd',
|
|
|
+ minView: "month",
|
|
|
+ todayBtn: true,
|
|
|
+ autoclose: true,
|
|
|
+ endDate : new Date(),
|
|
|
+ }).on('changeDate', function(event) {
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var startTime = event.date;
|
|
|
+ $('#dp-e-orderCreate').datetimepicker('setStartDate', startTime);
|
|
|
+ });
|
|
|
+ $("#dp-e-orderCreate").datetimepicker({
|
|
|
+ format: 'yyyy-mm-dd',
|
|
|
+ minView: "month",
|
|
|
+ todayBtn: true,
|
|
|
+ autoclose: true,
|
|
|
+ endDate : new Date(),
|
|
|
+ }).on('changeDate', function(event) {
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var endTime = event.date;
|
|
|
+ $("#dp-s-orderCreate").datetimepicker('setEndDate', endTime);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ //订单结束时间
|
|
|
+ $("#dp-s-orderEnd").datetimepicker({
|
|
|
+ format: 'yyyy-mm-dd',
|
|
|
+ minView: "month",
|
|
|
+ todayBtn: true,
|
|
|
+ autoclose: true,
|
|
|
+ endDate : new Date(),
|
|
|
+ }).on('changeDate', function(event) {
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var startTime = event.date;
|
|
|
+ $('#dp-e-orderEnd').datetimepicker('setStartDate', startTime);
|
|
|
+ });
|
|
|
+ $("#dp-e-orderEnd").datetimepicker({
|
|
|
+ format: 'yyyy-mm-dd',
|
|
|
+ minView: "month",
|
|
|
+ todayBtn: true,
|
|
|
+ autoclose: true,
|
|
|
+ endDate : new Date(),
|
|
|
+ }).on('changeDate', function(event) {
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var endTime = event.date;
|
|
|
+ $("#dp-s-orderEnd").datetimepicker('setEndDate', endTime);
|
|
|
+ });
|
|
|
+
|
|
|
+ //订单过信用时间
|
|
|
+ $("#dp-s-passCredit").datetimepicker({
|
|
|
+ format: 'yyyy-mm-dd',
|
|
|
+ minView: "month",
|
|
|
+ todayBtn: true,
|
|
|
+ autoclose: true,
|
|
|
+ endDate : new Date(),
|
|
|
+ }).on('changeDate', function(event) {
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var startTime = event.date;
|
|
|
+ $('#dp-e-passCredit').datetimepicker('setStartDate', startTime);
|
|
|
+ });
|
|
|
+ $("#dp-e-passCredit").datetimepicker({
|
|
|
+ format: 'yyyy-mm-dd',
|
|
|
+ minView: "month",
|
|
|
+ todayBtn: true,
|
|
|
+ autoclose: true,
|
|
|
+ endDate : new Date(),
|
|
|
+ }).on('changeDate', function(event) {
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var endTime = event.date;
|
|
|
+ $("#dp-s-passCredit").datetimepicker('setEndDate', endTime);
|
|
|
+ });
|
|
|
+
|
|
|
</script>
|
|
|
</body>
|
|
|
</html>
|
ningsy