From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html |   49 +++++++++++++++++++++----------------------------
 1 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html
index 56073ea..554ddec 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html
@@ -25,30 +25,27 @@
 					<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">&#45;&#45;选择分类&#45;&#45;</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>&lt;!&ndash;    入库时间的查询增加一个查询的其实时间两个字段 &ndash;&gt;-->
+<!--				<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="bedListZb-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button>
@@ -87,15 +84,11 @@
 				 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