From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html | 69 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 41 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 0ec644f..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,17 +51,18 @@
<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>
<tr>
<th data-checkbox="true"></th>
<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" >序号</th>
- <th data-field="stName" data-align="center">模板名称</th>
- <th data-field="ssrIsAll" data-align="center" data-formatter="formatterIsAll">是否所有客户</th>
- <th data-field="ssrCnt" data-align="center">发送人数</th>
- <th data-field="createTime" data-formatter="MGrid.getTime" data-align="center">发送时间</th>
+ <th data-align="center" data-formatter="buidOperate" data-field="id">操作</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,25 +73,15 @@
<script type="text/javascript">
var myGrid;
$(function(){
-
var delUrl="";
- delUrl=basePath+"/admin/smsSendRecord/del" ;
+ delUrl=basePath+"/admin/label/del" ;
myGrid=MGrid.initGrid({
- url:basePath+"/admin/smsSendRecord/showListWithShop",
+ url:basePath+"/admin/label/showList",
delUrl:delUrl,
});
- remainingCnt();
+
});
-
- function remainingCnt() {
- $.AjaxProxy().invoke(
- basePath+"/admin/smsShop/getShopRemainingCnt",
- function(loj) {
- $("#remainingCnt").text(loj[0].result.mapInfo.remainingCnt);
- }
- )
- }
function del() {
var i = $("#mgrid").bootstrapTable('getSelections').length;
@@ -101,6 +92,14 @@
return false;
}
myGrid.delItems();
+ }
+
+ function isAllFormat(value) {
+ if (value == 1) {
+ return "是"
+ } else {
+ return "否";
+ }
}
function buidOperate(value, row, index){
@@ -126,34 +125,22 @@
function openAdd() {
layer.open({
type : 2,
- title : "发送短信",
+ title : "添加标签",
area : [ MUI.SIZE_L, '400px' ],
maxmin : true,
- content : [ basePath+'/admin/smsSendRecord/editFormWithShop']
+ content : [ basePath+'/admin/label/edit']
});
}
-
- //打开编辑界面
- function openEdit(id) {
- layer.open({
- type : 2,
- title : "发送短信",
- area : [ MUI.SIZE_L, '400px' ],
- maxmin : true,
- content : [ basePath+'/admin/smsSendRecord/editForm?id=' + id]
- });
- }
- function formatterIsAll(value) {
- if (value == 1) {
- return "是";
- } else if (value == 2) {
- return "否";
- } else {
- return "-";
- }
- }
-
+ function openEdit(id) {
+ layer.open({
+ type : 2,
+ title : "添加标签",
+ area : [ MUI.SIZE_L, '400px' ],
+ maxmin : true,
+ content : [ basePath+'/admin/label/edit?id=' + id]
+ });
+ }
</script>
</body>
</html>
--
Gitblit v1.9.1