Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-10-15 4322ae28f78e1c393eb85eece4d8a4485bb23f7c

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport.html

@@ -49,6 +49,12 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">部门名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <div class="layui-input-block">
                                        <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="只显示未完工">
                                    </div>
@@ -58,7 +64,7 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    

                                </div>
                            </div>
                        </div>
@@ -66,7 +72,8 @@
                        <script type="text/html" id="toolbarDemo">
                            <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="set_HideColumn" id="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>
@@ -96,6 +103,7 @@
            var sWhere = "";
            var option = [];
            var HModName = "Mes_OrderProcFlowAllReport";
            var ins;
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -113,8 +121,24 @@
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                    case 'set_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().replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            }
                        });

                        table.exportFile(ins.config.id, option.data, "xls");
                        break;
                };
            });
@@ -197,7 +221,8 @@
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            ins = table.render(option);
                            DisPlay_HideColumn();
                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -214,6 +239,7 @@
            function get_FastQuery() {
                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//订单跟踪号
                var txtHMaterNumber = $("#txtHMaterNumber").val(); //物料
                var txtHDeptName = $("#txtHDeptName").val(); //物料
                var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//复选框
                var check = "";
                if (chkHShowUnFinish) {
@@ -293,7 +319,7 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'";
                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
@@ -303,6 +329,7 @@
            function set_ClearQuery() {
                $("#txtHOrderProcNo").val("");
                $("#txtHMaterNumber").val("");
                $("#txtHDeptName").val("");
                $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
                $("#ColContent").val("");
                $("#ColName").val("0");
@@ -324,7 +351,7 @@
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();
@@ -363,7 +390,7 @@
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
@@ -411,6 +438,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
@@ -440,6 +468,14 @@
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //设置表格title属性显示别名
                                if (dataCols[4] != null && dataCols[4] != "") {
                                    option.cols[0][i + 1]["title"] = dataCols[4];
                                }
                                //统计列
                                if (dataCols[6] == 1) {
                                    option.cols[0][i + 1]["totalRow"] = true;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":