From 9037526ae431ecf9924c000f122e52e98f72d46e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Sep 2021 16:45:58 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html
index 53fea6a..c26f320 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html
@@ -110,12 +110,12 @@
<!-- 功能按钮部分 -->
<div id="option-bar" >
- <button matrix:fn="mdhyzl-edit" onclick="openEdit()" type="button" class="btn btn-success btn-sm "><i
+ <button matrix:btn="mdhyzl-edit" onclick="openEdit()" type="button" class="btn btn-success btn-sm "><i
class="fa fa-edit"></i>编辑
</button>
- <button matrix:fn="mdhyzl-gjjl" onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
- <button matrix:fn="mdhyzl-khda" onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
- <button matrix:btn="mdhyzl-excelOut" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
+ <button matrix:btn="mdhyzl-gjjl" onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
+ <button matrix:btn="mdhyzl-khda" onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
+ <button matrix:btn="mdhyzl-exportExcel" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
</div>
<!-- 数据表格部分 -->
@@ -203,19 +203,8 @@
//导出
function exportExcel() {
- var name = $("#search-text").attr("name");
- var value = $("#search-text").val();
- var vipType = $("#vipType").val();
- var arrivalWay = $("#arrivalWay").val();
- var vipState = $("#vipState").val();
- var staffId = $("#staffId").val();
- var shopId = $("#shopId").val();
- window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
- + encodeURI(encodeURI(vipType)) + "&arrivalWay="
- + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
- + encodeURI(encodeURI(value)) + "&vipState="
- + encodeURI(encodeURI(vipState)) + "&shopId=" + shopId
- + "&staffId=" + staffId;
+ var param=MForm.toUrlParam("#serchform");
+ window.location.href=basePath+"/hiveErp/vipInfo/exportExcel?"+param;
}
//打开编辑界面
--
Gitblit v1.9.1