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

wtt

2025-04-30 871cffb8bf30f1cf2c3103ef34406039696bb133

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

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Sc_ProcessExchangeBillListView.html

@@ -18,7 +18,7 @@
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="请输入过滤列" autocomplete="off">
                                <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" value="" placeholder="请输入过滤列" autocomplete="off">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
@@ -33,12 +33,19 @@
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
        //引用的单据及模块：工序流转卡。
      layui.use(['table', 'form', 'layer'], function () {
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
                , form = layui.form
                , layer = layui.layer;

            var sWhere = "";

            var params = get_UrlVars();
            var HProcID = params[params[0]]; //从参数中获取 å·¥åºid
            var HSourceID = params[params[1]]; //从参数中获取 ç”Ÿäº§èµ„源id

            form.on('submit(HQuery)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -64,6 +71,29 @@
            });
            //#endregion


            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion
           

            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
@@ -86,16 +116,19 @@
                    , { field: 'HWorkerID', width: 150, title: 'HWorkerID', hide: true }
                    , { field: 'HSourceID', width: 150, title: 'HSourceID', hide: true }
                    , { field: 'HBillType', width: 150, title: 'HBillType', hide: true }
                    , { field: '日期', width: 150, title: '日期' }
                    , { field: '单据号', width: 150, title: '单据号' }
                    , { field: '任务单号', width: 150, title: '任务单号' }
                    , { field: '生产订单号', width: 150, title: '生产订单号' }
                    , { field: '生产车间代码', width: 150, title: '生产车间代码' }
                    , { field: '日期', width: 150, title: '日期',templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"}
                    , { field: '单据号', width: 170, title: '单据号' }
                    , { field: '工序', width: 140, title: '工序' }
                    , { field: '生产资源', width: 150, title: '生产资源' }
                    , { field: '工作中心', width: 150, title: '工作中心' }
                    , { field: '任务单号', width: 170, title: '任务单号' }
                    , { field: '生产车间', width: 150, title: '生产车间' }
                    , { field: '产品代码', width: 150, title: '产品代码' }
                    , { field: '产品', width: 150, title: '产品' }
                    , { field: '规格型号', width: 150, title: '规格型号' }
                    , { field: '批号', width: 150, title: '批号' }
                    , { field: '生产订单号', width: 170, title: '生产订单号' }
                    , { field: '生产车间代码', width: 150, title: '生产车间代码' }                                     
                    , { field: '规格型号', width: 150, title: '规格型号' }                  
                    , { field: '单位代码', width: 150, title: '单位代码' }
                    , { field: '单位', width: 150, title: '单位' }
                    , { field: '生产数量', width: 150, title: '生产数量' }
@@ -113,8 +146,7 @@
                    , { field: '委外加工单位', width: 150, title: '委外加工单位' }
                    , { field: '表头备注', width: 150, title: '表头备注' }
                    , { field: '工序号', width: 150, title: '工序号' }
                    , { field: '工序代码', width: 150, title: '工序代码' }
                    , { field: '工序', width: 150, title: '工序' }
                    , { field: '工序代码', width: 150, title: '工序代码' }                   
                    , { field: '加工说明', width: 150, title: '加工说明' }
                    , { field: '工作中心代码', width: 150, title: '工作中心代码' }
                    , { field: '工作中心', width: 150, title: '工作中心' }
@@ -124,8 +156,7 @@
                    , { field: '班组', width: 150, title: '班组' }
                    , { field: '操作工代码', width: 150, title: '操作工代码' }
                    , { field: '操作工', width: 150, title: '操作工' }
                    , { field: '生产资源代码', width: 150, title: '生产资源代码' }
                    , { field: '生产资源', width: 150, title: '生产资源' }
                    , { field: '生产资源代码', width: 150, title: '生产资源代码' }                  
                    , { field: '计划数量', width: 150, title: '计划数量' }
                    , { field: '流转卡数量', width: 150, title: '流转卡数量' }
                    , { field: '时间单位', width: 150, title: '时间单位' }
@@ -174,18 +205,19 @@
                , limit: 50
            });
            ///加载显示数据
            function RoadQuery(Where) {
                var index = layer.load();
                var Value = Where;
                if (Value == null) {
                    Value = '';
            function RoadQuery(Value) {
                var index = layer.load();              
                if (Value != "") {
                    sWhere = " and å•æ®å· like '%" + Value + "%' ";
                }
                if (HProcID != '' && HSourceID != '' && HProcID != undefined && HSourceID != undefined) {
                    sWhere += ' and HProcID=' + HProcID + ' and HSourceID=' + HSourceID+''
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetSc_ProcessExchangeBillListView",
                    async: true,
                    data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
                    //data: { "Value": Value },
                    data: { "sWhere": sWhere,  "OrganizationID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;

 WebTM/views/home/console.html

@@ -228,6 +228,25 @@
                }
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '主题') {
                    var linterid = data.HInterID.toString();
                    var HEntryID = data.HEntryID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑公告'
                        , shift: 0//弹出动画
                        , content: '../系统管理/公告/GG_NoticeBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType='
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                        }
                    })
                }
            });

            $('.FastMenu_1').on('click', 'ul li', function (event) {
                // è¿™é‡Œå†™ä½ çš„点击事件处理代码
                console.log('List item clicked:', $(this).text());
@@ -385,6 +404,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '主题') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '主题', templet: function (d) {
                                            return '<span style="color: blue;">' + d.主题 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -274,7 +274,7 @@
                $("#HCREATEORGID").attr("disabled", true);
                $("#HStopflag").attr("disabled", true);
                $("#HUseFlag").attr("disabled", true);
                layui.form.render('checkbox');s
                layui.form.render('checkbox');
                Organ();
            }
            //无源单新增

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

@@ -308,6 +308,30 @@
                });
            })
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '启动检查项目代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑启动检查项目'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_CheckNoteItem.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
        
            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
@@ -374,6 +398,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '启动检查项目代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '启动检查项目代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.启动检查项目代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -305,6 +305,20 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '故障类别代码') {
                    var linterid = data.hitemid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '故障类别列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../公用基础资料/Add_Edit_Gy_ConkType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                }
            });

            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -368,6 +382,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '故障类别代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '故障类别代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.故障类别代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -231,6 +231,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '货币代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '货币代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.货币代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
@@ -381,6 +388,26 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '货币代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑货币设置'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_Currency.html?hID=' + hID
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            })

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色

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

@@ -214,6 +214,30 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '客户分类代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑客户分类'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_CusType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -301,6 +325,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '客户分类代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '客户分类代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.客户分类代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -391,8 +391,12 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } 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 if (data[i].name == '检测代码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '检测代码' });
                                } else if (data[i].name == '检测代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '检测代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.检测代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {

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

@@ -283,6 +283,30 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '保养级别代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑保养级别'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_MaintainLev.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -372,6 +396,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '保养级别代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '保养级别代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.保养级别代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -154,7 +154,33 @@
                get_FastQuery();
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '反馈状态代码') {
                    var hID = data.HItemID.toString();
                    TagParentId = 0;
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['55%', '55%']
                        , title: '编辑订单反馈状态'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../公用基础资料/Add_Edit_Gy_OrderBackInfo.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']

                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#endregion

@@ -295,6 +321,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '反馈状态代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '反馈状态代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.反馈状态代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -159,6 +159,34 @@
                get_FastQuery();
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '订单等级代码') {
                    var hID = data.HItemID.toString();
                    TagParentId = 0;
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['55%', '55%']
                        , title: '编辑订单等级'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../公用基础资料/Add_Edit_Gy_OrderLev.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']

                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
@@ -339,6 +367,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '订单等级代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '订单等级代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.订单等级代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -199,6 +199,20 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '包装方式代码') {
                    var linterid = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '包装方式列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../公用基础资料/Add_Edit_Gy_PackType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                }
            });

            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -267,6 +281,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '包装方式代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '包装方式代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.包装方式代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -287,6 +287,31 @@
            });
            //#endregion


            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '防错装置代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑防错装置'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_PreventErrMould.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -374,6 +399,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '防错装置代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '防错装置代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.防错装置代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -281,6 +281,29 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '项目费用代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑项目费用'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -370,6 +393,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '项目费用代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '项目费用代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.项目费用代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -304,6 +304,30 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '项目费用分类代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑-项目费用分类'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_ProjectMoneyClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -384,6 +408,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '项目费用分类代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '项目费用分类代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.项目费用分类代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -366,6 +366,33 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '代码') {
                    var hID = data.HItemID.toString();
                    TagParentId = data.ParentID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑检验项目类别'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../公用基础资料/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']

                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //代码回车方法
            $('#HNumber').on('keydown', function (event) {
                if (event.keyCode == 13) {
@@ -534,6 +561,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -214,6 +214,31 @@
            });
            //#endregion


            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '供应商分类代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑供应商分类'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_SupType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -301,6 +326,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '供应商分类代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '供应商分类代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.供应商分类代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -216,6 +216,25 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '工艺参数单位代码') {
                    var linterid = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工艺设置-编辑'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Gy_TechnologyParameterUnit_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
@@ -316,6 +335,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '工艺参数单位代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '工艺参数单位代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.工艺参数单位代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -172,6 +172,27 @@
            });
            //#endregion


            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '暂放区代码') {
                    var linterid = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '暂放区-编辑'
                        , shift: 0//弹出动画
                        , content: '../../基础资料/公用基础资料/Add_Edit_Gy_TemporaryArea.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
                            //刷新页面
                            window.location.reload();
                        }
                    })
                }
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -254,6 +275,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '暂放区代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '暂放区代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.暂放区代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -237,6 +237,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '计量单位代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '计量单位代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.计量单位代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
@@ -400,6 +407,26 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '计量单位代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑计量单位'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_Unit.html?hID=' + hID
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonList.html

@@ -296,6 +296,31 @@
                parent.layer.close(index);
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '故障原因代码') {
                    var hID = data.hitemid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑不良原因'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../基础资料/Gy_ConkReasonEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#endregion


@@ -357,6 +382,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '故障原因代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '故障原因代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.故障原因代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_EquipStatus.html

@@ -170,6 +170,30 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑设备状态'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../基础资料/Gy_EquipStatusEdit.html?hID=' + hID
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        , end: function () {
                            //刷新页面,
                            get_FastQuery(table, option);
                        }
                    })
                }
            });

            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -231,6 +255,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MouldStatus.html

@@ -164,6 +164,30 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑器具状态'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../基础资料/Gy_MouldStatusEdit.html?hID=' + hID
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        , end: function () {
                            //刷新页面,
                            get_FastQuery(table, option);
                        }
                    })
                }
            });

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
@@ -231,6 +255,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_RepairCheckClass.html

@@ -306,6 +306,23 @@
                $("#btnSearch").click();
                set_ClearQuery();
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '维修验收项目分类代码') {
                    var linterid = data.HItemID.toString();
                    var linteridSub = data.hsubid;

                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '维修验收项目分类-编辑'
                        , shift: 0//弹出动画
                        , content: '../基础资料/Gy_RepairCheckClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    })
                }
            });
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -405,6 +422,13 @@
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号'
                                    })
                                }
                                else if (data[i].name == '维修验收项目分类代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '维修验收项目分类代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.维修验收项目分类代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -331,6 +331,30 @@

            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '岗位代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑岗位'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../生产基础资料/Add_Edit_Gy_Post.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });

            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
@@ -380,6 +404,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '岗位代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '岗位代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.岗位代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

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

@@ -375,6 +375,26 @@
            })
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '班次代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '班次-编辑'
                        , shift: 0  //弹出动画
                        , content: '../生产基础资料/Gy_ShiftsEdit.html?OperationType=2&HItemID=' + hID
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btn_Search").trigger('click');
                        }
                    })
                }
            });

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
@@ -879,6 +899,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '班次代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '班次代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.班次代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html

@@ -310,6 +310,23 @@
                set_ClearQuery();
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '供应商代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '供应商基础资料'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../采购基础资料/Gy_Supplier_Edit.html?OperationType=3&linterid=' + hID]
                        , resize: false
                    })
                }
            });

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                if (page != 1) {
@@ -513,6 +530,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '供应商代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '供应商代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.供应商代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

 WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer.html

@@ -330,6 +330,23 @@
            });
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '客户代码') {
                    var hID = data.HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '客户基础资料'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['Gy_Customer_Edit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=']
                        , resize: false
                    })
                }
            });

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                if (page != 1) {
@@ -558,6 +575,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '客户代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '客户代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.客户代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξߵã¼ì±£Ñø/Sc_MouldMaintainBill_PDA.html

@@ -550,6 +550,9 @@
                        }
                        $("#HMouldMaintainRuleInterNo").val(checkStatus.data[0].单据号);
                        $("#HMouldMaintainRuleInterID").val(checkStatus.data[0].hmainid);
                        $("#HPlanNo").val(checkStatus.data[0].保养计划号);
                        $("#HMouldMaintainPlanInterID").val(checkStatus.data[0].保养计划id);
                        $("#HMouldMaintainPlanEntryID").val(checkStatus.data[0].保养计划子id);
                        get_DocCheckItem2();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }

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

@@ -796,7 +796,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3819' },
                    data: { "HBillType": '3818' },
                    success: function (d) {
                        $("#HInterID").val(0);
                        $("#HPlanInterID").val(0);

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

@@ -137,7 +137,7 @@
            var option1 = [];
            var option2 = [];
            var HModName = "Sc_MouldMaintainRuleBillList_PDA";
            var titleData = ["HInterID","hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码", "源单子内码", "内部单据号", "hsubid", "保养项目ID", "负责人ID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HInterID", "hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码", "源单子内码", "内部单据号", "hsubid", "保养项目ID", "负责人ID", "保养计划id","保养计划子id"];//不需要显示的字段 å¯æ‰©å±•

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘


 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -1130,6 +1130,8 @@
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == "HRelationBillNo") {
                            var HProcID = $("#HProcID").val();
                            var HSourceID = $("#HSourceID").val();
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
@@ -1138,7 +1140,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../../views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html', 'yes']
                                , content: ['../../../views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1148,7 +1150,7 @@
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    if ($("#HMaterName").val() == checkStatus.data[0].产品 && $("#HProcName").val() == checkStatus.data[0].工序) {
                                    if ($("#HSourceName").val() == checkStatus.data[0].生产资源 && $("#HProcName").val() == checkStatus.data[0].工序) {
                                        obj.update({
                                            "HProcExchInterID": checkStatus.data[0].hmainid
                                            , "HProcExchEntryID": checkStatus.data[0].hsubid
@@ -1171,14 +1173,14 @@
                                        })
                                    }
                                    else {
                                        return layer.msg("选择副产计划单的物料与工序,跟当前工单不匹配");
                                        return layer.msg("选择副产计划单的生产资源与工序,跟当前生产资源与工序不匹配");
                                    }

                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
                                , end: function () {
                                    if ($("#HMaterName").val() == OptionData[0].产品 && $("#HProcName").val() == OptionData[0].工序) {
                                    if ($("#HSourceName").val() == OptionData[0].生产资源  && $("#HProcName").val() == OptionData[0].工序) {
                                        obj.update({
                                            "HProcExchInterID": OptionData[0].hmainid
                                            , "HProcExchEntryID": OptionData[0].hsubid
@@ -1200,7 +1202,7 @@

                                        })
                                    } else {
                                        return layer.msg("选择副产计划单的物料与工序,跟当前工单不匹配");
                                        return layer.msg("选择副产计划单的生产资源与工序,跟当前生产资源与工序不匹配");
                                    }

                                    OptionData = [];

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html

@@ -434,7 +434,7 @@
                        table.render(option);
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
                            $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
                            $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
                        }
                        form.render('select');
                        break;
@@ -454,7 +454,7 @@
                            table.render(option);//将数据渲染到表格上
                            for (var i = 1; i <= option.data.length; i++) {                                                              
                                $('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
                                $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
                                $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
                            }
                            form.render('select');
                        }
@@ -531,7 +531,7 @@
                                "HBadPhenomenaID": checkStatus.data[0].HItemID
                                , "HBadPhenomenaName": checkStatus.data[0].不良现象名称
                            })
                            $("#HBadPhenomenaName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].不良现象名称)
                            $("#HBadPhenomena" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].不良现象名称)
                            layer.close(index);//关闭弹窗
                        }
                        , btn2: function (index, layero) { }

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html

@@ -63,7 +63,7 @@
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">用户名</label>
                                                            <div class="layui-input-inline">
                                                                <input class="layui-input" name="Czymc" id="Czymc" autocomplete="off" style="float:left;width:150px;">
                                                                <input type="text" class="layui-input" name="Czymc" lay-verify="Czymc" id="Czymc" autocomplete="off" style="float:left;width:150px;" readonly>
                                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="CzymcList" style="width: 40px; display: none;">
                                                                    <i style="margin-left:-9px;">重置</i>
                                                                </button>
@@ -74,7 +74,7 @@
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">密码</label>
                                                            <div class="layui-input-inline">
                                                                <input type="password" class="layui-input" name="Czmm" id="Czmm" value="">
                                                                <input type="password" class="layui-input" name="Czmm" id="Czmm" value="" autocomplete="new-password" readonly>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
@@ -354,7 +354,7 @@
            var closeType = params[params[3]];  //关闭类型            
        }


     
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -384,8 +384,10 @@
            if (OperationType == 1) {//无源新增       
                Sav = "Add";
                $('#Czybm').attr("disabled", false);
                $('#Czymc').attr("disabled", false);
                $('#Czmm').attr("disabled", false);
                //$('#Czymc').attr("disabled", false);
                //$('#Czmm').attr("disabled", false);
                //$('#Czymc').prop('readonly', false);
                //$('#Czmm').prop('readonly', false);
                $('#Czyyz').attr("disabled", false);
                $('#Explain').attr("disabled", false);
  
@@ -393,8 +395,10 @@
            else if (OperationType == 3) {//编辑
                Sav = "Update";
                $('#Czybm').attr("disabled", true);
                $('#Czymc').attr("disabled", true);
                $('#Czmm').attr("disabled", true);
                $('#Czymc').prop('readonly', true);
                //$('#Czymc').attr("disabled", true);
                $('#Czmm').prop('readonly', true);
                //$('#Czmm').attr("disabled", true);
                $('#Czyyz').attr("disabled", true);
                $('#Explain').attr("disabled", false);
          
@@ -499,6 +503,19 @@
                btnHCheckEmp();
            });

            $('#Czymc').focus(function () {
                if (OperationType == 1) {
                    $('#Czymc').prop('readonly', false);
                }
               
            });

            $('#Czmm').focus(function () {
                if (OperationType == 1) {
                    $('#Czmm').prop('readonly', false);
                }
            });


            //保存
            form.on('submit(Saver)', function (data) {

 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html

@@ -1409,7 +1409,7 @@
                                , shift: 2                  //弹出动画
                                , area: ["90%", "90%"]      //窗体大小
                                , maxmin: true              //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_TechnologyParameterList.html?Type=HTechParamList&OperationType=2', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_TechnologyParameterList.html?Type=HTechParamList', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1687,6 +1687,7 @@
                    data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
                    success: function (result) {
                        if (result.count == 1) {
                            HSendDDMeg(HInterID);
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
@@ -1705,6 +1706,24 @@
            }
            //#endregion

            //#region å®¡æ ¸åŽå‘送信息
            function HSendDDMeg(HInterID) {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/HSendDDMeg",
                    async: true,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HInterID": HInterID },
                    success: function (result) {
                        if (result.count != 1) {
                            layer.msg(result.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }, error: function () {
                        layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }
            //#endregion

            //#region é€€å‡º
            form.on('submit(btn_Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {

 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillList.html

@@ -591,6 +591,7 @@
                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
                        success: function (result) {
                            if (result.count == 1) {
                                HSendDDMeg(HInterID);
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
@@ -618,6 +619,25 @@
            }
            //#endregion


            //#region å®¡æ ¸åŽå‘送信息
            function HSendDDMeg(HInterID) {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/HSendDDMeg",
                    async: true,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HInterID": HInterID},
                    success: function (result) {
                        if (result.count != 1) {
                            layer.msg(result.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        } 
                    }, error: function () {
                        layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }
            //#endregion

            //#region å…³é—­ï¼ˆnum=1）/反关闭（num=2）
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html

@@ -71,9 +71,9 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">条形码</label>
                                                <label class="layui-form-label">条形码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
                                                    <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value="">
                                                </div>
                                            </div>
                                        </div>
@@ -1644,6 +1644,10 @@
                layer.msg("请选择设备状态！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HBarCode").val() == '' || $("#HBarCode").val() == null) {
                layer.msg("请输入条形码！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            return Result;
        }
    </script>

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

@@ -509,10 +509,12 @@
                var x_PPK = 0;
                var x_CPK = 0;
                var numCount = 0
                //系数 ä¸å˜çš„
                var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];

                //平均值的平均值
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                    if (optionAVG.length != 0 || optionS.length != 0) {                        
                        x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
                    }
                }
@@ -520,6 +522,7 @@
                x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
                $("#HCenterline_X").val(x_AVG.toFixed(5));

                //（每天的数据-平均值的平均值） ä¹˜å¹³æ–¹ åœ¨ç›¸åŠ 
                for (var i = 1; i < option.cols[0].length; i++) {
                    for (var j = 0; j < option.data.length - 3; j++) {
                        numCount += 1;
@@ -527,9 +530,11 @@

                    }
                }

                //（sum除以（所有数量减-1）） å¼€å¹³æ–¹ ä¸åŒ…含后三行
                x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));
                 //（sum除以（所有数量）） å¼€å¹³æ–¹  ä¸åŒ…含后三行
                x_CPK = Math.sqrt(calc(x_SUM, numCount, "/"));

                var limit = $("#limit").val();
                if (parseInt(limit) >= 9) {
                    $("#HCenterline_S").val(x_PPK.toFixed(4));
@@ -537,52 +542,64 @@

                //均值 æŽ§åˆ¶ä¸Šé™ æŽ§åˆ¶ä¸‹é™
                if (limit == 1) {
                    //x控制上限 å¹³å‡å€¼çš„平均值+三倍的PPK  X控制下限  å¹³å‡å€¼çš„平均值-三倍的PPK
                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+").toFixed(5))
                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-").toFixed(5))

                    //计算样本量为1 çš„ ppk
                    //检验项目：平均值-下限 é™¤ä»¥ä¸‰å€çš„PPK
                    var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
                    //检验项目：上限-平均值 é™¤ä»¥ä¸‰å€çš„PPK
                    var max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, x_PPK, "*"), "/");
                    var DataHCPK = min > max ? max : min;
                    $("#HPPK").val(DataHCPK);

                    //计算样本量为1 çš„ cpk
                  
                    //计算样本量为1 çš„ cpk                  
                    var cpkSum = 0;
                    var CPK_U = 0;
                    var CPK_N = 0;
                    for (var i = 1; i < option.cols[0].length; i++) {
                        for (var j = 0; j < option.data.length - 3; j++) {
                            if (i == 1) {
                                //获取第一行的第一个值
                                CPK_U = option.data[j][option.cols[0][i].field];
                            } else {
                                CPK_N = option.data[j][option.cols[0][i].field];
                                //如果第一行的第一个值大于第二个值，第一个减去第二  å¦åˆ™å°±æ˜¯  ç¬¬äºŒä¸ªå‡åŽ»ç¬¬ä¸€ä¸ª
                                var data_un = CPK_U > CPK_N ? calc(CPK_U, CPK_N, "-") : calc(CPK_N, CPK_U, "-");
                                //把值相加
                                cpkSum = calc(cpkSum, data_un, "+");
                                CPK_U = CPK_N;
                            }
                        }
                    }
                    //cpkSum é™¤ä»¥ ç¬¬ä¸€è¡Œæ€»æ•°å‡åŽ»2
                    cpkSum = calc(cpkSum, option.cols[0].length - 2, "/");
                    //cpkSum é™¤ä»¥ç³»æ•°
                    var HAVG_CPK = calc(cpkSum, 1.128, "/");

                    //检验项目：平均值-下限 é™¤ä»¥ä¸‰å€çš„HAVG_CPK
                    min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, HAVG_CPK, "*"), "/");
                    //检验项目：上限-平均值 é™¤ä»¥ä¸‰å€çš„HAVG_CPK
                    max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, HAVG_CPK, "*"), "/");
                    DataHCPK = min > max ? max : min;

                    $("#HCPK").val(DataHCPK);
                } else {
                    //上限
                    if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                    if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {//上限不等于空，下限等于空
                        //检验项目：（上限值-平均值）除以（三倍的PPK é™¤ä»¥C4的系数:c4对应的样本数）
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                        $("#HPPK").val(HUpLimit.toFixed(4));
                    }
                    //下限
                    else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                    else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {//下限不等于空，上限等于空
                         //检验项目：（平均值-下限值）除以（三倍的PPK é™¤ä»¥C4的系数:c4对应的样本数）
                        var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                        $("#HPPK").val(HDownLimit.toFixed(4));
                    } else {
                        //检验项目：（上限值-平均值）除以（三倍的PPK é™¤ä»¥C4的系数:c4对应的样本数）
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                         //检验项目：（平均值-下限值）除以（三倍的PPK é™¤ä»¥C4的系数:c4对应的样本数）
                        var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
                        $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                    }
@@ -599,6 +616,7 @@
                var D3 = [0,0.000, 0.000, 0.000, 0.000, 0.000, 0.076, 0.136, 0.184, 0.223];
                var D4 = [0,3.267, 2.574, 2.282, 2.114, 2.004, 1.924, 1.864, 1.816, 1.777];

                //求极差值的平均值
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        s_AVG = calc(s_AVG, parseFloat(optionS[0][option.cols[0][j].field]), "+");
@@ -606,13 +624,13 @@
                }
                s_AVG = calc(s_AVG, (option.cols[0].length - 1), "/")
                s_AVG = $("#HCenterline_S").val() == "" || "0" ? s_AVG : parseFloat($("#HCenterline_S").val());
                $("#HCenterline_S").val(s_AVG);
                $("#HCenterline_S").val(s_AVG);//S中心线

                var limit = $("#limit").val();
                if (parseInt(limit) < 9) {
                    $("#HCenterline_S").val(s_AVG.toFixed(4));
                }

                //求平均值的平均值
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
@@ -620,33 +638,41 @@
                }
                x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
                x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
                $("#HCenterline_X").val(x_AVG.toFixed(5));
                $("#HCenterline_X").val(x_AVG.toFixed(5));//X中心线

                s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");

                //均值 æŽ§åˆ¶ä¸Šé™ æŽ§åˆ¶ä¸‹é™
                if (limit > 1) {
                    //平均值+（A2的系数乘以 æžå·®å€¼çš„平均值）
                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+").toFixed(5))
                    //平均值-（A2的系数乘以 æžå·®å€¼çš„平均值）
                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-").toFixed(5))
                }
           
                //差值 æŽ§åˆ¶ä¸Šé™ æŽ§åˆ¶ä¸‹é™
                //D4的系数 ä¹˜ä»¥ æžå·®å€¼çš„平均值
                $("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
                 //D3的系数 ä¹˜ä»¥ æžå·®å€¼çš„平均值
                $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
                var limit = $("#limit").val();

                if (limit > 1) {
                    //上限
                    if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                    if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {//下限不等于空，上限等于空
                        //（上限值-平均值）除以 ä¸‰å€çš„s_CPK
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
                        $("#HCPK").val(HUpLimit.toFixed(4));
                    }
                    //下限
                    else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                    else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {//上限不等于空，下限等于空
                         //（平均值-下限值）除以 ä¸‰å€çš„s_CPK
                        var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                        $("#HCPK").val(HDownLimit.toFixed(4));
                    } else {
                        //（上限值-平均值）除以 ä¸‰å€çš„s_CPK
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
                        //（平均值-下限值）除以 ä¸‰å€çš„s_CPK
                        var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                        if (s_CPK == 0) {
                            $("#HCPK").val(0);
@@ -999,19 +1025,19 @@

            //计算spc八大判定
            function spc_judge() {
                //均值
                //均值        ï¼ˆä¸Šé™-中心限）除以 3  åˆ†æˆ3分
                var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
                //上限部分
                var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());
                var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());//上限
                var HAreaValue_B = calc(calc(HAreaValue, 2, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
                var HAreaValue_C = calc(calc(HAreaValue, 1, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
                //下限部分
                var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());
                var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());//下限
                var HAreaValue_FB = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 2, "*"), "-").toFixed(5);
                var HAreaValue_FC = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 1, "*"), "-").toFixed(5);


                let HAvg = [];//平均值
                let HAvg = [];//平均值  æ ¹æ®X- è¿™ä¸€è¡Œè®¡ç®—çš„

                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0) {
@@ -1022,10 +1048,14 @@
                //连续十五个点在中心线两侧的C区内
                var judge_return = [];
                if (HAvg.length >= 15) {
                    //因为是15个点  æ‰€ä»¥14的下标就是第15条数据  ç„¶åŽæ˜¯0-15，1-16
                    for (var i = 14; i < HAvg.length; i++) {
                        if (HAvg[i] >= HAreaValue_FC && HAvg[i] <= HAreaValue_C) {
                            //根据上面的i值算出从那个下标开始
                            for (var j = i - 14; j <= i; j++) {
                                //如果大于负c,小于正c é‚£å°±æœ‰é—®é¢˜
                                if (HAvg[j] >= HAreaValue_FC && HAvg[j] <= HAreaValue_C) {
                                    //当最后一条，如果大于负c,小于正c å°±è¿›åŽ»è¿½åŠ 15条数据
                                    if (i == j) {
                                        for (var j1 = i; j1 >= i - 14; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1034,7 +1064,7 @@
                                        }
                                    }
                                } else {
                                    break;
                                    break;  //终止当前15条，执行下一个15条
                                }
                            }
                        }
@@ -1045,6 +1075,7 @@
                    for (var i = 13; i < HAvg.length; i++) {
                        var judge = [];
                        for (var j = i - 13; j < i; j++) {
                            //用第一个跟第二的做对比，第二个跟第三个做对比，以此循环
                            if (HAvg[j] > HAvg[j + 1]) {
                                judge.push(1);
                            } else if (HAvg[j] < HAvg[j + 1]) {
@@ -1052,7 +1083,7 @@
                            }
                        }
                        for (var k = 0; k < judge.length; k++) {
                            if (judge[k] + judge[k + 1] == 0) {
                            if (judge[k] + judge[k + 1] == 0) {  //如果前后相加等于0那就是满足，不满足就直接跳出
                                if ((k + 1) == judge.length) {
                                    for (var j1 = i; j1 >= i - 13; j1--) {
                                        if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1061,7 +1092,7 @@
                                    }
                                }
                            } else {
                                break;
                                break;//终止当前循环
                            }
                        }
                    }
@@ -1071,6 +1102,7 @@
                if (HAvg.length >= 9) {
                    for (var i = 8; i < HAvg.length; i++) {
                        var judge = [];
                        //用循环的值跟中心线对比
                        for (var j = i - 8; j <= i; j++) {
                            if (HAvg[j] > parseFloat($("#HCenterline_X").val())) {
                                judge.push(1);
@@ -1078,10 +1110,12 @@
                                judge.push(-1);
                            }
                        }
                       //对循环的插入的值，相加
                        var sum = 0;
                        for (var k = 0; k < judge.length; k++) {
                            sum += judge[k];
                        }
                        //判断循环插入的值是否等于正九或者负九
                        if (sum == 9 || sum == -9) {
                            for (var j1 = i; j1 >= i - 8; j1--) {
                                if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1095,9 +1129,12 @@
                //连续8点落在中心线两侧且无一在C区以内(即在C区以外)
                if (HAvg.length >= 8) {
                    for (var i = 7; i < HAvg.length; i++) {
                        //循环的值是否大于正C æˆ–者 å°äºŽè´ŸC
                        if (HAvg[i] < HAreaValue_FC || HAvg[i] > HAreaValue_C) {
                            //满足 è¿›è¡Œåˆ¤æ–­å‰é¢å€¼æ˜¯å¦æ»¡è¶³
                            for (var j = i - 7; j <= i; j++) {
                                if (HAvg[j] < HAreaValue_FC || HAvg[j] > HAreaValue_C) {
                                    //如果最后都满足  æ’å…¥
                                    if (j == i) {
                                        for (var j1 = i; j1 >= i - 7; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1106,7 +1143,7 @@
                                        }
                                    }
                                } else {
                                    break;
                                    break;  //有一个不满足直接终止当前循环
                                }
                            }
                        }
@@ -1117,6 +1154,7 @@
                if (HAvg.length >= 6) {
                    for (var i = 5; i < HAvg.length; i++) {
                        var judge = [];
                        //用第一个跟第二的做对比，第二个跟第三个做对比，以此循环
                        for (var j = i - 5; j < i; j++) {
                            if (HAvg[j] > HAvg[j + 1]) {
                                judge.push(1);
@@ -1124,10 +1162,12 @@
                                judge.push(-1);
                            }
                        }
                        //对追加的值 è¿›è¡Œç´¯åŠ 
                        var sum = 0;
                        for (var k = 0; k < judge.length; k++) {
                            sum += judge[k];
                        }
                        //如果是正五或者负五 é‚£å°±å…¨éƒ¨è¿½åŠ 
                        if (sum == 5 || sum == -5) {
                            for (var j1 = i; j1 >= i - 5; j1--) {
                                if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1142,15 +1182,22 @@
                if (HAvg.length >= 5) {
                    for (var i = 4; i < HAvg.length; i++) {
                        var judge = [];
                        //当前值如果大于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å¤§äºŽ æ­£C
                        if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_C) {
                            for (var j = i - 4; j <= i; j++) {
                                var record = [];
                                //上面满足 åˆ¤æ–­ å½“前值如果大于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å¤§äºŽ æ­£C
                                if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_C) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 4) {
                                        //如果满足4条以上数据有问题 é‚£å°±å¾ªçŽ¯æŠŠæ•°æ®æ’入数组
                                        for (var j1 = i; j1 >= i - 4; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            //根据
                                            //if ($.inArray(HAvg[j1], judge_return) == -1) {
                                            //    judge_return.push(HAvg[j1]);
                                            //}
                                            if ($.inArray(record[j1], judge_return) == -1) {
                                                judge_return.push(record[j1]);
                                            }
                                        }
                                    }
@@ -1158,15 +1205,21 @@
                                
                            }
                        }
                        //当前值如果小于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å°äºŽ è´ŸC
                        else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FC) {
                            for (var j = i - 4; j <= i; j++) {
                                var record = [];
                                //上面满足 åˆ¤æ–­ å½“前值如果小于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å°äºŽ è´ŸC
                                if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FC) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 4) {
                                         //如果满足4条以上数据有问题 é‚£å°±å¾ªçŽ¯æŠŠæ•°æ®æ’入数组
                                        for (var j1 = i; j1 >= i - 4; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            //if ($.inArray(HAvg[j1], judge_return) == -1) {
                                            //    judge_return.push(HAvg[j1]);
                                            //}
                                            if ($.inArray(record[j1], judge_return) == -1) {
                                                judge_return.push(record[j1]);
                                            }
                                        }
                                    }
@@ -1182,15 +1235,21 @@
                if (HAvg.length >= 3) {
                    for (var i = 2; i < HAvg.length; i++) {
                        var judge = [];
                        //当前值如果大于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å¤§äºŽ æ­£B
                        if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_B) {
                            for (var j = i - 2; j <= i; j++) {
                                var record = [];
                                //上面满足 åˆ¤æ–­ å½“前值如果大于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å¤§äºŽ æ­£B
                                if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_B) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 2) {
                                         //如果满足2条以上数据有问题 é‚£å°±å¾ªçŽ¯æŠŠæ•°æ®æ’入数组
                                        for (var j1 = i; j1 >= i - 2; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            //if ($.inArray(HAvg[j1], judge_return) == -1) {
                                            //    judge_return.push(HAvg[j1]);
                                            //}
                                            if ($.inArray(record[j1], judge_return) == -1) {
                                                judge_return.push(record[j1]);
                                            }
                                        }
                                    }
@@ -1198,15 +1257,21 @@

                            }
                        }
                        //当前值如果小于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å°äºŽ è´ŸB
                        else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FB) {
                            for (var j = i - 2; j <= i; j++) {
                                var record = [];
                                 //上面满足 åˆ¤æ–­ å½“前值如果小于 ä¸­å¿ƒçº¿ å¹¶ä¸”  å°äºŽ è´ŸB
                                if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FB) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 2) {
                                        //如果满足2条以上数据有问题 é‚£å°±å¾ªçŽ¯æŠŠæ•°æ®æ’入数组
                                        for (var j1 = i; j1 >= i - 2; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            //if ($.inArray(HAvg[j1], judge_return) == -1) {
                                            //    judge_return.push(HAvg[j1]);
                                            //}
                                            if ($.inArray(record[j1], judge_return) == -1) {
                                                judge_return.push(record[j1]);
                                            }
                                        }
                                    }
@@ -1222,11 +1287,13 @@
                if (HAvg.length >= 0) {
                    for (var i = 0; i < HAvg.length; i++) {
                        var judge = [];
                        //判断当前值是否大于 æ­£A
                        if (HAvg[i] > HAreaValue_A) {
                            if ($.inArray(HAvg[i], judge_return) == -1) {
                                judge_return.push(HAvg[i]);
                            }
                        }
                        //判断当前值是否大于 è´ŸA
                        else if (HAvg[i] < HAreaValue_FA) {
                            if ($.inArray(HAvg[i], judge_return) == -1) {
                                judge_return.push(HAvg[i]);