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

wtt

2026-03-07 ee3f95ac1d13a174b7672a53dd416ede7866e294

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

 WebTM/App_Data/MssqlReportData.cs

@@ -18,7 +18,7 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    // public const string SqlConnStr = "Data Source=ECS-B45B;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=hx_user;Password=lc@841022;";//兴达测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJ测试
    //public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //斯莫尔
@@ -38,7 +38,7 @@
    //public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//迦南
    //public const string SqlConnStr = "Data Source=172.16.1.30;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//海诚
    //public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//小卫
    //public const string SqlConnStr = "Data Source=192.168.88.167; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//华舟
    public const string SqlConnStr = "Data Source=192.168.110.222; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//华舟

    //public string sServer;
    //public string sDataBase;

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -679,6 +679,7 @@
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
    <Content Include="views\案例代码\华远\HY_InterfaceTest.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MoldMainoverdueWarnReport.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />

 WebTM/views/IpadIndex.html

@@ -49,6 +49,7 @@
        var HGroupName = "";      //班组
        var HProcID = 0;      //工序
        var HSBName = "";   //设备名称
        var HReportTotal = 0;      // å½“前选中工单的汇报总数

        //注意：选项卡 ä¾èµ– element æ¨¡å—，否则无法进行功能性操作
        layui.config({
@@ -551,7 +552,7 @@
                                html1 += '<h1><span>产品名称：</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
                                html1 += '<h1><span>产品型号：</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
                                html1 += '<h1><span>计划数量：</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">数采总数：</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
                                html1 += '<h1><span>汇报总数：</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HWCHQty + '</span></h1>';
                                html1 += '<h1><span>汇报总数：</span><span id="qty' + (i + 1) + '">' + LoadData1[i].HWCHQty + '</span></h1>';
                                switch (LoadData1[i].HICMOStatus) {
                                    case "待生产":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">领料状态：</span><span>' + LoadData1[i].领料状态 + '</span></h1>';
@@ -787,6 +788,7 @@
            HMaterName = $("#ptn" + i + "").html();     //产品名称
            HMaterID = $("#materid" + i + "").html();     //产品ID
            HProcID = $("#procid" + i + "").html();     //工序ID
            HReportTotal = $("#qty" + i + "").html();//获取汇报总数

            if (workcode != "" && workcode != null) {
                $('.cns').removeClass('check1');  //删除不同父级clss样式相同的所有元素
@@ -1529,10 +1531,34 @@
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            //当前工单(汇报)按钮点击事件
            function CodingReport(event, obj) {
                if (wktag == 0) {
                    layer.alert("请选择工单列表", { icon: 5 });
                    return false;
                }

                // åˆ¤æ–­æ˜¯å¦ä¸ºåŽèˆŸç»„织              
                if (sessionStorage["Organization"] == "宁波市华舟包装有限公司") {
                    // åŽèˆŸç»„织：若汇报总数不为0则跳过状态检查，否则执行检查
                    if (parseFloat(HReportTotal) !== 0) {
                        // æ±‡æŠ¥æ€»æ•°ä¸ä¸º0，直接打开（不执行 WorkStaus æ£€æŸ¥ï¼‰
                    } else {
                        // æ±‡æŠ¥æ€»æ•°ç­‰äºŽ0，执行原有的状态检查
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "斯莫尔汇报")) {
                layer.alert("单据状态不满足汇报条件!", { icon: 5 });
                return false;
            }
                    }
                } else {
                    // éžåŽèˆŸç»„织：保持原有逻辑，直接执行 WorkStaus æ£€æŸ¥
                    if (WorkStaus(HSourceID1, workcode, HSourceInterID, "斯莫尔汇报")) {
                        layer.alert("单据状态不满足汇报条件!", { icon: 5 });
                        return false;
                    }
                }

                // æ‰“å¼€ iframe å¼¹çª—（原有代码不变）
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
@@ -1544,11 +1570,10 @@
                scrollbar: false,
                content: '车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {

                        // å¯é€‰çš„关闭回调
                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        var data = [{
                        "HEquipName": $("#HEquipName1").text(),
                        "HEquipCode": $("#HEquipCode1").text(),
                        "HICMOBillNo": workcode,
@@ -1566,17 +1591,16 @@
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                    });
                        }];

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },


                    }
            });
        }
        }

        //设备启动点检按钮点击事件
        function BeginDotCheck(event, obj) {

 WebTM/views/»ù´¡×ÊÁÏ/³É±¾»ù´¡×ÊÁÏ/Add_Edit_Gy_CostAverageType.html

@@ -433,6 +433,10 @@
                                        "HMaterTypeID": row["HMaterTypeID"] || 0,
                                        "HMaterType": row["HName"] || "",
                                        "HWeight": row["权重"] || 0,
                                        "HProcID": row["HProcID"] || 0,
                                        "HProcName": row["工序"] || "",
                                        
                                        
                                        
                                    });
                                }
@@ -550,6 +554,8 @@
                    "HWeight": "0"
                    , "HMaterTypeID": "0"
                    , "HMaterType": ""
                    , "HProcID": "0"
                    , "HProcName": ""
                   

                };
@@ -608,6 +614,8 @@
                        , { type: 'numbers', field: '序号', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HMaterTypeID', title: 'HMaterTypeID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HMaterType', title: '物料分类', edit: 'text', event: "HMaterTypeList", style: 'background-color: #f9f9f9;' }
                        , { field: 'HProcID', title: 'HProcID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HProcName', title: '工序', edit: 'text', event: "HHProcList", style: 'background-color: #f9f9f9;' }

                        , { field: 'HWeight', title: '权重', edit: 'text', style: 'background-color: #f9f9f9;' }

@@ -665,6 +673,41 @@
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {

                        if (obj.event == "HHProcList") {
                            //CusType = 2;
                            // æ–°å¢žï¼šå°†ç¼–辑对象obj赋值给全局变量，供GetProjectMoneyValue使用
                            //tableEditObj = obj;
                            // æ‰“开器具管理小窗体（原有代码不变）
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim',
                                area: ['90%', '90%'],
                                title: '项目费用列表',
                                shift: 2,
                                content: ["../../基础资料/生产基础资料/Gy_Process.html", "yes"],
                                // ä»¥ä¸‹åŽŸæœ‰ä»£ç å…¨éƒ¨ä¿ç•™ï¼Œæ— éœ€ä¿®æ”¹
                                btn: ['确定', '取消'],
                                btn1: function (index, layero) {//按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    //OptionData = checkStatus.data[0];
                                    obj.update({
                                        "HProcID": checkStatus.data[0].HItemID
                                        , "HProcName": checkStatus.data[0].工序名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    //obj.update({
                                    //    "HBeginAddr": OptionData.HItemID
                                    //    , "HBeginAddrName": OptionData.地区名称
                                    //})
                                }
                            })
                        }
                        if (obj.event == "HMaterTypeList") {
                            //CusType = 2;
                            // æ–°å¢žï¼šå°†ç¼–辑对象obj赋值给全局变量，供GetProjectMoneyValue使用

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html

@@ -93,7 +93,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">器具规格</label>
                                        <label class="layui-form-label" style="width: 85px;">器具规格<label style="color:red"> * </label></label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HModel" id="HModel" value="">
                                        </div>
@@ -118,7 +118,7 @@
                                            <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" />
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                    <div class="layui-inline" style="display:none">
                                        <label class="layui-form-label" style="width: 85px;">校准日期<label style="color:red"> * </label></label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" lay-verify="HCalibrationDate" name="HCalibrationDate" id="HCalibrationDate">

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFileList.html

@@ -1291,7 +1291,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var addSWhere = "";
                if (typeof(openType) != "undefined") {
                    addSWhere = " and ä½œåºŸäºº = '' and å…³é—­äºº = '' and å®¡æ ¸äºº <> ''";
                    addSWhere = " and ä½œåºŸäºº = '' and å…³é—­äºº = '' and å®¡æ ¸äºº <> '' and ç¦ç”¨æ ‡è®° !='Y'";
                }
                return addSWhere;
            }

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -206,7 +206,7 @@
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">QE责任人 :<label style="color:red"> * </label></label>
                                                        <label class="layui-form-label">QE责任人 :</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HQEManName" id="HQEManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <input type="hidden" name="HQEMan" id="HQEMan" class="layui-input" value="0">
@@ -706,78 +706,78 @@
                        }
                    });
                //指定指派处理人
                if (sessionStorage["HDept"] == "生产部3") {
                    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                        $("#HHandleEmpName").val("李鹏");  //指派处理人
                        $("#HHandleEmpID").val(162680);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                        $("#HHandleEmpName").val("张展坤");  //指派处理人
                        $("#HHandleEmpID").val(161777);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                        $("#HHandleEmpName").val("李鹏");  //指派处理人
                        $("#HHandleEmpID").val(162680);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                        $("#HHandleEmpName").val("肖水清");  //指派处理人
                        $("#HHandleEmpID").val(162662);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                        $("#HHandleEmpName").val("吴斌");  //指派处理人
                        $("#HHandleEmpID").val(162686);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        $("#HHandleEmpName").val("孙文静");  //指派处理人
                        $("#HHandleEmpID").val(162622);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                //if (sessionStorage["HDept"] == "生产部3") {
                //    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                //        $("#HHandleEmpName").val("李鹏");  //指派处理人
                //        $("#HHandleEmpID").val(162680);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                //        $("#HHandleEmpName").val("张展坤");  //指派处理人
                //        $("#HHandleEmpID").val(161777);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                //        $("#HHandleEmpName").val("李鹏");  //指派处理人
                //        $("#HHandleEmpID").val(162680);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                //        $("#HHandleEmpName").val("肖水清");  //指派处理人
                //        $("#HHandleEmpID").val(162662);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                //        $("#HHandleEmpName").val("吴斌");  //指派处理人
                //        $("#HHandleEmpID").val(162686);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        //$("#HHandleEmpName").val("孙文静");  //指派处理人
                        //$("#HHandleEmpID").val(162622);        //指派处理人
                    }
                }
                else if (sessionStorage["HDept"] == "生产部1-铁芯") {
                    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                        $("#HHandleEmpName").val("徐建洪");  //指派处理人
                        $("#HHandleEmpID").val(162576);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                        $("#HHandleEmpName").val("王强");  //指派处理人
                        $("#HHandleEmpID").val(163378);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                        //$("#HHandleEmpName").val("吴斌");  //指派处理人
                        //$("#HHandleEmpID").val(162686);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        $("#HHandleEmpName").val("张建鹏");  //指派处理人
                        $("#HHandleEmpID").val(162525);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                        $("#HHandleEmpName").val("吕双棋");  //指派处理人
                        $("#HHandleEmpID").val(162526);        //指派处理人
                    }
                }
                else if (sessionStorage["HDept"] == "生产部1-组装") {
                    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                        $("#HHandleEmpName").val("曾东鑫");  //指派处理人
                        $("#HHandleEmpID").val(162573);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                        $("#HHandleEmpName").val("程帆");  //指派处理人
                        $("#HHandleEmpID").val(161720);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                        $("#HHandleEmpName").val("柯诗文");  //指派处理人
                        $("#HHandleEmpID").val(162661);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                        //$("#HHandleEmpName").val("吴斌");  //指派处理人
                        //$("#HHandleEmpID").val(162686);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        $("#HHandleEmpName").val("刘龙飞");  //指派处理人
                        $("#HHandleEmpID").val(163180);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                        $("#HHandleEmpName").val("吕双棋");  //指派处理人
                        $("#HHandleEmpID").val(162526);        //指派处理人
                    }
                }
                //    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                //        //$("#HHandleEmpName").val("孙文静");  //指派处理人
                //        //$("#HHandleEmpID").val(162622);        //指派处理人
                //    }
                //}
                //else if (sessionStorage["HDept"] == "生产部1-铁芯") {
                //    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                //        $("#HHandleEmpName").val("程帆");  //指派处理人
                //        $("#HHandleEmpID").val(161720);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                //        $("#HHandleEmpName").val("徐建洪");  //指派处理人
                //        $("#HHandleEmpID").val(162576);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                //        $("#HHandleEmpName").val("程帆");  //指派处理人
                //        $("#HHandleEmpID").val(161720);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                //        $("#HHandleEmpName").val("王强");  //指派处理人
                //        $("#HHandleEmpID").val(163378);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                //        //$("#HHandleEmpName").val("吴斌");  //指派处理人
                //        //$("#HHandleEmpID").val(162686);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                //        $("#HHandleEmpName").val("张建鹏");  //指派处理人
                //        $("#HHandleEmpID").val(162525);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                //        $("#HHandleEmpName").val("吕双棋");  //指派处理人
                //        $("#HHandleEmpID").val(162526);        //指派处理人
                //    }
                //}
                //else if (sessionStorage["HDept"] == "生产部1-组装") {
                //    if ($("#HErrMsgBackTypeName").val() == "人员原因") {
                //        $("#HHandleEmpName").val("程帆");  //指派处理人
                //        $("#HHandleEmpID").val(161720);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "设备原因") {
                //        $("#HHandleEmpName").val("曾东鑫");  //指派处理人
                //        $("#HHandleEmpID").val(162573);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "材料原因") {
                //        $("#HHandleEmpName").val("程帆");  //指派处理人
                //        $("#HHandleEmpID").val(161720);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "工艺原因") {
                //        $("#HHandleEmpName").val("柯诗文");  //指派处理人
                //        $("#HHandleEmpID").val(162661);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                //        //$("#HHandleEmpName").val("吴斌");  //指派处理人
                //        //$("#HHandleEmpID").val(162686);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                //        $("#HHandleEmpName").val("刘龙飞");  //指派处理人
                //        $("#HHandleEmpID").val(163180);        //指派处理人
                //    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                //        $("#HHandleEmpName").val("吕双棋");  //指派处理人
                //        $("#HHandleEmpID").val(162526);        //指派处理人
                //    }
                //}
            }

            //获取报工台跳转 èŽ·å– è®¾å¤‡ç¼–码

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -53,6 +53,33 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
                                    </div>
                                </div>
                                                                    <div class="layui-row" style="margin-top:5px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select lay-search="{caseSensitive:false, fuzzy: false}" name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>       
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料编码</label>
@@ -192,7 +219,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                <select lay-search="{caseSensitive:false, fuzzy: false}" name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
@@ -217,9 +244,9 @@
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤1</label>
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                <select lay-search="{caseSensitive:false, fuzzy: false}" name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
@@ -242,11 +269,11 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px;display:none;">
                                    <!-- <div class="layui-row" style="margin-top:5px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤2</label>
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                <select lay-search="{caseSensitive:false, fuzzy: false}" name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
@@ -268,7 +295,7 @@
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>                                   
                                    </div>                                    -->
                                </div>
                            </div>
                        </div>

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_ProdOrderPickingStatusReport.html

@@ -34,7 +34,7 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-row">

                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">开始日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
@@ -59,8 +59,7 @@
                                            <input type="text" class="layui-input" id="HDeptName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;">                                    
                                <div class="layui-row" style="margin-top:5px;margin-bottom:5px;margin-left:20px">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-inline">
@@ -88,8 +87,7 @@
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                                
                              
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                <!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row">
                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                            <div class="layui-inline">
@@ -175,7 +173,8 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                </div>-->

                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -184,7 +183,6 @@
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm"  id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>打印</button>
                                <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>-->
                            </div>
                        </script>
                    </form>
@@ -214,6 +212,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var titleData = [];
            var ins;//存储数据  å¯¼å‡ºåŠŸèƒ½éœ€è¦ç”¨åˆ°çš„参数
            var HModName = "Sc_ProdOrderPickingStatusReport";
            //#endregion
@@ -272,8 +271,6 @@
                set_InitGrid();
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
                ColFilter();
            }

            //初始化表格
@@ -305,31 +302,36 @@
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '计算', hide: true });
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                }  else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 160, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
@@ -478,6 +480,7 @@
                $("#ColName2").append(Organization);
                form.render('select');
            }

            //导出Execel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_QualityReportBillMonth.html

@@ -81,7 +81,7 @@

                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
                            </div>
                            <div style="width:99%;height:calc(50vh);">
                            <div style="width:99%;height:calc(80vh);">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                        </div>
@@ -408,7 +408,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: '600px'
                    , height: 'full-110'
                    , totalRow: true
                    , page: true
                    , cellMinWidth: 90

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

@@ -646,6 +646,52 @@
                }
            });

            //#region ç›‘听单元格编辑  å•å…ƒæ ¼ç¼–辑后 å˜æ›´
            table.on('edit(mainTable)', function (obj) {
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var temp = "";
                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
                //#endregion

                switch (field) {
                    case "HStd":                                         //数量
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HStd: oldText
                            });
                            table.render(option);

                            layer.msg("标准值请输入大于0的数字!");
                            return;
                        }


                        //数据校验合格，重算记录
                        var HStd = value * 1;   //标准
                        var HMax = HStd +20;    //上限
                        var HMin = HStd - 20;   //下限
                        //同步更新表格和缓存对应的值
                        obj.update({
                            HStd: HStd
                            , HMax: HMax
                            , HMin: HMin
                        });
                        table.render(option)
                        break;                   
                    default:
                }
            });
            //#endregion


            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FirstPassRateReport.html

@@ -43,29 +43,27 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <!--<label class="layui-form-label">生产车间</label>
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">-->
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

                                            <!--动态渲染车间-->
                                        <!--</select>
                                    </div>-->
                                        </select>
                                    </div>

                                    <label class="layui-form-label" style="width: 85px;">生产车间</label>
                                    <!--<label class="layui-form-label" style="width: 85px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 120px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
                                            <option style="color:blue;" value="绕线自动车间">绕线自动车间</option>
                                            <option style="color:blue;" value="装配自动车间">装配自动车间</option>
                                            <option style="color:blue;" value="平板车间">平板车间</option>
                                        </select>
                                    </div>
                                    </div>-->
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-exit" id="btn-exit" style="padding:0 5px">退出</button>
    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn" style="padding:0 5px">隐藏列设置</button>-->
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

                                </div>
@@ -134,22 +132,13 @@
                var HProcSumNum = [];//生产总数量
                var HQualifiedNum = [];//合格总数量
                var HFirstPassRate = [];//直通率
                var HTitle = "";//图形标题
                var HTitle = $("#HDeptName").val() +"直通率趋势图";//图形标题
                if (option.data.length>0) {
                    for (let i = 1; i <= 12; i++) {
                        HProcSumNum.push(option.data[0][i + "月"]);
                        HQualifiedNum.push(option.data[1][i + "月"]);
                        HFirstPassRate.push(option.data[3][i + "月"].replace('%', ''));
                    }
                }

                switch ($("#HDeptName").val()) {
                    case '绕线自动车间':
                        HTitle = '线包绕线直通率趋势图';
                        break;
                    case '装配自动车间':
                        HTitle = '同步电机直通率趋势图';
                        break;
                }

                option_ZZT = {
@@ -302,6 +291,7 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                DeptName();
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
@@ -344,9 +334,9 @@
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    if (i == 0)
                                        HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                        HDeptName += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                                    else
                                        HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                                        HDeptName += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';

                                }
                            }
@@ -363,13 +353,6 @@

            //初始化表格
            function set_InitGrid() {
                //option = {
                //    elem: '#mainTable'
                //    , toolbar: '#toolbarDemo'
                //    , cellMinWidth: 120
                //    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                //    , height: 'full-70'
                //};
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FirstPassRateWeekReport.html

@@ -43,28 +43,26 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <!--<label class="layui-form-label">生产车间</label>
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">-->
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                    <!--动态渲染车间-->
                                    <!--</select>
                                    </div>-->
                                    </select>
                                    </div>

                                    <label class="layui-form-label" style="width: 85px;">生产车间</label>
                                    <!--<label class="layui-form-label" style="width: 85px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 120px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
                                            <option style="color:blue;" value="线包车间">线包车间</option>
                                            <option style="color:blue;" value="同步车间">同步车间</option>
                                            <option style="color:blue;" value="同步车间">同步车间</option>-->
                                            <!--<option style="color:blue;" value="平板车间">平板车间</option>-->
                                        </select>
                                    </div>
                                        <!--</select>
                                    </div>-->
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-exit" id="btn-exit" style="padding:0 5px">退出</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn" style="padding:0 5px">隐藏列设置</button>-->
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

                                </div>
@@ -133,22 +131,13 @@
                var HProcSumNum = [];//生产总数量
                var HQualifiedNum = [];//合格总数量
                var HFirstPassRate = [];//直通率
                var HTitle = "";//图形标题
                var HTitle = $("#HDeptName").val() + "直通率趋势图";//图形标题
                if (option.data.length > 0) {
                    for (let i = 0; i < option.data.length; i++) {
                        H_X.push(option.data[i].周 + "周");
                        HProcSumNum.push(option.data[i].生产数量);
                        HFirstPassRate.push(option.data[i].直通率)
                    }                   
                }

                switch ($("#HDeptName").val()) {
                    case '线包车间':
                        HTitle = '线包绕线直通率趋势图';
                        break;
                    case '同步车间':
                        HTitle = '同步电机直通率趋势图';
                        break;
                }

                option_ZZT = {
@@ -291,6 +280,7 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                DeptName();
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
@@ -333,9 +323,9 @@
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    if (i == 0)
                                        HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                        HDeptName += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                                    else
                                        HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                                        HDeptName += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';

                                }
                            }
@@ -352,13 +342,6 @@

            //初始化表格
            function set_InitGrid() {
                //option = {
                //    elem: '#mainTable'
                //    , toolbar: '#toolbarDemo'
                //    , cellMinWidth: 120
                //    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                //    , height: 'full-70'
                //};
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList2.html

@@ -348,7 +348,8 @@
                    case 'btn-Delete':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1 && data[0].单据状态=="创建") {
                            
                        if (checkStatus.data.length === 1 && data[0].状态=="创建") {
                            var InterID = data[0].hmainid.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html

@@ -55,10 +55,13 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;" id="BT_HProName">当前工序</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HProName">当前工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" lay-verify="HProcID" name="HProcID" id="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -389,6 +392,11 @@
            btnHBadReason();
        });

        //选着工序
        form.on('submit(btnHProc)', function () {
            btnHProc();
        });

        //选择质检员
        form.on('submit(btnHEmp)', function () {
            btnHEmp();
@@ -513,26 +521,18 @@
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            data: { "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);

                                    var numHProcess = 0;
                                    for (var i = 0; i < data1.data.length; i++) {
                                        if (data1.data[i]["HProcID"] == $("#HProcID").val()) {
                                            numHProcess = data1.data[i]["HProcExchEntryID"];
                                            break;
                                        }
                                    }

                                    $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                                    $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                                    $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                                    $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                                    $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                                    $("#HProcExchEntryID").val(numHProcess);
                                    $("#HProcExchEntryID").val(data1.data[i]["HProcExchEntryID"]);
                                    $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                                    $("#HMaterID").val(data1.data[0]["HMaterID"]);
                                    $("#HMaterName").val(data1.data[0]["物料名称"]);
@@ -563,8 +563,6 @@
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });

          
        }

         //不良原因选择页面
@@ -593,6 +591,30 @@
            })
        }

        //工序选择页面
        function btnHProc() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '工序列表'//标题
                , shift: 2//弹出动画
                , content: ['../../基础资料/生产基础资料/Gy_Process.html?openType=2', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HProName").val(checkStatus.data[0].工序名称);
                    $("#HProcID").val(checkStatus.data[0].HItemID);
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
            })
        }

         //质检员选择页面
        function btnHEmp() {
            layer.open({

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html

@@ -1761,6 +1761,18 @@
                layer.msg("生产资源不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            if ($("#HEmpID").val() == "0") {
                layer.msg("操作员不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            if ($("#HWeight").val() == "0") {
                layer.msg("重量不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            if ($("#HQty").val() == "0") {
                layer.msg("合格数量不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            if ($("#HQty").val() == 0 && $("#HBadCount").val() == 0) {

                layer.msg("不良和合格数量不能同时为0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement_PGPL.html

@@ -519,7 +519,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../模治具管理/模治具管理/Gy_MouldFileList.html', "yes"]
                                , content: ['../../模治具管理/模治具管理/Gy_MouldFileList.html?openType=2', "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调

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

@@ -60,7 +60,7 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;margin-top:5px">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料名称</label>
@@ -197,7 +197,6 @@
                        <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>-->
                            </div>
                        </script>
                    </form>
@@ -226,6 +225,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
            var HModName = "DefectiveDetailedYieldReport";
            //#endregion

@@ -283,8 +283,6 @@
                set_InitGrid();
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
                ColFilter();

            }

@@ -293,10 +291,13 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , height: 'full-70'
                    , height: 'full-50'
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , page: true
                    , cellMinWidth: 90
                };

            }

            //加载网格
@@ -309,24 +310,36 @@
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '计算', hide: true });
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 160, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
@@ -566,7 +579,7 @@
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
                            

                            dataCol = data1.data[0].HGridString.split(',');