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

zrg

2025-04-30 e5e9ce284e0f327dcab50dbd5cd3b3f21fe97128

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

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html

@@ -43,6 +43,7 @@
                            <ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>
                                <li>其他信息</li>
                                <li>制单信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -161,6 +162,9 @@
                                            </div>
                                        </div>
                                    </div>
                                    
                                </div>    
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">创建人</label>
@@ -202,8 +206,7 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>                              
                            </div>
                                </div>
                                <input type="hidden" value="0" name="HParentID" id="HParentID">
                            </div>
                    </div>
@@ -538,7 +541,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -541,7 +541,7 @@

                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName").find('option').length == 0) {
                                ColFilter();
                            }
                        } else {

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html

@@ -505,7 +505,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -531,7 +531,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -36,6 +36,7 @@
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -445,6 +446,7 @@
    </div>

    <script>
        var OptionData = [];
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
@@ -534,7 +536,10 @@
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
            })

            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //是否禁用按钮
            form.on('checkbox(checkboxHStopflag)', function (data) {
                $("#HStopflag").val(data.elem.checked);
@@ -678,6 +683,34 @@


            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Process/AuditGy_Process", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }

            //#region åˆ¤æ–­æ˜¯å¦ç™»å½• æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            function get_LoginIs() {
@@ -944,7 +977,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -995,7 +1028,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工段列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_ProcMul.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_ProcMul.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1020,7 +1053,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes']
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1033,6 +1066,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HQCSchemeName_Fst").val(OptionData[0].检验方案名称);
                            $("#HQCSchemeID_Fst").val(OptionData[0].hmainid);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1045,7 +1085,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes']
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1058,6 +1098,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HQCSchemeName_Proc").val(OptionData[0].检验方案名称);
                            $("#HQCSchemeID_Proc").val(OptionData[0].hmainid);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1070,7 +1117,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes']
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1083,6 +1130,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HQCSchemeName_Patrol").val(OptionData[0].检验方案名称);
                            $("#HQCSchemeID_Patrol").val(OptionData[0].hmainid);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1133,6 +1187,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HBadWHName").val(OptionData[0].仓库名称);
                            $("#HBadWHID").val(OptionData[0].HItemID);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1158,6 +1219,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HWasterWHName").val(OptionData[0].仓库名称);
                            $("#HWasterWHID").val(OptionData[0].HItemID);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1183,6 +1251,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HBadCountDevelopWHName").val(OptionData[0].仓库名称);
                            $("#HBadCountDevelopWHID").val(OptionData[0].HItemID);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1208,6 +1283,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HWWBadWHName").val(OptionData[0].仓库名称);
                            $("#HWWBadWHID").val(OptionData[0].HItemID);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1233,6 +1315,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HWWWasterWHName").val(OptionData[0].仓库名称);
                            $("#HWWWasterWHID").val(OptionData[0].HItemID);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1258,6 +1347,13 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function (index, layero) {
                        if (OptionData.length > 0) {
                            $("#HWHName").val(OptionData[0].仓库名称);
                            $("#HWHID").val(OptionData[0].HItemID);
                        }
                        OptionData = [];
                    }
                })
            }
            //#endregion
@@ -1319,6 +1415,14 @@
            $("#HDeptID").val(obj[0].HItemID);
            $("#HDeptNumber").val(obj[0].部门代码);
        }
        //方案返回
        function GetCheckProjectValue(obj) {
            OptionData = obj;
        }
        //车间
        function GetHWHValue(obj) {
            OptionData = obj;
        }
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html

@@ -36,6 +36,7 @@
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -43,6 +44,7 @@
                            <ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>
                                <li>其他信息</li>
                                <li>制单信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -253,7 +255,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCubicleQty" id="HCubicleQty" value="1" lay-verify="" autocomplete="off" class="layui-input" onfocus="this.select();">
                                            </div>
                                        </div>                                        
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -263,6 +265,9 @@
                                            </div>
                                        </div>
                                    </div>
                                    
                                </div>
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">创建人</label>
@@ -306,7 +311,6 @@
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
@@ -383,6 +387,10 @@
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
                if ($("#HCheckEmp").val() != "") {
                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//
                }
                
            }
            else if (OperationType == 4) {//浏览
                $("#HItemID").val(linterid);//
@@ -484,7 +492,10 @@
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });

            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });

            //表头信息负责人弹窗
            form.on('submit(HEmpID-BT)', function () {
@@ -605,6 +616,34 @@
                });
            }
            //#endregion

            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Source/AuditGy_Source", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
@@ -728,7 +767,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -754,7 +793,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -780,7 +819,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工作中心列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_WorkCenter.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_WorkCenter.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -830,7 +869,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '生产资源列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html?Type=&Type2=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_ProcMul.html

@@ -266,7 +266,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery();

                get_DefaultModule();
            }
@@ -394,6 +394,7 @@
                if (HName) {
                    sWhere += " and å·¥æ®µåç§° like '%" + HName + "%'";
                }
                sWhere += addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -922,6 +923,19 @@
                })
            }

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开 
                var addWhere = "";
                if (typeof (openType) != "undefined") {
                    addWhere += " and å®¡æ ¸äºº != '' and ç¦ç”¨æ ‡è®°!='Y'";
                }
                return addWhere;
            }
            //#endregion

            //#endregion
            //以上是layui模块
        });

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm.html

@@ -36,6 +36,7 @@
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">锁定工单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">解锁工单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">齐套分析</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">要料运算</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">提料运算</button>
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">欠料运算</button>-->
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">工艺路线</button>-->
@@ -725,7 +726,16 @@
                })
            }
        })

        //要料运算
        form.on('submit(btnYLYS)', function (data) {
            layer.confirm('你确定要执行操作吗，请先确保排产数据已保存？', {
                btn: ['确定', '取消'] //按钮
                , btn1: function (index, layero) {
                    get_btnYLYS();
                    layer.close(index);
                }
            })
        })
        //提料运算
        form.on('submit(btnTLYS)', function (data) {
            if (set_ModCheck("Sc_WorkBillSortBill_tlys") == true) {
@@ -2364,7 +2374,33 @@
                }
            });
        }

        //要料运算
        function get_btnYLYS() {
            sWhere = {
                HProdORGID: $("#HProdORGID").val()
                , HWorkShopID: $("#HWorkShopID").val()
            }
            sWhere = JSON.stringify(sWhere);
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        get_FastQuery(2);
                        layer.msg(data1.Message);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //提料运算
        function get_btnTLYS() {
            if ($("#HWorkShopID").val() == 0) {
@@ -4133,7 +4169,6 @@
                            , limit: 200
                            , cellMinWidth: 90
                        }
                        table.render(option2);

                        //刷新表格数据
                        DisPlay_HideColumn_ICMO();
@@ -4382,6 +4417,7 @@
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                async: false,
                data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {
@@ -4452,9 +4488,9 @@
                                option2.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option2);
                        /*table.render(option2);*/
                    } else {
                        table.render(option2);
                        /*table.render(option2);*/
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportWorkDemandPlanBillList.html

@@ -12,6 +12,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -159,6 +160,12 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <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>
                </div>
            </div>
@@ -190,6 +197,8 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "ReportWorkDemandPlanBill";
        var ins = [];
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -200,6 +209,20 @@
        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //隐藏列设置
                case 'HideColumn':
                    get_HideColumnNoPageForPlan(HModName, option, get_FastQuery);
                    break;
                //导出excel
                case 'get_export':
                    get_Export();
                    break;
            };
        });

        //#region äº§å“ç¼–码
        form.on('submit(btnHMATERIALID)', function (data) {
@@ -250,7 +273,8 @@
            columns.push({ type: 'checkbox', fixed: 'left', sort: true});
            columns.push({ field: '组织', title: '生产组织', sort: true});
            columns.push({ field: '部门', title: '生产车间', sort: true});
            columns.push({ field: 'FSUMQTY', title: '合计', sort: true});
            columns.push({ field: 'FSUMQTY', title: '合计', sort: true });
            columns.push({ field: '客户订单号', title: '客户订单号', sort: true });
            columns.push({ field: '物料名称', title: '物料名称', sort: true});
            columns.push({ field: '规格型号', title: '物料规格', sort: true});
            columns.push({ field: 'HICMOBillNo', title: '生产订单号', sort: true});
@@ -290,7 +314,7 @@
                    j = 0;
                }
            }
            columns.push({ field: '', title: '计划明细_合计' });
            columns.push({ field: '计划明细_合计', title: '计划明细_合计' });

            option = {
                elem: '#mainTable'
@@ -332,6 +356,21 @@
            })
        }

        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().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                    }
                }
            });
            table.exportFile(ins.config.id, data, "xls");
        }

        //#region æŸ¥è¯¢
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
@@ -342,7 +381,9 @@
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
                        table.render(option);
                        //列设置
                        DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
                        ins = table.render(option);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -3048,7 +3048,7 @@
                        //}

                        //else {
                        //    if (option.data[i]["HCenterID"] == "0") {
                        //    if (option.data[i]["HCenterID"] == "0"&&option.data[i]["工序代码"] != "9999") {
                        //        layer.msg("第" + (i + 1) + "行:工作中心不能为空!");
                        //        return false;
                        //    }

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -366,7 +366,7 @@


            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTablemainTable)', function (obj) {
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
@@ -427,13 +427,14 @@
                //获取项目号
                Get_HProject();
                //查询
                if (HName=="") {
                    get_Display(sWhere);
                } else {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                    get_Display(sWhere);
                }
                //if (HName=="") {
                //    get_Display(sWhere);
                //} else {
                //    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                //    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                //    get_Display(sWhere);
                //}
                get_FastQuery()
                //过滤方案查询
                get_DefaultModule();
            }
@@ -644,6 +645,10 @@
                }
                if (HProject != "" && HProject!=0) {
                    sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                }
                if (HName!="") {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                }
                addSWhereByOpenType();
                get_Display(sWhere);
@@ -942,7 +947,7 @@
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开            
                if (typeof (openType) != "undefined") {
                    sWhere += " and ç¦ç”¨æ ‡è®° = '' ";
                    sWhere += " and å®¡æ ¸äºº != ''";
                }
            }
            //#endregion