From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 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..dc775ce 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>
@@ -87,15 +85,12 @@
url:basePath+"/admin/moneyCardUseStatistics/summaryItemDetail"
});
});
-
- function exportExcel(){
- var select_begin = $("#select_begin").val();
- var select_end = $("#select_end").val();
- var select_id = $("#select_id").val();
- var goodsName = $("#goodsName").val();
- var guwen = $("#goodsName").val();
- window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
- }
+
+ function exportExcel(){
+ var param=MForm.toUrlParam("#serchform");
+ window.location.href=basePath+"/admin/moneyCardUseStatistics/exportSummaryItemDetail?"+param;
+ }
+
function initFunctionList() {
--
Gitblit v1.9.1