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

wtt

2025-12-03 acf8dbd4efdd5e98b53e8c9e1a435d050722f39c

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -821,9 +821,10 @@
            //初始化表格
            set_InitGrid();
            get_FastQuery(1);
            get_FastQuery_ICMO();//查询带排产订单
            //隐藏勾选字段
            DisPlay_HideColumn();
            get_Display2(sWhere_ICMO);
            
        }
        //#endregion

@@ -1073,7 +1074,7 @@
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-120'
                , height: 600
                , page: false
                , cellMinWidth: 90
                , cols: [columns]
@@ -1082,14 +1083,16 @@
                    soulTable.render(this);
                    $('.layui-table thead').on('click', 'th', function () {
                        // èŽ·å–点击的表头的 field å€¼
                        var field = $(this).data('field');
                        set_InitGrid1(field);
                        sWhere = {
                            HORGID: sessionStorage["OrganizationID"]
                            , HBEGINDATE: field
                            , HENDDATE: field
                        }
                        get_Display_3(JSON.stringify(sWhere));
                        var field = $(this).data('field');                       
                        if (isDateField(field)) {
                            set_InitGrid1(field);
                            sWhere = {
                                HORGID: sessionStorage["OrganizationID"],
                                HBEGINDATE: field,
                                HENDDATE: field
                            };
                            get_Display_3(JSON.stringify(sWhere));
                        }                
                    });
                    //res.data.forEach(function (item, index) {
                    //    if (data1.data.DataColor != undefined) {
@@ -1573,7 +1576,10 @@
            }
            if (HICMOBillNo_ICMO) {
                sWhere_ICMO += " and å•æ®å· like '%" + HICMOBillNo_ICMO + "%'";
            }
            }           
            sWhere_ICMO += " and ç”Ÿäº§ç»„织 = '" + sessionStorage["Organization"] +"'";

            sWhere_ICMO += "    Order By æ—¥æœŸ  desc";

            get_Display2(sWhere_ICMO);
            sWhere_ICMO = ""//调用接口后清空sWhere缓存
@@ -1741,7 +1747,7 @@
                , area: ['90%', '90%']//大小
                , title: '生产订单列表'//标题
                , shift: 2//弹出动画
                , content: ['../../生产管理/生产任务单/Sc_ICMOBillList.html?HDeptID=' + HDeptID, 'yes']
                , content: ['../../生产管理/生产任务单/Sc_ICMOBillList.html?openType =4&HDeptID=' + HDeptID, 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1902,6 +1908,7 @@
                    }
                });
            } else {
                layer.close(ajaxLoad); // å…³é—­æŒ‡å®šloading
                return layer.msg("请选择一条数据进行工艺路线编辑");
            }
        }
@@ -3274,6 +3281,7 @@
            var ajaxLoad = layer.load();
            if (checkStatus.data.length != 1) {
                layer.alert("请选择一条数据!");
                layer.close(ajaxLoad);
            } else {
                var TabData = checkStatus.data;
                var HMaterID = TabData[0].HMaterID;
@@ -3784,6 +3792,45 @@
            })
        }

        // åˆ¤æ–­è¡¨å¤´æ ‡é¢˜æ˜¯å¦ä¸ºæ—¥æœŸæ ¼å¼
        function isDateField(field) {
            // æ£€æŸ¥æ—¥æœŸæ ¼å¼
            var datePatterns = [
                /^\d{4}-\d{2}-\d{2}$/,           // YYYY-MM-DD
                /^\d{4}\/\d{2}\/\d{2}$/,         // YYYY/MM/DD
                /^\d{2}-\d{2}-\d{4}$/,           // DD-MM-YYYY
                /^\d{2}\/\d{2}\/\d{4}$/,         // DD/MM/YYYY
                /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/, // YYYY-MM-DD HH:mm:ss
                /^\d{4}å¹´\d{2}月\d{2}日$/        // ä¸­æ–‡æ—¥æœŸ
            ];

            return datePatterns.some(pattern => pattern.test(field));
        }
        //页面排序
        table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
            table.reload('mainTable', {
                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                    field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                }
            });
            option.data = layui.table.cache["mainTable"];
            table.render(option);
        });

        table.on('sort(mainTable_ICMO)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
            table.reload('mainTable_ICMO', {
                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                    field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                }
            });
            option2.data = layui.table.cache["mainTable_ICMO"];
            table.render(option);
        });

        //列明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';