Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-07-11 8aef28e39575b910aa08c0c102c868d60fb306ea

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -309,6 +309,16 @@
                    layer.closeAll();
                });
                break;
            //  拣料入库
            case 'pick':
                layer.confirm('拣料入库该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })
                    layer.closeAll();
                });
                break;
            // 详情
            case 'detail':
                layer.open({