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

zhang

5 天以前 8f6ebf95e57c6f39ec11002de79bf6ed16844a5c

 src/main/webapp/static/js/order/out.js

@@ -42,6 +42,15 @@
            ,{field: 'memo', align: 'center',title: '备注', hide: false}
            ,{field: 'qty', align: 'center',title: '作业数量', style: 'font-weight: bold'}
            ,{field: 'enableQty', align: 'center',title: '待出数量', style: 'font-weight: bold'}
            ,{field: 'finishStatus', align: 'center', title: '是否完成', templet: function(d){
                    if (d.qty === 0 && d.enableQty === 0) {
                        return '<span style="color:green;font-weight:bold;">完成</span>';
                    } else {
                        return '<span style="color:red;">未完成</span>';
                    }
                }}


            // ,{field: 'name', align: 'center',title: '名称'}
            // ,{field: 'unit', align: 'center',title: '单位', hide: true}
            // ,{field: 'barcode', align: 'center',title: '商品条码', hide: true}
@@ -321,10 +330,53 @@
                            }

                        }
                        ,yes: function(index, layero){
                            //按钮【立即出库】的回调
                            pakout(tableCache, index);
                        ,yes: function(layerIndex, layero){
                            // 立即出库按钮点击 → 先请求下拉列表
                            let loadIndex = layer.load(2);
                            $.ajax({
                                url: baseUrl + "/getMesOrder/auth", // 你提供的接口
                                headers: {'token': localStorage.getItem('token')},
                                method: 'POST',
                                success: function(res){
                                    layer.close(loadIndex);
                                    if(res.code === 200){
                                        // 弹出二次确认框
                                        layer.open({
                                            type: 1,
                                            title: '请选择组货单号',
                                            area: ['400px','200px'],
                                            content: $('#staBatchSelectDialog').html(),
                                            success: function(layero2, index2){
                                                // 渲染下拉框
                                                let select = $(layero2).find('#batchSelectStaBox');
                                                select.empty().append(`<option value="">请选择组货单号</option>`);
                                                res.data.forEach(item => {
                                                    select.append(`<option value="${item}">${item}</option>`);
                                                });
                                                // 注意这里 select 要加 lay-search 属性
                                                select.attr("lay-search", "");
                                                layui.form.render('select');



                                                // 确认按钮
                                                form.on('submit(staBatchSelectConfirm)', function(obj){
                                                    let selectedValue = obj.field.batchSta;
                                                    console.log(selectedValue)
                                                    layer.close(index2);
                                                    // 调用原来的出库函数，同时传下拉值
                                                    pakout(tableCache, layerIndex, selectedValue);
                                                    return false;
                                                });
                                            }
                                        });
                                    } else {
                                        layer.msg(res.msg, {icon: 2});
                                    }
                                }
                            });
                        }

                        ,btn2: function(index, layero){
                            //按钮【稍后处理】的回调
                            layer.close(index)
@@ -340,14 +392,14 @@
        })
    }

    function pakout(tableCache, layerIndex) {
        // let loadIndex = layer.load(2);
    function pakout(tableCache, layerIndex, optionValue) {
        // 可以把 optionValue 传给接口
        notice.msg('正在生成出库任务......', {icon: 4});
        $.ajax({
            url: baseUrl + "/out/pakout/auth",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(tableCache),
            data: JSON.stringify({tableCache,optionValue}),
            method: 'POST',
            success: function (res) {
                notice.destroy();
@@ -367,6 +419,8 @@





    /* 删除订单 */
    function doDelSensor(obj) {
        layer.confirm('确定要删除选中数据吗？', {