Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas

wang..123

2022-03-25 f4f3c04ba37cec6739370c4aa0b9622493de8a23

 src/main/webapp/static/js/pickout/pickout.js

@@ -1,4 +1,5 @@
var pageCurr;
var currPick;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -40,6 +41,7 @@
            ,{field: 'userId', align: 'center',title: '用户ID', hide: true}

            ,{field: 'wrkSts$', align: 'center',title: '工作状态' ,templet: '#wrkStsTpl' , width: 100}
            ,{field: 'printTimes', align: 'center', title: '打印次数',width: 90}
            ,{field: 'zpallet', align: 'center',title: '条形码' , hide:true}
            ,{field: 'createTime$', align: 'center',title: '', hide:true}
            ,{field: 'createBy', align: 'center',title: '', hide:true}
@@ -56,22 +58,30 @@
    // 监听行工具事件
    table.on('tool(leftTable)', function(obj){
        var data = obj.data;



        switch (obj.event) {
            case 'complete':
                complete(data);
            case 'printOrder':
                printPick(data);
                break;
            case "del":
                var ids = [data.id];
                del(ids);
                break;
            case "complete":
                donePickOut(data);
                break;
        }
    });
    /* 监听行单击事件 */
    var selObj;
    table.on('row(leftTable)', function (obj) {
        currPick = obj.data.id;
        selObj = obj;
        obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
        tableIns.reload({where: {head_id: obj.data.id}, page: {curr: 1}});

    });

    /* 删除 */
@@ -89,18 +99,105 @@
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);

                    if (res.code === 200){

                        layer.msg(res.msg, {icon: 1});
                        tableReload();

                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                    leftTB.reload({where: null,page: {curr: 1}});
                    tableIns.reload({where: null,page: {curr: 1}});
                }
            })
        });
    }
    form.on('submit(leftResearch)', function (data) {

        leftTB.reload({where: {wrk_no: data.field.docName}});
        return false;
    });
    // 重置
    form.on('submit(leftReset)', function (data) {

        leftTB.reload({where: null,page: {curr: 1}});
        $("#docName").val("");
        tableReload(false);
    });

    function donePickOut(data) {
        $.ajax({
            url:baseUrl + "/pickout/done/auth",
            headers : {'token' : localStorage.getItem('token')},
            data: JSON.stringify(data),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            success: function (res) {

                leftTB.reload();
            }
        })
    }

    function printPick(data){
        $.ajax({
            url:baseUrl + "/work/pick/out/print",
            headers : {'token' : localStorage.getItem('token')},
            data: JSON.stringify(data),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            success: function (res) {
                    if (res.code === 200){
                        console.log(res);
                        res.data["barcodeUrl"]=baseUrl+"/order/code/auth?type=1&param="+res.data.pickout.wrkNo;
                        var tpl = $('#pakoutPrintTpl').html();
                        var template = Handlebars.compile(tpl);
                        var html = template(res);
                        var box = $("#pakoutPrintBox");
                        box.html(html);box.show();
                        box.print({
                            mediaPrint:true,
                            deferred: $.Deferred().done(function () {
                                layer.confirm('[重要] 打印是否成功？',  {btn: ['Yes', 'No']}, function(){
                                    $.ajax({
                                        url: baseUrl+"/pickout/print/auth",
                                        headers: {'token': localStorage.getItem('token')},
                                        data: JSON.stringify(res.data.pickout),
                                        contentType:'application/json;charset=UTF-8',
                                        method: 'POST',
                                        success: function (res) {
                                            if (res.code === 200){
                                                layer.closeAll();
                                                $(".layui-laypage-btn")[0].click();
                                                layer.msg(res.msg, {icon: 1})
                                            } else if (res.code === 403){
                                                top.location.href = baseUrl+"/";
                                            } else {
                                                layer.msg(res.msg, {icon: 2})
                                            }
                                            leftTB.reload();
                                        }
                                    })
                                });
                            })
                        });
                        box.hide();
                    }
                    else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2})
                    }

            }

        })
    }



    /****************************************** 右边表 *************************************************/
    // 数据渲染
@@ -133,7 +230,7 @@
            ,{field: 'price', align: 'center',title: '价格', hide:true}
            ,{field: 'weight', align: 'center',title: '重量', hide:true}
            ,{field: 'status', align: 'center',title: '状态' , hide:true}
            ,{field: 'pickStaff', align: 'center',title: '拣货员ID'}
            ,{field: 'pickStaff$', align: 'center',title: '拣货员ID'}
            ,{field: 'pickStart$', align: 'center',title: '拣货开始时间'}
            ,{field: 'pickEnd$', align: 'center',title: '拣货结束时间'}
            ,{field: 'createTime$', align: 'center',title: '创建时间', hide:true}
@@ -142,7 +239,7 @@
            ,{field: 'updateBy$', align: 'center',title: '修改人员ID', hide:true}
            ,{field: 'memo', align: 'center',title: '备注', hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150, hide:true}
        ]],
        request: {
            pageName: 'curr',
@@ -167,7 +264,12 @@
            limit();
        }
    });

    // /* 表格2搜索 */
    // form.on('submit(rightSearch)', function (data) {
    //
    //     tableIns.reload({where: data.field , page: {curr: 1}});
    //     return false;
    // });
    // // 监听排序事件
    // table.on('sort(pickout)', function (obj) {
    //     var searchData = {};
@@ -246,32 +348,36 @@
    // });
    //
    //
    // // 搜索
    // form.on('submit(search)', function (data) {
    //     pageCurr = 1;
    //     tableReload(false);
    // });
    // 搜索
    form.on('submit(rightSearch)', function (data) {
        data.field.head_id = currPick;
        tableIns.reload({
            where: data.field,
            page: {curr: 1}
        });
    });

    // 重置
    form.on('submit(reset)', function (data) {

        tableIns.reload({where: null,page: {curr: 1}});
        $("#matnr").val("");
        tableReload(false);
    });
    //
    // // 重置
    // form.on('submit(reset)', function (data) {
    //     pageCurr = 1;
    //     clearFormVal($('#search-box'));
    //     tableReload(false);
    // });
    //
    // // 时间选择器
    // function layDateRender() {
    //         layDate.render({
    //     elem: '#createTime\\$',
    //     type: 'datetime'
    // });
    //     layDate.render({
    //     elem: '#updateTime\\$',
    //     type: 'datetime'
    // });
    //
    // }
    // layDateRender();
    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#createTime\\$',
        type: 'datetime'
    });
        layDate.render({
        elem: '#updateTime\\$',
        type: 'datetime'
    });

    }
    layDateRender();

});

@@ -285,6 +391,7 @@
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });

    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}