Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

whycq

2023-08-28 d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020

 src/main/webapp/views/report/locDetl.html

@@ -43,7 +43,12 @@
        var $ = layui.jquery;
        var form = layui.form;

        $('#locNo').val(parent.locNo);
        var tmp = getQueryVariable("locNo")
        if (tmp == false) {
            $('#locNo').val(parent.locNo);
        }else {
            $('#locNo').val(tmp);
        }

        // 数据渲染
        tableIns = table.render({
@@ -51,9 +56,9 @@
            headers: {token: localStorage.getItem('token')},
            url: baseUrl+'/locDetl/list/auth',
            page: true,
            limit: 10,
            limit: 20,
            skin: 'line',
            where: {loc_no: parent.locNo},
            where: {loc_no: $('#locNo').val()},
            even: true,
            cellMinWidth: 50,
            cols: [getCol()],