JC24WMS.git - Gitblit

parent: c7f2cb36 | 补丁 | 提交 | show whitespace

yuyou_x

2024-02-23 565d1f64383ae6d71a9590e8bcfa474269b8dbb3

调整页面 编写页签table高度样式

21个文件已修改

	HTML/js/public.js	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/ASNSetting/ArrivalNotice.html	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/ASNSetting/PalletBind.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/BaseSetting/Department.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/BaseSetting/LogOperation.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/BaseSetting/LogisticsInfo.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/BaseSetting/Materials.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/BaseSetting/Packag.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/BaseSetting/Unit.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/AdventSlot.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/BoxInfor.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/InOutBoundReports.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/InventoryStatistics.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/LowStockSlotList.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/Category.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/Dictionary.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/FunSetting.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/LogOperation.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/Menumanagement.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/Role.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SystemSettings/UserManage.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 HTML/js/public.js

@@ -179,6 +179,9 @@
  var bodyHeight = $("#body").outerHeight();
  var topHeight = $("#top").outerHeight();
  var centerHeight = $("#center").outerHeight();
//   console.log(bodyHeight);
//   console.log(topHeight);
//   console.log(centerHeight);

  var hh = bodyHeight - topHeight-centerHeight - 26 ;//6是body上内边距 
  return hh;
@@ -207,6 +210,20 @@
  var h2 = parseInt(hh*0.4)
  return h2;
}
//获取除搜索条件以及页签外高度
function GetTableTabHeight() {
    var bodyHeight = $("#body").outerHeight();
    var topHeight = $("#top").outerHeight();
    var centerHeight = $("#center").outerHeight();
    var tabHeight = $("#tab").outerHeight();
    // console.log(bodyHeight);
    // console.log(topHeight);
    // console.log(centerHeight);
    // console.log(tabHeight);
  
    var hh = bodyHeight - topHeight-centerHeight-tabHeight - 57 ;//6是body上内边距 
    return hh;
}
 
//判断是否正整数 true 正整数 false 其他
function isIntNum(val){

 HTML/views/ASNSetting/ArrivalNotice.html


 HTML/views/ASNSetting/PalletBind.html

@@ -34,11 +34,11 @@
      </script>
</head>

<body>
<body id="body">

    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">入库单号</label>
@@ -146,10 +146,13 @@
            <div class="layui-card-body">
                <div style="position: relative;">
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                        <ul class="layui-tab-title">
                        <ul class="layui-tab-title" id="tab">
                            <li  class="layui-this">托盘信息</li>
                            <li >箱码信息</li>
                        </ul>

                        <div id="center"></div>

                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
@@ -374,6 +377,7 @@
                laypage = layui.laypage,
                layer = layui.layer;
            laydate = layui.laydate;
            var h1 = GetTableTabHeight();
            laydate.render({
                elem: '#StartTime'
                , format: 'yyyy-MM-dd' //可任意组合
@@ -684,7 +688,7 @@
                    table.render({
                        id: 'PalletBind',
                        elem: '#PalletBind',
                        height: 'full-210',
                        height: h1,
                        url: IP + "/BllAsn/GetPalletBindList",
                        method: 'post',
                        contentType: 'application/json',
@@ -930,7 +934,7 @@
                table.render({
                    id: 'BoxInfo',
                    elem: '#BoxInfo',
                    height: 'full-210',
                    height: h1,
                    url: IP + "/BllAsn/GetBoxInfoList",
                    method: 'post',
                    contentType: 'application/json',

 HTML/views/BaseSetting/Department.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 56px">部门编码</label>
@@ -41,6 +41,8 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <div style="padding-bottom: 5px;display: flex;flex-direction: row-reverse;">
@@ -81,6 +83,7 @@
                laypage = layui.laypage,
                layer = layui.layer;

                var h1 = GetTableHeight();
                refreshTable("", "");
                var tableIns;
            
@@ -170,7 +173,7 @@
                
                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: "full-129",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,

 HTML/views/BaseSetting/LogOperation.html

@@ -2,7 +2,7 @@
<html>
    <head>
        <meta charset="utf-8">
        <title>用户信息列表</title>
        <title>操作日志</title>
        <meta name="renderer" content="webkit">
        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item" >
                        <div class="layui-inline">
                            <label class="layui-form-label">菜单号</label>
@@ -55,6 +55,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                </div>
@@ -75,6 +78,7 @@
                    laypage = layui.laypage,
                    layer = layui.layer;

                    var h1 = GetTableHeight();
                    refreshTable("", "", "", "","");
                    var tableIns;

@@ -162,7 +166,7 @@
                }
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-94',
                    height: h1,
                    id: 'LAY-app-content-list',
                    page: true,
                    limit: pageCnt,

 HTML/views/BaseSetting/LogisticsInfo.html

@@ -17,10 +17,10 @@
      </script>
</head>

<body>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 75px; padding-left: 0px;">运输公司</label>
@@ -79,6 +79,9 @@
                    </div>
                </div>
            </div>

            <div id="center"></div>

            <div class="layui-card-body">
                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    
@@ -113,6 +116,7 @@
                laypage = layui.laypage,
                layer = layui.layer;

            var h1 = GetTableHeight();
            var xqid = "";
            refreshTable("","","","","");
            var tableIns;
@@ -130,7 +134,7 @@
                    elem: '#LAY-app-content-list',
                    url: IP + "/Basis/GetLogisticsInfoList",
                    method: 'POST',
                    height: 'full-95',
                    height: h1,
                    id: 'LAY-app-content-list',
                    where: param,
                    contentType: 'application/json',

 HTML/views/BaseSetting/Materials.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <!-- 物料编码 -->
                        <div class="layui-inline">
@@ -120,6 +120,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    
@@ -203,6 +206,7 @@
                    laypage = layui.laypage,
                    layer = layui.layer;

                var h1 = GetTableHeight();
                refreshTable("","","","","","","","");
                var tableIns;
                //获取类别信息
@@ -303,7 +307,7 @@
        
                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: "full-140",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,

 HTML/views/BaseSetting/Packag.html

@@ -26,11 +26,11 @@
      </script>
</head>

<body>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <!-- 查询条件 -->
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"> 
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top"> 
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">包装编码</label>
@@ -67,6 +67,8 @@
                    </div>
                </div>
            </div>

            <div id="center"></div>

            <div class="layui-card-body">
                <!-- 按钮 -->
@@ -119,6 +121,7 @@
                form = layui.form,
                laypage = layui.laypage,
                layer = layui.layer;
            var h1 = GetTableHeight();
            var param = {
                Id: $.cookie('userId')
            }
@@ -130,7 +133,7 @@
            };
            var tableIns = table.render({
                elem: '#LAY-app-content-list',
                height: 'full-95',
                height: h1,
                id: 'LAY-app-content-list',
                url: url,
                method: 'post',

 HTML/views/BaseSetting/Unit.html

@@ -20,11 +20,11 @@
      </script>
</head>

<body>
<body id="body">

    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">单位编码</label>
@@ -54,6 +54,8 @@
                    </div>
                </div>
            </div>

            <div id="center"></div>

            <div class="layui-card-body">
                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -86,6 +88,7 @@
                laypage = layui.laypage,
                layer = layui.layer;

            var h1 = GetTableHeight();

            var param = {
                Id: $.cookie('userId')
@@ -101,7 +104,7 @@
             
            var tableIns = table.render({
                elem: '#LAY-app-content-list',
                height: 'full-95',
                height: h1,
                id: 'LAY-app-content-list',
                url: url,
                method: 'post',

 HTML/views/StatisticalReport/AdventSlot.html

@@ -19,10 +19,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0; ">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                    <div class="layui-form-item">
                        
                        <div class="layui-inline zongdan" >
@@ -95,6 +95,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
                        <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -173,6 +176,9 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
				
                var h1 = GetTableHeight();

                refreshTable("","","","","","","","","");
                var tableIns;

@@ -297,7 +303,7 @@
                        }
                        infoOptions = {
                            elem: '#LAY-app-content-list',
                            height: 'full-136',
                            height: h1,
                            id: 'LAY-app-content-list',
                            page: true,
                            limit: pageCnt,

 HTML/views/StatisticalReport/BoxInfor.html

@@ -27,11 +27,10 @@
          </script>
        
    </head>
    <body>

    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                    <div class="layui-form-item" style="margin-bottom: 0px;">
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
@@ -148,19 +147,20 @@
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>导出
                            </button> 
                        </div>
				
					
                    </div>
                </div>
				
                
                <div class="layui-card-body">
                    <div style="position: relative;">
                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                            <ul class="layui-tab-title">
                            <ul class="layui-tab-title" id="tab">
                                <li  class="layui-this">托盘明细</li>
                                <li >箱码明细</li>
                            </ul>

                            <div id="center">	
                            </div>

                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
@@ -280,6 +280,9 @@
                    element = layui.element;
                    laydate = layui.laydate;

                var h1 = GetTableTabHeight();
                // var h1 =  GetTkableTopHeight();
                // console.log(h1)
                
                laydate.render({
                    elem: '#StartTime',
@@ -424,7 +427,7 @@
                        }
                        infoOptions = {
                            elem: '#LAY-app-content-list',
                            height: 'full-206',
                            height: h1,
                            id: 'LAY-app-content-list',
                            page: true,
                            limit: pageCnt,
@@ -587,7 +590,7 @@
                        }
                        infoOptions2 = {
                            elem: '#LAY-app-content-list2',
                            height: 'full-206',
                            height: h1,
                            id: 'LAY-app-content-list2',
                            page: true,
                            limit: pageCnt,

 HTML/views/StatisticalReport/InOutBoundReports.html

@@ -27,11 +27,11 @@
            });
          </script>
    </head>
    <body>
    <body id="body">

        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto"  id="top">
                    <div class="layui-form-item" style="margin-bottom: 0px;">
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
@@ -87,10 +87,13 @@
                <div class="layui-card-body">
                    <div style="position: relative;">
                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                            <ul class="layui-tab-title">
                            <ul class="layui-tab-title" id="tab">
                                <li  class="layui-this">总量</li>
                                <li >记录</li>
                            </ul>

                            <div id="center"></div>

                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
@@ -161,6 +164,7 @@
                    element = layui.element;
                    laydate = layui.laydate;

                var h1 = GetTableTabHeight();
                
                laydate.render({
                    elem: '#StartTime',
@@ -295,7 +299,7 @@
                        }
                        infoOptions = {
                            elem: '#LAY-app-content-list',
                            height: 'full-164',
                            height: h1,
                            id: 'LAY-app-content-list',
                            page: true,
                            limit: pageCnt,
@@ -471,7 +475,7 @@
                        }
                        infoOptions2 = {
                            elem: '#LAY-app-content-list2',
                            height: 'full-164',
                            height: h1,
                            id: 'LAY-app-content-list2',
                            page: true,
                            limit: pageCnt,

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -29,11 +29,11 @@

</head>

<body>
<body id="body">

    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                <div class="layui-form-item" style="margin-bottom: 0px;">

                    <div class="layui-inline zongdan">
@@ -155,10 +155,13 @@
            <div class="layui-card-body">
                <div style="position: relative;">
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                        <ul class="layui-tab-title">
                        <ul class="layui-tab-title" id="tab">
                            <li class="layui-this">库存总量</li>
                            <li>库存明细</li>
                        </ul>

                        <div id="center"></div>

                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
@@ -255,6 +258,7 @@
            element = layui.element;
            laydate = layui.laydate;

            var h1 = GetTableTabHeight();

            laydate.render({
                elem: '#StartTime',
@@ -382,7 +386,7 @@
                    }
                    infoOptions = {
                        elem: '#LAY-app-content-list',
                        height: 'full-206',
                        height: h1,
                        id: 'LAY-app-content-list',
                        totalRow: true,
                        page: true,
@@ -549,7 +553,7 @@
                    }
                    infoOptions2 = {
                        elem: '#LAY-app-content-list2',
                        height: 'full-206',
                        height: h1,
                        id: 'LAY-app-content-list2',
                        page: true,
                        limit: pageCnt,

 HTML/views/StatisticalReport/LowStockSlotList.html

@@ -19,10 +19,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0; ">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
@@ -62,6 +62,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
                        <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -107,6 +110,7 @@
                    layer = layui.layer;

                var $ = layui.$;
                var h1 = GetTableHeight();

                refreshTable("","","","");
                var tableIns;
@@ -193,7 +197,7 @@
                        }
                        infoOptions = {
                            elem: '#LAY-app-content-list',
                            height: 'full-94',
                            height: h1,
                            id: 'LAY-app-content-list',
                            page: true,
                            limit: pageCnt,

 HTML/views/SystemSettings/Category.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">类别名称</label>
@@ -48,6 +48,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>

@@ -78,6 +81,7 @@
                    laypage = layui.laypage,
                    layer = layui.layer;

                var h1 = GetTableHeight();
                var tableIns;

                //获取区域信息
@@ -165,7 +169,7 @@
                
                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: "full-95",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,

 HTML/views/SystemSettings/Dictionary.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">字典名称</label>
@@ -88,6 +88,9 @@
                        </div>
                    </div>
                </div>
				
                <div id="center"></div>

                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    <!-- 是否公开 -->
@@ -154,7 +157,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;

                    var h1 = GetTableHeight();
                var tableIns;

                //获取父级字典号
@@ -246,7 +249,7 @@
                
                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: "full-95",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,

 HTML/views/SystemSettings/FunSetting.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">功能名称</label>
@@ -56,6 +56,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    <script type="text/html" id="buttonIsEnable">
@@ -91,7 +94,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;

                var h1 = GetTableHeight();
                var tableIns;

                function refreshTable(FunSetName, IsEnable,GroupNo) {
@@ -164,7 +167,7 @@

                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: "full-95",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,

 HTML/views/SystemSettings/LogOperation.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0; ">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item" >
                        <div class="layui-inline">
                            <label class="layui-form-label">菜单号</label>
@@ -55,6 +55,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                </div>
@@ -74,7 +77,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;

                    var h1 = GetTableHeight();
                    refreshTable("", "", "", "","");
                    var tableIns;

@@ -162,7 +165,7 @@
                }
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-94',
                    height: h1,
                    id: 'LAY-app-content-list',
                    page: true,
                    limit: pageCnt,

 HTML/views/SystemSettings/Menumanagement.html

@@ -17,9 +17,9 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-card" style="margin-bottom: 0px;">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                <div class="layui-form-item" >
                    <div class="layui-inline">
                        <label class="layui-form-label">菜单名称</label>
@@ -66,6 +66,9 @@
                    </div>
                </div>
            </div>

            <div id="center"></div>

            <div class="layui-card-body">
                <!-- <div style="padding-bottom: 5px;display: flex; flex-direction: row-reverse;">                    
                    <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-hide layui-btn-danger" data-type="hide">
@@ -119,6 +122,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
                var h1 = GetTableHeight();
                refreshTable("","","","","");
                var tableIns;

@@ -288,7 +292,7 @@
                // 表单需要的变量
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-88',
                    height: h1,
                    id: 'LAY-app-content-list',
                    page: true,
                    limit: pageCnt,

 HTML/views/SystemSettings/Role.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 56px">角色编号</label>
@@ -46,6 +46,8 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <!-- <div style="padding-bottom: 5px;display: flex;flex-direction: row-reverse;">
@@ -85,7 +87,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;

                var h1 = GetTableHeight();
                refreshTable("", "");
                var tableIns;

@@ -183,7 +185,7 @@

                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: "full-95",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,

 HTML/views/SystemSettings/UserManage.html

@@ -17,10 +17,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item" >
                        <div class="layui-inline">
                            <label class="layui-form-label">登录名</label>
@@ -59,6 +59,9 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>

                <div class="layui-card-body">
                    <!-- <div style="padding-bottom: 5px;display: flex; flex-direction: row-reverse;">                        
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-hide layui-btn-danger" data-type="hide">
@@ -107,6 +110,7 @@
                    laypage = layui.laypage,
                    layer = layui.layer;

                    var h1 = GetTableHeight();
                    refreshTable("", "", "", "");
                    var tableIns;
                  //获取角色信息
@@ -249,7 +253,7 @@
                })
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-95',
                    height: h1,
                    id: 'LAY-app-content-list',
                    page: true,
                    limit: pageCnt,

			@@ -179,6 +179,9 @@
			var bodyHeight = $("#body").outerHeight();
			var topHeight = $("#top").outerHeight();
			var centerHeight = $("#center").outerHeight();
			// console.log(bodyHeight);
			// console.log(topHeight);
			// console.log(centerHeight);

			var hh = bodyHeight - topHeight-centerHeight - 26 ;//6是body上内边距
			return hh;
			@@ -207,6 +210,20 @@
			var h2 = parseInt(hh*0.4)
			return h2;
			}
			//获取除搜索条件以及页签外高度
			function GetTableTabHeight() {
			var bodyHeight = $("#body").outerHeight();
			var topHeight = $("#top").outerHeight();
			var centerHeight = $("#center").outerHeight();
			var tabHeight = $("#tab").outerHeight();
			// console.log(bodyHeight);
			// console.log(topHeight);
			// console.log(centerHeight);
			// console.log(tabHeight);

			var hh = bodyHeight - topHeight-centerHeight-tabHeight - 57 ;//6是body上内边距
			return hh;
			}

			//判断是否正整数 true 正整数 false 其他
			function isIntNum(val){

			@@ -34,11 +34,11 @@
			</script>
			</head>

			<body>
			<body id="body">

			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 60px;">入库单号</label>
			@@ -146,10 +146,13 @@
			<div class="layui-card-body">
			<div style="position: relative;">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<ul class="layui-tab-title">
			<ul class="layui-tab-title" id="tab">
			<li class="layui-this">托盘信息</li>
			<li >箱码信息</li>
			</ul>

			<div id="center"></div>

			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			@@ -374,6 +377,7 @@
			laypage = layui.laypage,
			layer = layui.layer;
			laydate = layui.laydate;
			var h1 = GetTableTabHeight();
			laydate.render({
			elem: '#StartTime'
			, format: 'yyyy-MM-dd' //可任意组合
			@@ -684,7 +688,7 @@
			table.render({
			id: 'PalletBind',
			elem: '#PalletBind',
			height: 'full-210',
			height: h1,
			url: IP + "/BllAsn/GetPalletBindList",
			method: 'post',
			contentType: 'application/json',
			@@ -930,7 +934,7 @@
			table.render({
			id: 'BoxInfo',
			elem: '#BoxInfo',
			height: 'full-210',
			height: h1,
			url: IP + "/BllAsn/GetBoxInfoList",
			method: 'post',
			contentType: 'application/json',

			@@ -17,10 +17,10 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 56px">部门编码</label>
			@@ -41,6 +41,8 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">
			<div style="padding-bottom: 5px;display: flex;flex-direction: row-reverse;">
			@@ -81,6 +83,7 @@
			laypage = layui.laypage,
			layer = layui.layer;

			var h1 = GetTableHeight();
			refreshTable("", "");
			var tableIns;

			@@ -170,7 +173,7 @@

			var infoOptions = {
			elem: "#LAY-app-content-list",
			height: "full-129",
			height: h1,
			id: "LAY-app-content-list",
			page: true,
			limit: pageCnt,

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="utf-8">
			<title>用户信息列表</title>
			<title>操作日志</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			@@ -17,10 +17,10 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item" >
			<div class="layui-inline">
			<label class="layui-form-label">菜单号</label>
			@@ -55,6 +55,9 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
			</div>
			@@ -75,6 +78,7 @@
			laypage = layui.laypage,
			layer = layui.layer;

			var h1 = GetTableHeight();
			refreshTable("", "", "", "","");
			var tableIns;

			@@ -162,7 +166,7 @@
			}
			var infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-94',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,

			@@ -26,11 +26,11 @@
			</script>
			</head>

			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<!-- 查询条件 -->
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 60px;">包装编码</label>
			@@ -67,6 +67,8 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">
			<!-- 按钮 -->
			@@ -119,6 +121,7 @@
			form = layui.form,
			laypage = layui.laypage,
			layer = layui.layer;
			var h1 = GetTableHeight();
			var param = {
			Id: $.cookie('userId')
			}
			@@ -130,7 +133,7 @@
			};
			var tableIns = table.render({
			elem: '#LAY-app-content-list',
			height: 'full-95',
			height: h1,
			id: 'LAY-app-content-list',
			url: url,
			method: 'post',

			@@ -20,11 +20,11 @@
			</script>
			</head>

			<body>
			<body id="body">

			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 60px;">单位编码</label>
			@@ -54,6 +54,8 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
			@@ -86,6 +88,7 @@
			laypage = layui.laypage,
			layer = layui.layer;

			var h1 = GetTableHeight();

			var param = {
			Id: $.cookie('userId')
			@@ -101,7 +104,7 @@

			var tableIns = table.render({
			elem: '#LAY-app-content-list',
			height: 'full-95',
			height: h1,
			id: 'LAY-app-content-list',
			url: url,
			method: 'post',

			@@ -19,10 +19,10 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0; ">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item">

			<div class="layui-inline zongdan" >
			@@ -95,6 +95,9 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
			@@ -173,6 +176,9 @@
			form = layui.form,
			laypage = layui.laypage,
			layer = layui.layer;

			var h1 = GetTableHeight();

			refreshTable("","","","","","","","","");
			var tableIns;

			@@ -297,7 +303,7 @@
			}
			infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-136',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,

			@@ -27,11 +27,10 @@
			</script>

			</head>
			<body>

			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item" style="margin-bottom: 0px;">
			<div class="layui-inline zongdan" >
			<label class="layui-form-label" style="width: 60px;">物料编码</label>
			@@ -148,19 +147,20 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>导出
			</button>
			</div>


			</div>
			</div>


			<div class="layui-card-body">
			<div style="position: relative;">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<ul class="layui-tab-title">
			<ul class="layui-tab-title" id="tab">
			<li class="layui-this">托盘明细</li>
			<li >箱码明细</li>
			</ul>

			<div id="center">
			</div>

			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			@@ -280,6 +280,9 @@
			element = layui.element;
			laydate = layui.laydate;

			var h1 = GetTableTabHeight();
			// var h1 = GetTkableTopHeight();
			// console.log(h1)

			laydate.render({
			elem: '#StartTime',
			@@ -424,7 +427,7 @@
			}
			infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,
			@@ -587,7 +590,7 @@
			}
			infoOptions2 = {
			elem: '#LAY-app-content-list2',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list2',
			page: true,
			limit: pageCnt,

			@@ -27,11 +27,11 @@
			});
			</script>
			</head>
			<body>
			<body id="body">

			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item" style="margin-bottom: 0px;">
			<div class="layui-inline zongdan" >
			<label class="layui-form-label" style="width: 60px;">物料编码</label>
			@@ -87,10 +87,13 @@
			<div class="layui-card-body">
			<div style="position: relative;">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<ul class="layui-tab-title">
			<ul class="layui-tab-title" id="tab">
			<li class="layui-this">总量</li>
			<li >记录</li>
			</ul>

			<div id="center"></div>

			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			@@ -161,6 +164,7 @@
			element = layui.element;
			laydate = layui.laydate;

			var h1 = GetTableTabHeight();

			laydate.render({
			elem: '#StartTime',
			@@ -295,7 +299,7 @@
			}
			infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-164',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,
			@@ -471,7 +475,7 @@
			}
			infoOptions2 = {
			elem: '#LAY-app-content-list2',
			height: 'full-164',
			height: h1,
			id: 'LAY-app-content-list2',
			page: true,
			limit: pageCnt,

			@@ -29,11 +29,11 @@

			</head>

			<body>
			<body id="body">

			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item" style="margin-bottom: 0px;">

			<div class="layui-inline zongdan">
			@@ -155,10 +155,13 @@
			<div class="layui-card-body">
			<div style="position: relative;">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<ul class="layui-tab-title">
			<ul class="layui-tab-title" id="tab">
			<li class="layui-this">库存总量</li>
			<li>库存明细</li>
			</ul>

			<div id="center"></div>

			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			@@ -255,6 +258,7 @@
			element = layui.element;
			laydate = layui.laydate;

			var h1 = GetTableTabHeight();

			laydate.render({
			elem: '#StartTime',
			@@ -382,7 +386,7 @@
			}
			infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list',
			totalRow: true,
			page: true,
			@@ -549,7 +553,7 @@
			}
			infoOptions2 = {
			elem: '#LAY-app-content-list2',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list2',
			page: true,
			limit: pageCnt,

			@@ -17,9 +17,9 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-card" style="margin-bottom: 0px;">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item" >
			<div class="layui-inline">
			<label class="layui-form-label">菜单名称</label>
			@@ -66,6 +66,9 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">
			<!-- <div style="padding-bottom: 5px;display: flex; flex-direction: row-reverse;">
			<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-hide layui-btn-danger" data-type="hide">
			@@ -119,6 +122,7 @@
			form = layui.form,
			laypage = layui.laypage,
			layer = layui.layer;
			var h1 = GetTableHeight();
			refreshTable("","","","","");
			var tableIns;

			@@ -288,7 +292,7 @@
			// 表单需要的变量
			var infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-88',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,