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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

 src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js

@@ -37,7 +37,7 @@
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/barcodeMatnr/list/auth',
        page: true,
        limit: 16,
        limit: 30,
        limits: [16, 30, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
@@ -144,26 +144,82 @@
                    }
                });
                break;
            // case 'deleteData':
            //     layer.open({
            //         type: 2,
            //         title: '组托',
            //         maxmin: true,
            //         area: [top.detailWidth, top.detailHeight],
            //         content: 'barcodeMatnr_comb.html',
            //         success: function(layero, index){
            //             layer.getChildFrame('#data-detail-submit-edit', index).hide();
            //             clearFormVal(layer.getChildFrame('#detail', index));
            //             layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
            //         }
            //     });
            //     break;
            case 'deleteData':
                var data = checkStatus.data;
                if (data.length === 0){
                    layer.msg('请选择数据');
                if (checkStatus.data.length === 0){
                    layer.msg('请至少选择一条数据', {icon: 2});
                } else {
                    layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){
                    layer.confirm('确定组托吗', function(){
                        $.ajax({
                            url: baseUrl+"/waitPakin/delete/auth",
                            url: baseUrl+"/barcodeMatnr/matnrAndBarcode",
                            headers: {'token': localStorage.getItem('token')},
                            data: {param: JSON.stringify(data)},
                            data: JSON.stringify(checkStatus.data),
                            contentType:'application/json;charset=UTF-8',
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                    layer.msg(res.msg, {icon: 1})
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(res.msg, {icon: 2})
                                }
                            }
                        })
                    });
                }
                break;
            // case 'clampData':
            //     layer.open({
            //         type: 2,
            //         title: '并板',
            //         maxmin: true,
            //         area: [top.detailWidth, top.detailHeight],
            //         content: 'barcodeMatnr_clamp.html',
            //         success: function(layero, index){
            //             layer.getChildFrame('#data-detail-submit-edit', index).hide();
            //             clearFormVal(layer.getChildFrame('#detail', index));
            //             layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
            //         }
            //     });
            //     break;
            case 'clampData':
                if (checkStatus.data.length === 0){
                    layer.msg('请至少选择一条数据', {icon: 2});
                } else {
                    layer.confirm('确定并板吗', function(){
                        $.ajax({
                            url: baseUrl+"/barcodeMatnr/clamp/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: JSON.stringify(checkStatus.data),
                            contentType:'application/json;charset=UTF-8',
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                    layer.msg(res.msg, {icon: 1})
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg, {icon: 2})
                                }
                            }
                        })
@@ -338,6 +394,22 @@
        method("add");
    });

    form.on('submit(comb)', function () {
        if (banMsg != null){
            layer.msg(banMsg);
            return;
        }
        method("comb");
    });

    form.on('submit(clamp)', function () {
        if (banMsg != null){
            layer.msg(banMsg);
            return;
        }
        method("clamp");
    });

    // 数据修改动作
    form.on('submit(edit)', function () {
        method("update")
@@ -364,7 +436,7 @@

        };
        $.ajax({
            url: baseUrl+"/waitPakin/"+name+"/auth",
            url: baseUrl+"/barcodeMatnr/"+name+"/auth",
            headers: {'token': localStorage.getItem('token')},
            data: top.reObject(data),
            method: 'POST',