From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 25 Jan 2021 09:39:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0 --- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html index a5952d6..ca5daba 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html @@ -25,30 +25,28 @@ <button onclick="myGrid.resetForm()" type="button" class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button> </div> </div> - <div class="form-group mr-20"> - <label >产品名称</label> + <label>储值卡名称</label> <input autocomplete="off" name="projName" type="text" class="form-control" > </div> +<!-- <div class="form-group mr-20">--> +<!-- <label for="parentId">商品分类</label>--> +<!-- <select class="form-control select2" size="1" name="cateId" id="parentId">--> +<!-- <option value="" selected="selected">--选择分类--</option>--> +<!-- </select>--> +<!-- </div>--> - <div class="form-group mr-20"> - <label for="parentId">商品分类</label> - <select class="form-control select2" size="1" name="cateId" id="parentId"> - <option value="" selected="selected">--选择分类--</option> - </select> - </div> - - <div class="form-group mr-20"> - <label>会员</label> - <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" > - </div> +<!-- <div class="form-group mr-20">--> +<!-- <label>会员</label>--> +<!-- <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" >--> +<!-- </div>--> - <div class="form-group mr-20"> - <label>到期时间</label><!-- 入库时间的查询增加一个查询的其实时间两个字段 --> - <input autocomplete="off" id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- - <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="select_end"> - </div> +<!-- <div class="form-group mr-20">--> +<!-- <label>到期时间</label><!– 入库时间的查询增加一个查询的其实时间两个字段 –>--> +<!-- <input autocomplete="off" id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- --> +<!-- <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="select_end">--> +<!-- </div>--> </form> <div id="option-bar" > <button matrix:btn="bedList-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button> -- Gitblit v1.9.1