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

mrzhssss

2022-05-27 c6ab1a516d8398de65512fcd380d89e46ec8e430

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

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -190,6 +190,7 @@
                        'locDetl': exportData,
                        'fields': fields
                    };
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/locDetl/export/auth",
                        headers: {'token': localStorage.getItem('token')},
@@ -198,6 +199,7 @@
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');

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

@@ -166,6 +166,7 @@
                                    tableCache = tableData = table.cache.stoPreTab;
                                }
                            });
                            // 修改出库站
                            form.on('select(tbBasicTbStaNos)', function (obj) {
                                let index  = obj.othis.parents('tr').attr("data-index");
                                let data = tableCache[index];
@@ -178,6 +179,23 @@
                                obj.othis.children().find("input").css("color", "blue");
                                return false;
                            });
                            // 批量修改出库站
                            form.on('submit(batchModifySta)', function () {
                                let stoPreTabData = layui.table.checkStatus('stoPreTab').data;
                                console.log(stoPreTabData)
                                if (stoPreTabData.length < 1) {
                                    layer.msg("请至少选择一条以上合并数据", {icon: 7});
                                    return false;
                                }
                                modifySta(stoPreTabData.map(function (d) {
                                    return d.id;
                                }));
                            });
                            // 批量修改出库站 - 站点选择
                            function modifySta(data) {

                            }

                        }
                        ,yes: function(index, layero){
                            //按钮【立即出库】的回调

 src/main/webapp/views/order/out.html

@@ -159,11 +159,9 @@
        <div class="layui-card-body" style="padding: 10px">
            <table id="stoPreTab" lay-filter="stoPreTab"></table>
        </div>
<!--        <div class="layui-inline">-->
<!--            <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="originTableSearch" lay-submit>-->
<!--                批量修改-->
<!--            </button>-->
<!--        </div>-->
        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
            批量修改
        </button>
    </div>
</script>