Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master

luxiaotao1123

2024-02-28 e32ada5186e1090927301706c2d65144926d26c3

Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master

 zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js

@@ -388,7 +388,7 @@
                }
                pageCurr=curr;

                limit(child);
                limit();
            }
        });
    });

 zy-asrs-wms/src/main/webapp/views/report/locDetl.html

@@ -58,7 +58,7 @@
            page: true,
            limit: 20,
            skin: 'line',
            where: {loc_no: $('#locNo').val()},
            where: {locNo: $('#locNo').val()},
            even: true,
            cellMinWidth: 50,
            cols: [getCol()],
@@ -67,7 +67,6 @@
                pageSize: 'limit'
            },
            parseData: function (res) {
                console.log(res)
                return {
                    'code': res.code,
                    'msg': res.msg,