Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

 src/main/webapp/views/agvBasDevp/basDevpWaitPakinDetail.html

@@ -52,16 +52,16 @@
        }else {
            $('#zpallet').val(tmp);
        }

        // 数据渲染
        tableIns = table.render({
            elem: '#locDetlByMap',
            headers: {token: localStorage.getItem('token')},
            url: baseUrl+'/agv/waitPakin/list/auth',
            url: baseUrl+'/agv/basDevp/detail/list/auth',
            page: true,
            limit: 20,
            skin: 'line',
            where: {zpallet: $('#zpallet').val()},
            //where: {zpallet: $('#zpallet').val()},
            where: {devNo: parent.devNo},
            even: true,
            cellMinWidth: 50,
            cols: [getCol()],
@@ -70,6 +70,12 @@
                pageSize: 'limit'
            },
            parseData: function (res) {
                if(!res.data){
                    return {
                        'code': res.code,
                        'msg': res.msg,
                    }
                }
                return {
                    'code': res.code,
                    'msg': res.msg,