From 2620b87fd24feaa0b60cd8b529cd44c3a7557c30 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:59:45 +0800
Subject: [PATCH] 1、修改树形分类可以选择自己为自己的父级的bug
---
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 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..3973f5c 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">'
@@ -112,25 +120,12 @@
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) {
- layer.open({
- type : 2,
- title : "查看",
- area : [ MUI.SIZE_L, '400px' ],
- maxmin : true,
- content : [ basePath+'/admin/redirect/hive-erp/sms/sysSmsShopRecord-list?ssId='+value]
- });
- }
-
-
-
</script>
</body>
</html>
--
Gitblit v1.9.1