From 78472da3395d1db45b6a76688c72a2c2a372c47a Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:42:05 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
index cbe171e..9d6bce4 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
@@ -51,7 +51,7 @@
<div class="row mt-10" >
<div id="option-bar">
<!-- 功能按钮部分 -->
- <button matrix:btn="shopInfo-add" onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-add" ></i> 新增</button>
+ <button onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-add" ></i> 新增</button>
</div>
<table id="mgrid">
<thead>
@@ -59,8 +59,10 @@
<th data-checkbox="true"></th>
<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" >序号</th>
<th data-align="center" data-formatter="buidOperate" data-field="id">操作</th>
- <th data-field="shopName" data-align="center">店铺名称</th>
- <th data-field="remainingCnt" data-align="center">短信余量</th>
+ <th data-field="label" data-align="center">标签内容</th>
+ <th data-field="createBy" data-align="center">创建人</th>
+ <th data-field="shopName" data-align="center">门店名称</th>
+ <th data-field="isAll" data-align="center" data-formatter="isAllFormat">是否所有门店</th>
</tr>
</thead>
</table>
@@ -72,9 +74,9 @@
var myGrid;
$(function(){
var delUrl="";
- delUrl=basePath+"/admin/smsShop/del" ;
+ delUrl=basePath+"/admin/label/del" ;
myGrid=MGrid.initGrid({
- url:basePath+"/admin/smsShop/showList",
+ url:basePath+"/admin/label/showList",
delUrl:delUrl,
});
@@ -92,9 +94,15 @@
myGrid.delItems();
}
- function buidOperate(value, row, index){
- console.log("----->",value)
+ function isAllFormat(value) {
+ if (value == 1) {
+ return "是"
+ } else {
+ return "否";
+ }
+ }
+ function buidOperate(value, row, index){
var html = "";
html += '<div class="btn-group">'
+ '<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">'
@@ -102,9 +110,14 @@
+ '<ul class="dropdown-menu" role="menu">'
+ '<li><a href="javascript:void(0)" style="display:'
+ value
- + '" onClick="lookInfo(\''
+ + '" onClick="openEdit(\''
+ value
- + '\')" title="编辑">查看</a></li>'
+ + '\')" title="编辑">编辑</a></li>'
+ + '<li><a href="javascript:void(0)" style="display:'
+ + value
+ + '" onClick="myGrid.delItem(\''
+ + value
+ + '\')" title="删除">删除</a></li>' + '</ul>' + '</div>';
html += '';
return html;
}
@@ -112,25 +125,22 @@
function openAdd() {
layer.open({
type : 2,
- title : "短信分配",
+ title : "添加标签",
area : [ MUI.SIZE_L, '400px' ],
maxmin : true,
- content : [ basePath+'/admin/smsShop/editForm']
+ content : [ basePath+'/admin/label/edit']
});
}
- function lookInfo(value) {
+ function openEdit(id) {
layer.open({
type : 2,
- title : "查看",
+ title : "添加标签",
area : [ MUI.SIZE_L, '400px' ],
maxmin : true,
- content : [ basePath+'/admin/redirect/hive-erp/sms/sysSmsShopRecord-list?ssId='+value]
+ content : [ basePath+'/admin/label/edit?id=' + id]
});
}
-
-
-
</script>
</body>
</html>
--
Gitblit v1.9.1