|
|
@@ -91,7 +91,6 @@
|
|
|
<button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
|
|
|
<i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
|
|
|
</button>
|
|
|
-<<<<<<< HEAD
|
|
|
@if (RightInfo.Contains("," + right + "_export,"))
|
|
|
{
|
|
|
<button class="layui-btn" data-type="ExportExcel"><i
|
|
|
@@ -100,7 +99,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-=======
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -127,17 +125,6 @@
|
|
|
|
|
|
<table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
|
|
|
<script type="text/html" id="table-list-tools">
|
|
|
- @* @if (RightInfo.Contains("," + right + "_edit,"))
|
|
|
- {
|
|
|
- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
|
|
|
- }
|
|
|
- @if (RightInfo.Contains("," + right + "_delete,"))
|
|
|
- {
|
|
|
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
|
|
|
- }
|
|
|
- @if (RightInfo.Contains("," + right + "_edit,"))
|
|
|
- {
|
|
|
->>>>>>> feature-dgy-商城优化
|
|
|
|
|
|
<div class="layui-card-body">
|
|
|
<table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
|
|
|
@@ -170,18 +157,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
-
|
|
|
->>>>>>> feature-dgy-商城优化
|
|
|
<script src="/layuiadmin/layui/layui.js"></script>
|
|
|
<script
|
|
|
src="/layuiadmin/modules_main/LeaderReserveRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
|
|
|
<script>
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
-
|
|
|
->>>>>>> feature-dgy-商城优化
|
|
|
</script>
|
|
|
</body>
|
|
|
|
DuGuYang