zrg
2024-08-28 497a64bd317045c920aa9b4fb5d68e70a122e784
制程(合格率,一次合格率),生产统计月报,异常反馈单流程优化
13个文件已修改
1个文件已添加
1586 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html 308 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html 458 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html 171 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html 252 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -450,6 +450,7 @@
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipResumeCheckQuery.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSelfQuery_BGT.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
    <Content Include="views\质量管理\质量报表\QC_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
/*    var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /* var WEBURL = "http://localhost:8082/API/"; */   //杜贺本地配置
     /*var WEBURL = "http://localhost/API/";   //潘浙游本地配置  */
@@ -12,7 +12,7 @@
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
WebTM/views/IpadIndex.html
@@ -1286,6 +1286,40 @@
            });
        }
        //异常签到处理点击事件
        function SingErrMsg(event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增异常签到处理单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html?OperationType=2',
                end: function () {
                }
            });
        }
        //异常验收点击事件
        function ErrMsgBackCheck(event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增异常反馈验收单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
                end: function () {
                }
            });
        }
        //退出
        function Esc(event, obj) {
            parent.location.href = "index.html"
@@ -1497,7 +1531,7 @@
                            <div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-unlink imgicon"></span>
                                    <span class="imgtitle">异常</span>
                                    <span class="imgtitle">异常申请</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
@@ -1547,7 +1581,21 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="SingErrMsg(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-layer imgicon"></span>
                                    <span class="imgtitle">异常签到处理</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="ErrMsgBackCheck(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-layer imgicon"></span>
                                    <span class="imgtitle">异常验收</span>
                                </div>
                            </div>
                        </div>
                    </div>
                </fieldset>
            </div>
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackCheckBillMain.html
@@ -524,6 +524,8 @@
                $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
                $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门
                $("#HCheckEmpID").val(sessionStorage["HEmpID"]);     //验收人
                $("#HCheckEmpName").val(sessionStorage["HUserName"]);     //制单人
                $("#HHCheckDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                if (HSouceBillType == '4502') {
                    var num = 1;    //异常反馈单
@@ -571,6 +573,7 @@
                                    $("#HErrMsgBackBillNo").val(LoadData[0].单据号); //异常反馈单号
                                    $("#HErrMsgBackInterID").val(LoadData[0].HInterID); //异常反馈单主内码
                                    $("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //异常反馈单子内码
                                }
                                else if (num == 2) {
                                    var LoadData = data.data;
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackHandleBillMain.html
@@ -555,7 +555,7 @@
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型名称ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].异常类型名称); //异常类型名称
                                    $("#HSendMan").val(LoadData[0].发送人); //发送人
                                    $("#HReceiveMan").val(LoadData[0].接收人); //接收人
                                    $("#HReceiveMan").val(LoadData[0].指派处理人); //接收人
                                    $("#HCopyMan").val(LoadData[0].抄送); //抄送
                                    $("#HLevel").find("option[value='" + LoadData[0]["紧急程度"] + "']").attr("selected", true); //紧急程度
                                    $("#HContext").val(LoadData[0].主题); //主题
@@ -572,6 +572,10 @@
                                    $("#HErrMsgBackBillNo").val(LoadData[0].单据号); //异常反馈单号
                                    $("#HErrMsgBackInterID").val(LoadData[0].HInterID); //异常反馈单主内码
                                    $("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //异常反馈单子内码
                                    $("#HHandleEmpID").val(LoadData[0].HHandleEmpID); //签到人ID
                                    $("#HHandleEmpName").val(LoadData[0].指派处理人); //签到人
                                } else if (num==2) {
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
@@ -756,6 +760,7 @@
                var refSav = "";
                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
                    refSav = "Add";
                    data.field.HMaker = $("#HHandleEmpName").val();
                }
                if (OperationType == 3) {
                    refSav = "Update";
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBillMain.html
@@ -539,7 +539,7 @@
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型名称ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].异常类型名称); //异常类型名称
                                    $("#HSendMan").val(LoadData[0].发送人); //发送人
                                    $("#HReceiveMan").val(LoadData[0].接收人); //接收人
                                    $("#HReceiveMan").val(LoadData[0].指派处理人); //接收人
                                    $("#HCopyMan").val(LoadData[0].抄送); //抄送
                                    $("#HLevel").find("option[value='" + LoadData[0]["紧急程度"] + "']").attr("selected", true); //紧急程度
                                    $("#HContext").val(LoadData[0].主题); //主题
@@ -556,6 +556,10 @@
                                    $("#HErrMsgBackBillNo").val(LoadData[0].单据号); //异常反馈单号
                                    $("#HErrMsgBackInterID").val(LoadData[0].HInterID); //异常反馈单主内码
                                    $("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //异常反馈单子内码
                                    $("#HSignEmpID").val(LoadData[0].HHandleEmpID); //签到人ID
                                    $("#HSignEmpName").val(LoadData[0].指派处理人); //签到人
                                } else if (num == 2) {
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
@@ -739,6 +743,7 @@
                var refSav = "";
                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
                    refSav = "Add";
                    data.field.HMaker = $("#HSignEmpName").val();
                }
                if (OperationType == 3) {
                    refSav = "Update";
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBill_BrushCard.html
@@ -45,6 +45,9 @@
        .layui-form-label {
            width: 25%;
        }
        #mainTable tr {
            height: 100px; /* ä½ æƒ³è¦çš„行高 */
        }
    </style>
</head>
@@ -54,9 +57,10 @@
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">签到</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">查询</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 150px;height:120px;width:120px;" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">签到</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnErrMSg" id="btnErrMSg">处理</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">查询</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <h1 style="text-align: center; padding: 10px 0;"><b>异常反馈刷卡签到</b></h1>
@@ -92,7 +96,7 @@
                            </div>
                        </div>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
                    <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;" lay-size="lg"></table>
                </form>
            </div>
        </div>
@@ -121,6 +125,10 @@
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = [];
            //#endregion
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -188,6 +196,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -195,7 +204,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + 0 + '&HSouceBillType=' + 4529 + ''
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , resize: false,
                        end: function () {
                            //刷新页面,
@@ -211,10 +220,51 @@
                }
            });
            //处理
            form.on('submit(btnErrMSg)', function () {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    if (data[0].单据状态 != "已签到") {
                        layer.msg('该单子未签到,不能处理!');
                    } else {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '异常反馈接收单签到'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: '../../生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                            , resize: false,
                            end: function () {
                                //刷新页面,
                                get_FastQuery();//查询
                            }
                            , cancel: function () {
                            }
                        })
                    }
                } else {
                    layer.msg('请选择一个异常反馈接收单进行签到!');
                }
            });
            //退出
            form.on('submit(btnEdit)', function () {
                //关闭页签
                Pub_Close(2);
                if (OperationType == "2") {
                    //关闭页签
                    Pub_Close(1);
                } else {
                    //关闭页签
                    Pub_Close(2);
                }
            });
            //IC卡回车方法
@@ -264,7 +314,7 @@
                    , limit: 50 //每页默认显示的数量
                    , cellMinWidth: 200
                    , done: function (res, curr, count) {
                        //soulTable.render(this);
                    }
                };
                option.data = [];
@@ -292,87 +342,183 @@
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                if (OperationType == 2) {       //保留原有的刷卡签到,新增一个报工台刷卡签到(获取数据方式不一样)
                    //进入页面显示的缓存列表
                    $.ajax({
                        url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
                        type: "GET",
                        data: { "sWhere": sWhere, "num":"2","user": sessionStorage["HUserName"] },
                        success: function (data1) {
                            if (data1.count == 1) {
                            if (data1.data.length > 0) {
                                $("#HSignInEmp").val(data1.data[0].指派处理人);
                            } else {
                                $("#HSignInEmp").val("");
                                layer.msg('没有被指派异常反馈单', { time: 2 * 1000});
                            }
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列(H开头的列不显示)
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                if (data1.data.length > 0) {
                                    $("#HSignInEmp").val(data1.data[0].指派处理人);
                                } else {
                                    $("#HSignInEmp").val("");
                                    layer.msg('没有被指派异常反馈单', { time: 2 * 1000 });
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                var data = [];
                                var col = [];
                                //给空的数组赋值
                                for (var key in data1.list) {
                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                    //获取不需要显示的列(H开头的列不显示)
                                    var patrn = new RegExp(/^h/i);
                                    if (patrn.test(data1.list[key].ColmCols)) {
                                        titleData[key] = data1.list[key].ColmCols;
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , totalRow: true
                                , done: function (res, curr, count) {
                                    //soulTable.render(this);
                                //在列表左边添加勾选框
                                col.push({ type: 'checkbox', fixed: 'left' });
                                for (var i = 0; i < data.length; i++) {
                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                    if ($.inArray(data[i].name, titleData) > -1) {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else {
                                        switch (data[i].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                                break;
                                            case 'long':
                                            case 'Int32':
                                            case 'Int64':
                                            case 'double':
                                            case 'Decimal':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                                break;
                                            default:
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                        }
                                    }
                                }
                                //动态显示列名
                                option = {
                                    elem: '#mainTable'
                                    , cols: [col]
                                    , data: data1.data
                                    , height: 'full-80'
                                    , page: true
                                    , limits: [50, 500, 5000, 50000]
                                    , limit: 50
                                    , cellMinWidth: 90
                                    , totalRow: true
                                    , done: function (res, curr, count) {
                                    }
                                }
                                ins = table.render(option);
                                layer.close(ajaxLoad);
                            } else {
                                option.data = data1.data
                                ins = table.render(option);
                                layer.close(ajaxLoad);
                            }
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            option.data = data1.data
                            ins = table.render(option);
                        }, error: function () {
                            layer.close(ajaxLoad);
                            //layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                    });
                } else {
                    //进入页面显示的缓存列表
                    $.ajax({
                        url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
                        type: "GET",
                        data: { "sWhere": sWhere, "num": "1","user": sessionStorage["HUserName"] },
                        success: function (data1) {
                            if (data1.count == 1) {
                                if (data1.data.length > 0) {
                                    $("#HSignInEmp").val(data1.data[0].指派处理人);
                                } else {
                                    $("#HSignInEmp").val("");
                                    layer.msg('没有被指派异常反馈单', { time: 2 * 1000 });
                                }
                                var data = [];
                                var col = [];
                                //给空的数组赋值
                                for (var key in data1.list) {
                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                    //获取不需要显示的列(H开头的列不显示)
                                    var patrn = new RegExp(/^h/i);
                                    if (patrn.test(data1.list[key].ColmCols)) {
                                        titleData[key] = data1.list[key].ColmCols;
                                    }
                                }
                                //在列表左边添加勾选框
                                col.push({ type: 'checkbox', fixed: 'left' });
                                for (var i = 0; i < data.length; i++) {
                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                    if ($.inArray(data[i].name, titleData) > -1) {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else {
                                        switch (data[i].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                                break;
                                            case 'long':
                                            case 'Int32':
                                            case 'Int64':
                                            case 'double':
                                            case 'Decimal':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                                break;
                                            default:
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                        }
                                    }
                                }
                                //动态显示列名
                                option = {
                                    elem: '#mainTable'
                                    , cols: [col]
                                    , data: data1.data
                                    , height: 'full-80'
                                    , page: true
                                    , limits: [50, 500, 5000, 50000]
                                    , limit: 50
                                    , cellMinWidth: 90
                                    , totalRow: true
                                    , done: function (res, curr, count) {
                                        //soulTable.render(this);
                                    }
                                }
                                ins = table.render(option);
                                layer.close(ajaxLoad);
                            } else {
                                option.data = data1.data
                                ins = table.render(option);
                                layer.close(ajaxLoad);
                                //layer.alert(data1.code + data1.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
            }
            //#endregion
            //#region èŽ·å–å‚æ•°
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html
@@ -347,10 +347,10 @@
                                                        <label class="layui-form-label">影响面程度:</label>
                                                        <div class="layui-input-inline">
                                                            <select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
                                                                <option value="停线" selected="selected">停线</option>
                                                                <option value="无法判断" selected="selected">无法判断</option>
                                                                <option value="停线">停线</option>
                                                                <option value="批量不良">批量不良</option>
                                                                <option value="偶发不良">偶发不良</option>
                                                                <option value="无法判断">无法判断</option>
                                                            </select>
                                                        </div>
                                                    </div>
@@ -551,10 +551,11 @@
            }
            else if (OperationType == 4) {
                set_AddFNew();
                $("#HSendMan").val(sessionStorage["HUserName"]); //发送人
                var EquipNumber = "";
                set_Sc_ICMOBillStatus();//获取工单的 ç‰©æ–™ æ•°é‡
                set_ErrMsgBackType();   //获取异常类型
                set_UserSuperiors();    //获取当前登录人的上级
                //set_UserSuperiors();    //获取当前登录人的上级
                set_EquipFile();        //获取设备的设备编码
                var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                var Person = sessionStorage["HUserName"];
@@ -1093,8 +1094,8 @@
                });
            });
            //接收人
            form.on('submit(HReceiveManList)', function () {
            //接收人(作废)
            form.on('submit(HReceiveManList0)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1144,6 +1145,46 @@
                    }
                });
            });
            //接收人
            form.on('submit(HReceiveManList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '接收人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HReceive', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HReceiveMan").val(checkStatus.data[0].职员名称);
                        $("#HHandleEmpName").val(checkStatus.data[0].职员名称);  //指派处理人
                        $("#HHandleEmpID").val(checkStatus.data[0].HItemID);        //指派处理人
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //抄送人
            form.on('submit(HCopyManList)', function () {
@@ -1418,16 +1459,22 @@
                return Result = false;
            }
            if ($("#HBadProcManName").val() == '' || $("#HSendMan").val() == null) {
                layer.msg("责任人不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HQEManName").val() == '' || $("#HReceiveMan").val() == null) {
                layer.msg("QE责任人不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if (OperationType == "2") {
                if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
                    layer.msg("源单单号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
            }
            //if ($("#HQty").val() > Qty) {
            //    layer.msg("不能大于计划数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;
            //}
            return Result;
        }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_QualityReportBillMonth.html
@@ -129,6 +129,28 @@
                var HQualifiedNum = [];//合格总数量
                var HFirstPassRate = [];//直通率
                var HTitle = "";//图形标题
                var monthlyTotals = [];
                // éåŽ†æ•°æ®æ•°ç»„
                option.data.forEach(data => {
                    var year = data["å¹´"];
                    var month = data["月"];
                    var quantity = data["注塑数量"];
                    // åˆå§‹åŒ–年份对象
                    if (!monthlyTotals[year]) {
                        monthlyTotals[year] = {};
                    }
                    // åˆå§‹åŒ–月份对象
                    if (!monthlyTotals[year][month]) {
                        monthlyTotals[year][month] = 0;
                    }
                    // ç´¯åŠ æ•°é‡
                    monthlyTotals[year][month] += quantity;
                });
                if (option.data.length > 0) {
                    var HMaterName = option.data[0].物料名称
                    for (let i = 0; i < H_X.length; i++) {
@@ -137,10 +159,21 @@
                        HFirstPassRate.push(0);
                    }
                    // å¡«å……数据
                    for (let i = 0; i < H_X.length; i++) {
                        let month = i + 1; // 1到12的月份
                        let year = $("#Hyear").val(); // å½“前年份
                        // å°† monthlyTotals ä¸­çš„æ•°é‡å¡«å……到 HProcSumNum ä¸­
                        if (monthlyTotals[year] && monthlyTotals[year][month]) {
                            HProcSumNum[i] = monthlyTotals[year][month];
                        }
                    }
                    // å¡«å……数据
                    for (let i = 0; i < option.data.length; i++) {
                        if (option.data[i].物料名称 === HMaterName) {
                            let monthIndex = option.data[i].月 - 1; // æœˆä»½åœ¨æ•°ç»„中的索引(注意转换为从0开始)
                            HProcSumNum[monthIndex] += option.data[i].注塑数量;
                            //HProcSumNum[monthIndex] += option.data[i].注塑数量;
                            // å¤„理注塑良率
                            let qualifiedRateString = option.data[i].注塑良率; // "5.00%"
@@ -225,9 +258,9 @@
                        {
                            type: 'value',
                            name: '生产数量',
                            min: 0,
                            max: 200000,
                            interval: 10000,
                            //min: 0,
                            //max: 200000,
                            //interval: 10000,
                            axisLabel: {
                                formatter: '{value}'
                            }
@@ -339,7 +372,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-490'
                    , height: '200px'
                    , totalRow: true
                    , page: true
                    , cellMinWidth: 90
WebTM/views/ÖÊÁ¿¹ÜÀí/Òì³£·´À¡/OA_ErrMsgBackSelfQuery_BGT.html
New file
@@ -0,0 +1,458 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>异常反馈查询列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-tab layui-tab-card" style="margin-top:20px;">
                            <ul class="layui-tab-title">
                                <li class="layui-this">未验收</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--我发送的-->
                                    <table class="layui-hide" id="mainTable_send" lay-filter="mainTable_send"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReception-in" id="btn-XTReception-in"><i class="layui-icon layui-icon-radio"></i>下推异常反馈接收单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>下推异常反馈签到单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>下推异常反馈处理单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View" id="btn-View"><i class="layui-icon layui-icon-radio"></i>查看</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-normal"  lay-submit=""  lay-filter="btn-XTCheck" id="btn-XTCheck" style="/* display: inline; */height: 100px;margin-left: 100px;">下推验收单</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit=""  lay-filter="btn-View1" id="btn-View1"  style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">查看</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit=""  lay-filter="btnEdit" id="btnEdit"  style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">退出</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View2" id="btn-View2"><i class="layui-icon layui-icon-radio"></i>查看</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
                , soulTable = layui.soulTable
            var sWhere = "";
            var option_receive = "";  //未完成
            var option_copy = ""; //已完成
            var option_send = ""; //正在进行
            var ins;
            //var TableTab = "mainTable_receive";  //初始化页面时默认为 â€œæœªå®Œæˆâ€ é¡µç­¾
            //var cur_title = "未完成"; //当前选中页签
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //
            var HModName = "OA_ErrMsgBackSelfQuery";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆæˆ‘接收的)
            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆæˆ‘发送的)
            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆæŠ„送我的)
            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            function set_ClearBill() {
                //初始化接收列表
                set_InitGrid_notStart();
                //初始化发送
                set_InitGrid_send();
                //初始化抄送列表
                set_InitGrid_copy();
                //查询
                get_Display();
            }
            table.on('toolbar(mainTable_receive)', function (obj) {
                switch (obj.event) {
                    //下推异常反馈接收单
                    case 'btn-XTReception-in': XTReception();
                        break;
                    //下推异常反馈签到单
                    case 'btn-XTSign-in': XTSign();
                        break;
                    //下推异常反馈处理单
                    case 'btn-XTReceive': XTReceive();
                        break;
                    //查看
                    case 'btn-View': View();
                        break;
                };
            });
            table.on('toolbar(mainTable_send)', function (obj) {
                switch (obj.event) {
                    //下推异常反馈验收单
                    case 'btn-XTCheck': XTCheck();
                        break;
                    //查看
                    case 'btn-View1': View();
                        break;
                };
            });
            table.on('toolbar(mainTable_copy)', function (obj) {
                switch (obj.event) {
                    //查看
                    case 'btn-View2': View();
                        break;
                };
            });
            //退出
            form.on('submit(btnEdit)', function () {
                //关闭页签
                Pub_Close(1);
            });
            //初始化接收列表
            function set_InitGrid_notStart() {
                option_receive = {
                    elem: '#mainTable_receive'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 300
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: []
                };
                //table.render(option);
            }
            //初始化发送列表
            function set_InitGrid_send() {
                option_send = {
                    elem: '#mainTable_send'
                    , toolbar: '#toolbarDemo1'
                    , page: false
                    , height: 500
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                };
            }
            //初始化抄送列表
            function set_InitGrid_copy() {
                option_copy = {
                    elem: '#mainTable_copy'
                    , page: false
                    , height: 500
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                };
            }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
                    type: "GET",
                    async: false,
                    data: {  "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            //我接收的
                            option_receive = {
                                elem: '#mainTable_receive'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_receive);
                            ins = table.render(option_receive);
                            //我发送的
                            option_send = {
                                elem: '#mainTable_send'
                                , toolbar: '#toolbarDemo1'
                                , cols: [col]
                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery1
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_send);
                            //抄送我的
                            option_copy = {
                                elem: '#mainTable_copy'
                                , toolbar: '#toolbarDemo2'
                                , cols: [col]
                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery2
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_copy);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var data = option_receive.data
                data.forEach((item) => {
                    // å¦‚果某个字段的值太长,需要去除换行符
                    if (item.任务描述.length > 0) {  // å‡è®¾å­—段名为field
                        item.任务描述 = item.任务描述.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                    }
                });
                table.exportFile(ins.config.id, data, "xls");
            }
            //#endregion
            //下推异常反馈接收单
            function XTReception() {
                var checkStatus = table.checkStatus('mainTable_receive')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈签到单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackReceiveBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }
            //下推异常反馈处理单
            function XTReceive() {
                var checkStatus = table.checkStatus('mainTable_receive')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈接收单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }
            //下推异常反馈签到单
            function XTSign() {
                var checkStatus = table.checkStatus('mainTable_receive')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈签到单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }
            //下推异常反馈验收单
            function XTCheck() {
                var checkStatus = table.checkStatus('mainTable_send')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈验收单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }
            //#region æŸ¥çœ‹
            function View() {
                var activeTab = getActiveTab();
                if (activeTab == "我接收的") {
                    var checkStatus = table.checkStatus('mainTable_receive')
                        , data = checkStatus.data;
                } else if (activeTab == "我发送的") {
                    var checkStatus = table.checkStatus('mainTable_send')
                        , data = checkStatus.data;
                } else if (activeTab == "抄送我的") {
                    var checkStatus = table.checkStatus('mainTable_copy')
                        , data = checkStatus.data;
                }
                var HInterID = data[0].HInterID.toString();
                var HEntryID = data[0].HEntryID.toString();
                if (data.length == 1) {
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '异常反馈单查看'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/Sc_Reply_MESExecptFeedBackBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
                else {
                    layer.msg('无法查看!');
                }
            }
            //#endregion
            // èŽ·å–æ ‡ç­¾
            function getActiveTab() {
                var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
                var activeTab;
                for (var i = 0; i < tabs.length; i++) {
                    if (tabs[i].classList.contains("layui-this")) {
                        activeTab = tabs[i].innerText;
                        break;
                    }
                }
                return activeTab;
            }
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformanceFirstPass.html
@@ -39,7 +39,7 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <div class="layui-inline" style="display:none">
                                    <label class="layui-form-label">车间</label>
                                    <div class="layui-input-block" style="width: 190px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
@@ -90,90 +90,7 @@
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                                </div>
                            </div>
                        </div>
                        <div>
@@ -410,81 +327,6 @@
                var HMaterName = $("#HMaterName").val();//物料名称
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                
                sWhere = {
                    HYear: HYear
@@ -511,16 +353,7 @@
                $("#HBatchWork").val("");
                $("#HDivisionName").val("");
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#btnSearch").click();
                form.render('select');
                sWhere = "";
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformancePass.html
@@ -39,7 +39,7 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <div class="layui-inline" style="display:none">
                                    <label class="layui-form-label">车间</label>
                                    <div class="layui-input-block" style="width: 190px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
@@ -88,89 +88,6 @@
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -409,81 +326,6 @@
                var HBatchWork = $("#HBatchWork").val();//是否量产
                var HDivisionName = $("#HDivisionName").val();//事业部
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                sWhere = {
                    HYear: HYear
                    , HDeptName: HDeptName
@@ -509,16 +351,7 @@
                $("#HBatchWork").val("");
                $("#HDivisionName").val("");
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#btnSearch").click();
                form.render('select');
                sWhere = "";
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_TechnologyParameterClass.html
@@ -67,120 +67,36 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">设备编码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">设备</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">模具编码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" value="" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">模具</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMouldName" id="HMouldName" value="" readonly>
                                            </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">设备编码</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">设备</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">模具编码</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" value="" readonly>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">模具</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMouldName" id="HMouldName" value="" readonly>
                                        </div>
                                    </div>
                                </div>
@@ -406,80 +322,7 @@
                var HTechParamName = $("#HTechParamName").val();
                var HEquipName = $("#HEquipName").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HProcExchBillNo != "" && HProcName != "" && HTechParamName != "") {
                    sWhere = {
@@ -502,15 +345,7 @@
                $("#HEquipName").val();
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                form.render('select');
                sWhere = "";
@@ -535,6 +370,7 @@
                var HMin = [];//下限值
                var HTitle = HTitle1;//主标题
                var HTitles = HTitle2;//副标题
                if (option.data.length > 0) {   
                    for (let i = 0; i < option.data.length ; i++) {
                        H_X.push(option.data[i].工艺次序);
@@ -548,15 +384,29 @@
                        HStd.push(option.data[i].标准值);
                    }
                }
                option_ZZT = {
                    title: [{
                        text: HTitle,
                        left: 'center'
                    }, {
                        subtext: HTitles,
                const HMinNumbers = HMin.map(value => parseInt(value, 10));
                const HMaxNumbers = HMax.map(value => parseInt(value, 10));
                // è®¡ç®—最小值和最大值
                const minValue = Math.min(...HMinNumbers);
                const maxValue = Math.max(...HMaxNumbers);
                option_ZZT = {
                    title: {
                        text: HTitles,
                        left: 'center',
                        top: '5%'
                    }],
                        textStyle: {
                            color: 'black',
                            fontSize: 18, // åŠ¡å¿…è®°ä½è®¾ç½®æ–‡å­—å¤§å°åªèƒ½æ˜¯æ•°å­—
                            fontWeight: 'normal'
                        },
                        subtext: HTitle,
                        subtextStyle: {
                            color: 'black',
                            fontSize: 18,
                            fontWeight: 'normal'
                        }
                    },
                    tooltip: {
                        trigger: 'axis'
                    },
@@ -588,9 +438,9 @@
                    yAxis: [
                        {
                            type: 'value',
                            min: parseInt($("#HMin").val(), 10) - 10, // è®¾ç½®æœ€å°å€¼
                            max: parseInt($("#HMax").val(), 10) + 10, // è®¾ç½®æœ€å¤§å€¼
                            interval: Math.floor(((parseInt($("#HMax").val(), 10) + 10) - (parseInt($("#HMin").val(), 10) - 10))/10) // è®¾ç½®é—´è·
                            min: minValue - 10, // è®¾ç½®æœ€å°å€¼
                            max: maxValue + 10, // è®¾ç½®æœ€å¤§å€¼
                            interval: Math.floor(((maxValue + 10) - (minValue - 10)) / 10) // è®¾ç½®é—´è·
                        }
                    ],
                    series: [
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/Sc_StationOutBil_HProc.html
@@ -346,20 +346,36 @@
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            if ($("#HMaterName").val() != "" && $("#HProcName").val() != "") {
                                //动态显示列名
                                option = {
                                    elem: '#mainTable'
                                    , toolbar: '#toolbarDemo'
                                    , cols: [col]
                                    , data: data1.data
                                    , height: 'full-80'
                                    , page: true
                                    , limits: [50, 500, 5000, 50000]
                                    , limit: 50
                                    , cellMinWidth: 90
                                }
                                ins = table.render(option);
                            } else {
                                //动态显示列名
                                option = {
                                    elem: '#mainTable'
                                    , toolbar: '#toolbarDemo'
                                    , cols: [col]
                                    , data: []
                                    , height: 'full-80'
                                    , page: true
                                    , limits: [50, 500, 5000, 50000]
                                    , limit: 50
                                    , cellMinWidth: 90
                                }
                                ins = table.render(option);
                            }
                            ins = table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Sc_StationOutBil_HProc";