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/vip/vipInfo-list.html | 127 ++++++++----------------------------------
1 files changed, 25 insertions(+), 102 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 0354078..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
@@ -96,7 +96,7 @@
</select>
</div>
<div class="form-group">
- <button matrix:btn="mdhyzl-add" onclick="myGrid.serchData(1)" type="button"
+ <button onclick="myGrid.serchData(1)" type="button"
class="btn btn-sm btn-info">
<i class="fa fa-search "></i> 搜索
</button>
@@ -110,17 +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-projTaocan" onclick="openProj()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cube"></i> 项目管理</button>
- <button matrix:btn="mdhyzl-projTaocan" onclick="openTc()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cubes"></i> 套餐管理</button>
- <button matrix:btn="mdhyzl-projTaocan" onclick="openMoneyCard()" type="button" class="btn btn-info btn-sm"><i class="fa fa-credit-card"></i> 充值卡管理</button>
- <button matrix:fn="mdhyzl-xfdd" onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
- <button matrix:fn="mdhyzl-fwd" onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></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>
<!-- 数据表格部分 -->
@@ -138,6 +133,7 @@
<th data-field="arrivalWay">到店途径</th>
<th data-field="staffName">健康顾问</th>
<th data-field="shopName">所属门店</th>
+ <th data-field="phone" data-formatter="buildOperation">操作</th>
</tr>
</thead>
</table>
@@ -156,7 +152,6 @@
var delUrl="";
delUrl=basePath+"/hiveErp/vipInfo/del";
-
myGrid=
MGrid.initGrid({
url : basePath+"/hiveErp/vipInfo/showVipInfoList",
@@ -165,16 +160,7 @@
});
});
- function openOrder(){
- var vipName=myGrid.getSelectItemId("vipName");
- layer.full(layer.open({
- type : 2,
- title : "消费记录",
- area : [ MUI.SIZE_L, '450px' ],
- maxmin : true,
- content : [ basePath+'/admin/redirect/hive/operate/sysOrder-list?vipName=' + vipName ]
- }));
- }
+
/**
* 构建会员名称
*/
@@ -185,16 +171,7 @@
return value;
}
}
- function openServiceOrder(){
- var vipName=myGrid.getSelectItemId("vipName");
- layer.full(layer.open({
- type : 2,
- title : "服务单",
- area : [ MUI.SIZE_L, '450px' ],
- maxmin : true,
- content : [ basePath+'/admin/redirect/hive/store/projService-list?vipName=' + vipName ]
- }));
- }
+
function openArchieves(){
var id=myGrid.getSelectItemId();
@@ -219,84 +196,15 @@
content : [ basePath+'/admin/serviceRecord/toServicefollowListForZd?id=' + id ]
});
}
- function createDateDictionary() {
- $(".dds").each(
- function() {
- var type = $(this).attr("cc");
- var _this = $(this);
- //取服务器请求数据
- $.AjaxProxy({
- p : {
- type : type
- }
- })
- .invoke(
- basePath+"/admin/dds/showDataDictionary",
- function(loj) {
- var html = '';
- console.log(loj.getRowCount());
- for (var i = 0; i < loj
- .getRowCount(); i++) {
- html += '<option value="'
- + loj
- .getString(i,
- "id")
- + '">'
- + loj.getString(i,
- "name")
- + "</option>";
- }
- _this.html(html);
- });
- });
- }
- function openTc() {
- var id=myGrid.getSelectItemId();
- layer.open({
- type: 2,
- title: "会员套餐管理",
- area: MUI.SIZE_M,
- content : [ basePath+'/admin/redirect/hive-erp/vip/viptc-list?vipId=' + id]
- });
- }
- function openProj() {
- var id=myGrid.getSelectItemId();
- layer.open({
- type: 2,
- title: "会员项目管理",
- area: MUI.SIZE_M,
- content : [ basePath+'/admin/redirect/hive-erp/vip/projUse-list?vipId=' + id]
- });
- }
- function openMoneyCard() {
- var id=myGrid.getSelectItemId();
- layer.open({
- type: 2,
- title: "会员充值卡管理",
- area: MUI.SIZE_M,
- content : [ basePath+'/admin/redirect/hive-erp/vip/moneyCardUse-list?vipId=' + id]
- });
- }
//导出
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;
}
//打开编辑界面
@@ -310,6 +218,21 @@
});
}
+ function buildOperation(value, row, index) {
+ var html = "";
+ html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a> '
+ return html;
+ }
+ function openVipDetail(value) {
+ debugger
+ layer.full(layer.open({
+ type : 2,
+ title : "会员详情",
+ area : [ MUI.SIZE_L, '450px' ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/hive/beautySalon/vip?vipPhone=' + value ]
+ }));
+ }
</script>
--
Gitblit v1.9.1