Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 940cab832331ab054d2a4c74f13aacc6847dd79d

 src/main/webapp/static/js/report/workOut.js

@@ -1,7 +1,7 @@
var pageCurr;
function getCol() {
    var cols = [
        {field: 'io_time', align: 'center', title: '出库日期', width: 200}
        {field: 'ioTime$', align: 'center', title: '出库日期', width: 200}
        ,{field: 'loc_no', align: 'center',title: '库位号'}
        ,{field: 'crn_str_time', align: 'center',title: '堆垛机启动时间'}
        ,{field: 'crn_end_time', align: 'center',title: '堆垛机停止时间'}
@@ -90,32 +90,38 @@
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    var param = '?';
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                        param += this.name + '=' + this.value + '&';
                    });
                    var param = {
                        fields: fields,
                        exportData: exportData
                    };
                    $.ajax({
                        url: baseUrl+"/report/viewWorkOutExport.action",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                            }
                        }
                    });
                    window.location.href = baseUrl + "/report/download/out" + param;
                    layer.closeAll();
                    // var exportData = {};
                    // $.each($('#search-box [name]').serializeArray(), function() {
                    //     exportData[this.name] = this.value;
                    // });
                    // var param = {
                    //     fields: fields,
                    //     exportData: exportData
                    // };
                    // $.ajax({
                    //     url: baseUrl+"/report/viewWorkOutExport.action",
                    //     headers: {'token': localStorage.getItem('token')},
                    //     data: JSON.stringify(param),
                    //     dataType:'json',
                    //     contentType:'application/json;charset=UTF-8',
                    //     method: 'POST',
                    //     success: function (res) {
                    //         layer.closeAll();
                    //         if (res.code === 200) {
                    //             table.exportFile(titles,res.data,'xls');
                    //         } else if (res.code === 403) {
                    //             top.location.href = baseUrl+"/";
                    //         } else {
                    //             layer.msg(res.msg)
                    //         }
                    //     }
                    // });
                });
                break;
        }