wtt
2025-02-21 a52aa2bd6f5d346735a059b63c573120d4f11af7
齐套报表优化
5个文件已修改
93 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePieceWorkReport.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,4 +1,5 @@

function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportMOMaterReadysBillList.html
@@ -101,7 +101,7 @@
                                                <input type="text" class="layui-input" name="HMaterAtt" id="HMaterAtt">
                                            </div>
                                        </div>
                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
@@ -183,7 +183,7 @@
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                            </div>
                                        </div>
                                        </div>-->
                                    </div>
                                </div>
WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteDetailList.html
@@ -184,6 +184,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                            </div>
                        </script>
                    </form>
@@ -222,6 +223,7 @@
        var HICMOInterID = -1;//日计划订单主内码
        var HModName = "JIT_CompleteDetailList";
        var titleData = [];//不需要显示的字段 å¯æ‰©å±•
        var ins = "";
        //#endregion
        //#region åˆå§‹åŒ–界面
@@ -259,6 +261,10 @@
                case 'set_HideColumn':
                    get_HideColumn();
                    break;
                //导出excel
                case 'get_export':
                    get_Export();
                    break;
            };
        });
        //#endregion
@@ -292,7 +298,7 @@
            //初始化表格
            set_InitGrid();
            //查询
            get_Display(sWhere);
            get_FastQuery();
            ColFilter();
        }
@@ -369,7 +375,7 @@
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
                        table.render(option);
                        ins = table.render(option);
                        layer.close(ajaxLoad);
                        DisPlay_HideColumn();
@@ -567,7 +573,20 @@
        }
        function get_Export() {
            var data = option.data;
            data.forEach((item) => {
                for (let itemobj in item) {
                    if (item[itemobj] == null) {
                        item[itemobj] = "";
                    }
                    if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                        item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                    }
                }
            });
            table.exportFile(ins.config.id, data, "xls");
        }
        //隐藏列设置
@@ -695,8 +714,10 @@
                            }
                        }
                        table.render(option);
                        console.log(option)
                    } else {
                        table.render(option);
                        console.log(option)
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePieceWorkReport.html
@@ -113,7 +113,7 @@
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                    <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
@@ -195,7 +195,7 @@
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                    </div>-->
                                </div>
                            </div>
                        </div>
@@ -204,6 +204,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                            </div>
                        </script>
                    </form>
@@ -232,6 +233,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins = "";
            var HModName = "Sc_EmployeePieceWorkReport";
            //#endregion
@@ -252,6 +254,22 @@
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出excel
                    case 'get_export':
                        var data = option.data
                        data.forEach((item) => {
                            for (let itemobj in item) {
                                if (item[itemobj] == null) {
                                    item[itemobj] = "";
                                }
                                if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                                    item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',', ',');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            }
                        });
                        table.exportFile(ins.config.id, option.data, "xls");
                        break;
                };
            });
@@ -290,7 +308,7 @@
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
                ColFilter();
                /*ColFilter();*/
            }
            //初始化表格
@@ -300,7 +318,9 @@
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , limit: 50 // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , limits: [50, 200, 500, 1000]
                    , page: true
                    , height: 'full-70'
                };
            }
@@ -342,7 +362,7 @@
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPSumReport.html
@@ -100,7 +100,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
@@ -182,7 +182,7 @@
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                            </div>
                                        </div>
                                        </div>-->
                                        <!--<div class="layui-inline">
        <label class="layui-form-label" style="width: 85px;">员工工号</label>
        <div class="layui-input-block" style="margin-left: 120px;">
@@ -205,6 +205,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-return"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                            </div>
                        </script>
                    </form>
@@ -234,6 +235,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins = "";
            var HModName = "Sc_WorkShopProcessWIPSumReport";
            //#endregion
@@ -258,6 +260,22 @@
                    //隐藏列设置
                    case 'btn-Print':
                        get_Print();
                        break;
                    //导出excel
                    case 'get_export':
                        var data = option.data
                        data.forEach((item) => {
                            for (let itemobj in item) {
                                if (item[itemobj] == null) {
                                    item[itemobj] = "";
                                }
                                if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                                    item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',', ',');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            }
                        });
                        table.exportFile(ins.config.id, option.data, "xls");
                        break;
                          
                };
@@ -297,7 +315,7 @@
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
                ColFilter();
/*                ColFilter();*/
            }
            //初始化表格
@@ -307,7 +325,9 @@
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , limit: 50 // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , limits:[50,200,500,1000]
                    , page: true
                    , height: 'full-70'
                };
            }
@@ -349,7 +369,7 @@
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            ins = table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -679,7 +699,6 @@
                    }
                })
            }
            //#endregion
        });