修改表格查询页面

src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@@ -57,7 +57,7 @@ public class MaterialController {
      */
     @GetMapping("/material")
     public RestResponse findMaterial(@RequestParam Map<String, Object> map) {
-        List<MaterialP> materialPByCondition = materialService.findMaterialPByCondition(map);
+        List<Material> materialPByCondition = materialService.findMaterialPByConditionForTable(map);
         return new RestResponse(materialPByCondition, materialService.findCountByCondition(map), 200);
     }
 
@@ -409,25 +409,25 @@ public class MaterialController {
         List<MaterialP> materialPByCondition = new ArrayList<>();
         List<InventoryP> inventoryPByCondition = new ArrayList<>();
         param.put("mcode", code);
-        for (Depository depository : depositoryByAdminorg) {
-            param.put("depositoryId", depository.getId());
-            // 查找当前用户部门仓库中是否存在该物料
-            inventoryPByCondition = materialService.findInventory(param);
-            if (inventoryPByCondition.size() > 0) {
-                break;
-            }
+
+        List<Integer> depositoryIdList = new ArrayList<>();
+        for (Depository depository : depositoryByAdminorg
+        ) {
+            depositoryIdList.add(depository.getId());
         }
-        if(inventoryPByCondition.size() <= 0) {
-            for (RoleAndDepository depository : depositoryAndRole
-            ) {
-                param.put("depositoryId", depository.getDepositoryId());
-                // 查找当前用户部门仓库中是否存在该物料
-                inventoryPByCondition = materialService.findInventory(param);
-                if (inventoryPByCondition.size() > 0) {
-                    break;
-                }
+        for (RoleAndDepository rad : depositoryAndRole
+        ) {
+            if (!depositoryIdList.contains(rad.getDepositoryId())) {
+                depositoryIdList.add(rad.getDepositoryId());
             }
         }
+        for (Integer depositoryId :depositoryIdList
+        ) {
+            param.put("depositoryId", depositoryId);
+            List<InventoryP> inventoryPS = materialService.findInventory(param);
+            inventoryPByCondition.addAll(inventoryPS);
+        }
+
         MaterialP mp = null;
         InventoryP ip = null;
         Map<String, Object> paramByPrice = new HashMap<>();
@@ -488,11 +488,25 @@ public class MaterialController {
     @PostMapping("/findInventoryByCondition")
     public RestResponse findInventoryByCondition(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+        // 查询当前用于部门的仓库
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
-
+        // 查询当前用户管理的仓库
+        List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
         List<InventoryP> inventoryPList = new ArrayList<>();
-        for (Depository value : depositoryByAdminorg) {
-            map.put("depositoryId", value.getId());
+        List<Integer> depositoryIdList = new ArrayList<>();
+        for (Depository depository : depositoryByAdminorg
+        ) {
+            depositoryIdList.add(depository.getId());
+        }
+        for (RoleAndDepository rad : depositoryAndRole
+        ) {
+            if (!depositoryIdList.contains(rad.getDepositoryId())) {
+                depositoryIdList.add(rad.getDepositoryId());
+            }
+        }
+        for (Integer depositoryId :depositoryIdList
+             ) {
+            map.put("depositoryId", depositoryId);
             List<InventoryP> inventoryPS = materialService.findInventory(map);
             inventoryPList.addAll(inventoryPS);
         }
@@ -517,7 +531,7 @@ public class MaterialController {
             inventoryP.setPlacePList(placeList);
         }
 
-        return new RestResponse(inventoryPList, materialService.findInventoryCount(map), 200);
+        return new RestResponse(inventoryPList, inventoryPList.size(), 200);
     }
 
 

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -2330,7 +2330,7 @@ public class PageController {
             Map<String, Object> portInfo = PortConfig.findUserByQyWxUserId(department);
             UserByPort userByPort = (UserByPort) portInfo.get("user");
             departmentHeadName.append(userByPort.getName()).append(",");
-            departmentHeadId.append(userByPort.getId()).append(",");
+            departmentHeadId.append(userByPort.getNumber()).append(",");
         }
         mv.addObject("departmentHeadName", departmentHeadName.toString());
         mv.addObject("departmentHeadId", departmentHeadId.toString());

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java

@@ -122,6 +122,8 @@ public interface MaterialMapper {
     List<Material> findMaterialByCondition(Map<String,Object>map);
 
 
+
+
     /**
      * 根据条件查询物料总数
      * @param map 查询条件

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -217,6 +217,8 @@
 
     </select>
 
+
+
     <!-- 根据条件参数查询数据列表 -->
     <select id="findMaterialByCondition" resultMap="materialMap" parameterType="map">
         SELECT

src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java

@@ -44,13 +44,21 @@ public interface MaterialService {
     Integer deleteMaterialById(int id);
 
     /**
-     * 根据条件查询符合条件的库存信息
+     * 根据条件查询符合条件的物料信息
      * @param map 条件map
-     * @return 符合条件的库存信息
+     * @return 符合条件的物料信息
      */
     List<MaterialP> findMaterialPByCondition(Map<String, Object> map);
 
 
+    /**
+     * 根据条件查询符合条件的物料信息（用于表格展示）
+     * @param map 条件map
+     * @return 符合条件的物料信息
+     */
+    List<Material> findMaterialPByConditionForTable(Map<String, Object> map);
+
+
     /**
      * 根据物料名与物料规格型号查询对应的物料
      * @param map

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -243,6 +243,30 @@ public class MaterialServiceImpl implements MaterialService {
         return packForMatieral(list);
     }
 
+    /**
+     * 根据条件查询符合条件的物料信息（用于表格展示）
+     * @param map 条件map
+     * @return 符合条件的物料信息
+     */
+    @Override
+    public List<Material> findMaterialPByConditionForTable(Map<String, Object> map) {
+        Integer size = 10, page = 1;
+        if (map.containsKey("size")) {
+            size = ObjectFormatUtil.toInteger(map.get("size"));
+            map.put("size", size);
+        }
+        if (map.containsKey("page")) {
+            page = ObjectFormatUtil.toInteger(map.get("page"));
+            map.put("begin", (page - 1) * size);
+        }
+        Object state = 1;
+        if (map.containsKey("state")) {
+            state = map.get("state");
+        }
+        map.put("state", state);
+        return materialMapper.findMaterialByCondition(map);
+    }
+
     /**
      * 根据物料名与物料规格型号查询对应的物料
      *
@@ -786,48 +810,10 @@ public class MaterialServiceImpl implements MaterialService {
         List<MaterialP> result = new ArrayList<>(list.size());
         for (Material material : list) {
             MaterialP m = new MaterialP(material);
-            Integer warningCount = 0;
-            Integer depositoryId = material.getDepositoryId();
-            if (depositoryId != null) {
-                m.setDepositoryName(depositoryMapper.findDepositoryNameById(depositoryId));
-                m.setWarehouseManager(depositoryMapper.findUserNameByDepositoryId(depositoryId));
-            }
             Long producedDate = material.getProducedDate();
             if (producedDate != null) {
                 m.setProducedDate(DateUtil.TimeStampToDateTimeForDay(producedDate));
             }
-            // 设置当前物料保质期的具体时间
-            Long calcShelfLife = 0L;
-
-            String currentDate = DateUtil.getCurrentDate();
-            // 获取当天时间
-            Long nowDay = DateUtil.DateTimeByDayToTimeStamp(currentDate);
-            Long life = material.getShelfLife();
-            if (life != null) {
-                String shelfLife = String.valueOf(life);
-                String dateType = shelfLife.substring(0, 1);
-                String dateTime = shelfLife.substring(1);
-                if ("1".equals(dateType)) {
-                    m.setShelfLife(dateTime + "年");
-                    calcShelfLife = ObjectFormatUtil.toLong(dateTime) * 365 * DateUtil.dayTime;
-                } else if ("2".equals(dateType)) {
-                    m.setShelfLife(dateTime + "月");
-                    calcShelfLife = ObjectFormatUtil.toLong(dateTime) * 30 * DateUtil.dayTime;
-                } else if ("3".equals(dateType)) {
-                    m.setShelfLife(dateTime + "天");
-                    calcShelfLife = ObjectFormatUtil.toLong(dateTime) * DateUtil.dayTime;
-                }
-                // 获取当前没有使用完成的物料对应的生产日期对应
-                List<MaterialAndProducedDate> materialAndProducedDateByMid = materialMapper.findMaterialAndProducedDateByMid(m.getId());
-                for (MaterialAndProducedDate materialAndProducedDate : materialAndProducedDateByMid) {
-                    // 获取当前入库时的生产日期
-                    Long producedDate1 = materialAndProducedDate.getProducedDate();
-                    // 如果可使用时间（生产时间+保质期）减去当天时间 小于预警时间
-                    if ((producedDate1 + calcShelfLife) - nowDay < DateUtil.warningTime) {
-                        warningCount += materialAndProducedDate.getInventory();
-                    }
-                }
-            }
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(m.getMid());
             if(splitInfoByMid == null){
                 splitInfoByMid = new ArrayList<>();
@@ -842,7 +828,6 @@ public class MaterialServiceImpl implements MaterialService {
             MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId());
             m.setTypeName(materialTypeByOldId.getTname());
             m.setTypeId(materialTypeByOldId.getOldId());
-            m.setWarningCount(warningCount);
             m.setQuantity(1);
             result.add(m);
         }
@@ -2920,10 +2905,12 @@ public class MaterialServiceImpl implements MaterialService {
             if ("1".equals(type)) {
                 // 如果是入库
                 materialByTypeIds = materialMapper.findMaterialByTypeIdsAndMname(paramForMnameAndMtid);
-            } else if ("2".equals(type)) {
+            }
+            else if ("2".equals(type)) {
                 // 如果是出库
                 inventoryByTypeIdsAndMname = materialMapper.findInventoryByTypeIdsAndMname(paramForMnameAndMtid);
-            } else if ("3".equals(type)) {
+            }
+            else if ("3".equals(type)) {
                 // 如果是盘点
                 List<Inventory> inventoryList = materialMapper.findInventoryByTypeIdsAndMname(paramForMnameAndMtid);
 

src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java

@@ -226,6 +226,18 @@ public class LinkInterfaceUtil {
      * @return
      */
     public static List<UserByPort> findDepartmentHeadByUser(UserByPort user){
+        List<UserByPort> DepartmentHeads = new ArrayList<>();
+        if(Integer.compare(user.getId(),119) == 0){
+             // 如果申请人id为106
+            DepartmentHeads.add(user);
+            return DepartmentHeads;
+        }
+        if(Integer.compare(user.getMaindeparment(),361) == 0){
+            // 如果申请人部门为仓储
+            UserByPort userByPort = FindUserById(119, user);
+            DepartmentHeads.add(userByPort);
+            return DepartmentHeads;
+        }
         String url = PortConfig.external_url + "/staff/archiveslist";
         Integer maindeparment = user.getMaindeparment();
         Map<String,Object> map = new HashMap<>();
@@ -244,7 +256,6 @@ public class LinkInterfaceUtil {
         if(list == null){
             list = new JSONArray();
         }
-        List<UserByPort> DepartmentHeads = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             UserByPort userByPort = JSONObject.toJavaObject((JSONObject) list.get(i), UserByPort.class);
             if(userByPort.getPersonincharge() == 1){

src/main/resources/static/css/public.css

@@ -46,6 +46,10 @@ body {
     border: 1px solid #e6e6e6;
     padding: 10px 20px 5px 20px;
     color: #6b6b6b;
+    position: sticky;
+    top: 0;
+    z-index: 99;
+    background: #ffffff;
 }
 
 /**自定义滚动条样式 */

src/main/resources/templates/pages/application/application-out_min.html

@@ -63,6 +63,7 @@
                 , countName: 'count' //规定数据总数的字段名称，默认：count
                 , dataName: 'data' //规定数据列表的字段名称，默认：data
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             toolbar: '#toolbarDemo',
             //这里layui和thymeleaf冲突了，要加个空格
             cols: [

src/main/resources/templates/pages/application/application_multi.html

@@ -84,6 +84,7 @@
                 ,countName: 'count' //规定数据总数的字段名称，默认：count
                 ,dataName: 'data' //规定数据列表的字段名称，默认：data
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             toolbar: '#toolbarDemo',
             cols: [
                 [

src/main/resources/templates/pages/company/company-out.html

@@ -81,6 +81,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize', //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/company/company-out_back.html

@@ -100,6 +100,7 @@
             where: {
                 type: "0"
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             response: {
                 statusName: 'status' //规定数据状态的字段名称，默认：code
                 , statusCode: 200 //规定成功的状态码，默认：0

src/main/resources/templates/pages/company/companyByParentId.html

@@ -99,6 +99,7 @@
             },
             toolbar: '#toolbarDemo',
             defaultToolbar: ['filter', 'exports', 'print'],
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             cols: [
                 [
                     {type: "checkbox", width: 50},

src/main/resources/templates/pages/depository/table-in.html

@@ -137,6 +137,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/depository/table-out.html

@@ -168,6 +168,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/depository/table-stock.html

@@ -131,6 +131,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/group/application_multi.html

@@ -48,6 +48,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/group/group-add.html

@@ -103,6 +103,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/group/group-out.html

@@ -124,6 +124,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/group/group_edit.html

@@ -103,6 +103,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/material/material-out.html

@@ -10,62 +10,66 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 </head>
 <body>
+
+
 <div class="layuimini-container">
     <div class="layuimini-main">
         <input style="display:none;" id="nowDay" th:value="${nowDay}">
-        <fieldset class="table-search-fieldset">
-            <legend>搜索信息</legend>
-            <div style="margin: 10px 10px 10px 10px">
-                <form class="layui-form layui-form-pane" action="">
-                    <div class="layui-form-item">
-
-
-                        <div class="layui-inline">
-                            <label class="layui-form-label">种类</label>
-                            <div class="layui-input-block">
-                                <input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType"
-                                       readonly/>
-                                <input type="text" id="materialTypeId" placeholder="请选择物料类型" name="materialTypeId"
-                                       class="layui-input" style="display: none"/>
+
+            <fieldset class="table-search-fieldset" >
+                <legend>搜索信息</legend>
+                <div style="margin: 10px 10px 10px 10px" >
+                    <form class="layui-form layui-form-pane" action="">
+                        <div class="layui-form-item">
+
+
+                            <div class="layui-inline">
+                                <label class="layui-form-label">种类</label>
+                                <div class="layui-input-block">
+                                    <input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType"
+                                           readonly/>
+                                    <input type="text" id="materialTypeId" placeholder="请选择物料类型" name="materialTypeId"
+                                           class="layui-input" style="display: none"/>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label">物料名称</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="mname" autocomplete="off" class="layui-input" placeholder="请输入物料名称">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">物料名称</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="mname" autocomplete="off" class="layui-input" placeholder="请输入物料名称">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label">型号</label>
-                            <div class="layui-input-block">
-                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请输入物料型号"/>
+                            <div class="layui-inline">
+                                <label class="layui-form-label">型号</label>
+                                <div class="layui-input-block">
+                                    <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请输入物料型号"/>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label">物料编码</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入物料编码">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">物料编码</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入物料编码">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label">状态</label>
-                            <div class="layui-input-block">
-                                <select name="state">
-                                    <option value="">请选择状态</option>
-                                    <option value="1">启用</option>
-                                    <option value="2">禁用</option>
-                                </select>
+                            <div class="layui-inline">
+                                <label class="layui-form-label">状态</label>
+                                <div class="layui-input-block">
+                                    <select name="state">
+                                        <option value="">请选择状态</option>
+                                        <option value="1">启用</option>
+                                        <option value="2">禁用</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <button type="submit" class="layui-btn layui-btn-primary" lay-submit
+                                        lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                                </button>
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
-                            </button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </fieldset>
+                    </form>
+                </div >
+            </fieldset>
+
 
 
         <!--    状态展示-->
@@ -86,7 +90,7 @@
             </div>
         </script>
 
-        <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
+        <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter" style="margin-top: 123px"></table>
 
         <script type="text/html" id="currentTableBar">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
@@ -153,6 +157,7 @@
             },
             toolbar: '#toolbarDemo',
             defaultToolbar: ['filter', 'exports', 'print'],
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             cols: [
                 [
                     {type: "checkbox", width: 50},
@@ -174,6 +179,8 @@
             limit: 10,
             page: true,
             skin: 'line',
+
+
         });
 
 

src/main/resources/templates/pages/material/material-out_back.html

@@ -170,6 +170,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/materialBarCode/materialBarCode_out.html

@@ -61,6 +61,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/materialtype/materialTypeByParentId.html

@@ -89,6 +89,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/materialtype/materialType_view.html

@@ -98,6 +98,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/notice/notice-out.html

@@ -107,6 +107,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/notice/notice-out_user.html

@@ -94,6 +94,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/post/post-out.html

@@ -81,6 +81,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize', //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/post/postRole.html

@@ -46,6 +46,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/split/split-out.html

@@ -103,6 +103,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/user/table-user.html

@@ -98,6 +98,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/user/userRole.html

@@ -46,6 +46,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/warehouse/depository-out.html

@@ -102,6 +102,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/warehouse/manager.html

@@ -32,6 +32,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'pagesize' //每页数据量的参数名，默认：limit

src/main/resources/templates/pages/warehouse/warehouseByParentId.html

@@ -110,6 +110,7 @@
                     "data": res.data //解析数据列表
                 };
             },
+            height: 'full-265',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit