From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index 53c6ebb..7d953d9 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -8,25 +8,23 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar"> 
- <input id="product-search-value" class="layui-input search-input" type="text" placeholder="输入产品名" /> 
- <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
- <button id="product-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button>
+ <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" /> 
+ <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon permissions"
+ permissions="product-list"></i>搜索</button>
+ <button id="product-btn-add" class="layui-btn icon-btn permissions" permissions="product-edit"><i
+ class="layui-icon"></i>添加</button>
</div>
<table class="layui-table" id="product-table" lay-filter="product-table"></table>
</div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="product-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="product-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="product-tpl-state">
- <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="未处理|已处理"
+ <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="禁用|启用"
{{d.enabled==true?'checked':''}}/>
-</script>
-<!-- 弹窗内容 -->
-<script type="text/html" id="feedback-detail">
-
</script>
<script>
@@ -40,7 +38,6 @@
// 渲染表格
var renderTable = function () {
- layer.load(2);
table.render({
elem: '#product-table',
url: config.base_server + 'api-opration/product',
@@ -48,9 +45,17 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'proName', width: 300, title: '产品名称' },
+ { field: 'proName',width: "220",align: 'center', title: '产品名称' },
{
- field: 'proTime', width: 150, title: '有效时长', templet: function (d) {
+ field: 'proType', align: 'center', width: '10%', templet: function (d) {
+ if (d.proType === 0)
+ return "试用"
+ else
+ return "正式"
+ }, title: '类型'
+ },
+ {
+ field: 'proTime', width: '10%', align: 'center', title: '有效时长', templet: function (d) {
switch (d.proTimeUnit) {
case 0:
return d.proTime + "天";
@@ -64,15 +69,19 @@
}
}
},
- { field: 'proPrice', width: 100, title: '价格' },
- { field: 'recordCount', width: 180, title: '报告数' },
- { field: 'ailightCount', width: 180, title: '读片量' },
- { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
- { field: 'createTime', width: 200, sort: true, title: '创建时间' },
- { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
+ { field: 'proPrice', width: '10%', align: 'center', title: '价格' },
+ { field: 'recordCount', width: '10%', align: 'center', title: '报告数' },
+ { field: 'ailightCount', width: '10%', align: 'center', title: '读片量' },
+ {
+ field: 'createTime', width: '120', align: 'center', sort: true, title: '创建时间', templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+ }
+ },
+ { field: 'enabled', width: '10%', align: 'center', templet: '#product-tpl-state', sort: true, title: '状态' },
+ { align: 'center', width: '10%', toolbar: '#product-table-bar', title: '操作' }
]],
- done: function () {
- layer.closeAll('loading');
+ done: function (res) {
+ permissionsInput(res,config);
}
});
}
@@ -87,9 +96,9 @@
}, function (data) {
layer.closeAll('loading');
if (data.code == 0) {
- layer.msg(data.msg, { icon: 1, time: 500 });
+ layer.msg(data.msg, { icon: 1, time: 2000 });
} else {
- layer.msg(data.msg, { icon: 2, time: 500 });
+ layer.msg(data.msg, { icon: 2, time: 2000 });
$(obj.elem).prop('checked', !obj.elem.checked);
form.render('checkbox');
}
@@ -104,7 +113,7 @@
layer.load(2);
admin.req('api-opration/product/' + obj.data.id, {}, function (data) {
layer.closeAll('loading');
- layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+ layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
renderTable();
});
@@ -117,7 +126,10 @@
// 搜索按钮点击事件
$('#product-btn-search').click(function () {
var proName = $('#product-search-value').val();
- table.reload('product-table', { where: { proName: proName } });
+ table.reload('product-table', { where: { proName: proName},
+ page: {
+ curr: 1
+ } });
});
// 添加按钮点击事件
$('#product-btn-add').click(function () {
--
Gitblit v1.8.0