#

luxiaotao1123

2022-03-28 89c7b3a61b7e182cb420a8ae0bee8b983f1311c6

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

@@ -4,7 +4,7 @@
    base: baseUrl + "/static/layui/lay/modules/"
}).extend({
    notice: 'notice/notice',
}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect'], function(){
}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
@@ -15,6 +15,7 @@
    var notice = layui.notice;
    var treeTable = layui.treeTable;
    var xmSelect = layui.xmSelect;
    var tableMerge = layui.tableMerge;

    insTb2 = table.render({
        elem: '#orderDetlTable',
@@ -138,33 +139,38 @@
                        ,closeBtn: false
                        ,offset: '100px'
                        // ,area: ['1000px', '700px']
                        ,area: '1000px'
                        ,area: '1200px'
                        ,shade: 0.5
                        ,shadeClose: true
                        ,btn: ['立即生成', '稍后处理']
                        ,btnAlign: 'c'
                        ,moveType: 1 //拖拽模式，0或者1
                        ,content: $('#pakoutPreviewBox')
                        ,content: $('#pakoutPreviewBox').html()
                        ,success: function(layero, index){
                            console.log(res.data)
                            table.render({
                                elem: '#stoPreTab',
                                data: res.data,
                                height: 450,
                                page: false,
                                limit: Number.MAX_VALUE,
                                cellMinWidth: 100,
                                height: 432,
                                cols: [[
                                    {type: 'checkbox', merge: ['orderNo']},
                                    {field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
                                    {field: 'title', title: '商品', merge: true, align: 'center', width: 300},
                                    {field: 'title', title: '商品', align: 'center', width: 350},
                                    {field: 'batch', title: '批号', merge: ['title'], align: 'center'},
                                    // {field: 'anfme', title: '总数量', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
                                    {field: 'locNo', title: '货位', align: 'center', width: 90},
                                    {field: 'batch', title: '批号', align: 'center'},
                                    {field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'locNo', title: '货位', align: 'center', width: 100, templet: '#locNoTpl'},
                                    {field: 'staNo', align: 'center', title: '出库站', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                                    // {field: 'remQty', title: '余量', align: 'center', width: 80},
                                    // {field: 'total', title: '总量', align: 'center', width: 90},
                                ]],
                                done: function () {
                                    $('.layui-table-body.layui-table-main').css("overflow", "auto")
                                done: function (res) {
                                    tableMerge.render(this);
                                    $('.layui-table-body.layui-table-main').css("overflow", "auto");

                                }
                            });

@@ -179,6 +185,10 @@
                            //return false 开启该代码可禁止点击该按钮关闭
                        }
                    });
                    form.on('select(tbBasicTbStaNos)', function (data) {
                        alert("ajax请求：" + JSON.stringify(data))
                        return false;
                    });
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {