Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp

zhangchao

2024-11-02 3d321d82df16121e1c21fb2113757e5a16de54a2

 src/main/webapp/static/js/handWrkMast/handWrkMast.js

@@ -11,7 +11,7 @@
    tableIns = table.render({
        elem: '#wrkMast',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/wrkMastLog/list/auth',
        url: baseUrl+'/agv/wrkMastLog/list/auth',
        page: true,
        where: {manu_type : '手动'},
        limit: 50,
@@ -148,7 +148,7 @@
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: true,
                    content: 'wrkDetlLog.html',
                    content: 'wrkLog.html',
                    success: function(layero, index){
                    }
                });