分析方法、检验方法、上限值、下限值、测量值

llj

2025-12-05 7436dccd501515b46d37b802696cad0c1b3bd54e

分析方法、检验方法、上限值、下限值、测量值

 WebTM/WebTM.csproj.user

@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,13 +5,13 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
   /*  var WEBURL = "http://localhost:8082/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://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //余思杰本地配置
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置*/
     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill_XW.html

@@ -340,6 +340,15 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <!--行下拉选择(分析方法)-->
    <script type="text/html" id="HAnalysisMethod">
        <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
            <option value="">请选择</option>
            <option value="1">定性分析</option>
            <option value="2">定量分析</option>
            <option value="3">其他分析</option>
        </select>
    </script>
    <!--行下拉选择(检验记录1)-->
    <script type="text/html" id="HQCNote1">
        <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
@@ -387,7 +396,7 @@
            <option value="合格">合格</option>
            <option value="不合格">不合格</option>
        </select>
    </script>    
    </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>
@@ -473,7 +482,15 @@
                    , { field: '检验项目分类', title: '检验项目分类', event: "", width: 120 }
                    , { field: 'HQCCheckItemID', title: '检验项目ID', edit: 'text', hide: true }
                    , { field: 'HQCCheckItemName', title: '检验项目名称', edit: 'text', width: 230 }
                    , { field: 'HQCStd', title: '检验标准', edit: 'text', event: "", width: 95, hide: true }
                    /////////////
                    , { field: 'HAnalysisMethod', title: '分析方法', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
                    , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                    , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName'}
                    , { field: 'HQCStd', title: '检验标准', edit: 'text', event: "", width: 125, hide: true }
                    , { field: 'HInspectVal', title: '检验值', edit: 'text', width: 125, hide: true }
                    , { field: 'HUpLimit', title: '上限值', edit: 'text', width: 125, hide: true }
                    , { field: 'HDownLimit', title: '下限值', edit: 'text', width: 125, hide: true }
                    , { field: 'HTargetVal', title: '目标值', edit: 'text' }
                    , { field: 'HQCNote1', title: '08:00--10:00', width: 125, templet: '#HQCNote1' }

                    , { field: 'HQCNote2', title: '10:00--12:00', width: 125, templet: '#HQCNote2' }
@@ -498,6 +515,25 @@
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 75 }
                ]]
                , limit: 500 //每页默认显示的数量
                //, done: function (res, curr, count) {
                //    option.data = res.data;
                //    //去掉下拉框失焦事件否则在下拉框里输入值
                //    $('.layui-form-select').find('input').unbind("blur");
                //    //表格重载回显下拉框里的数据
                //    $('tr').each(function (e) {
                //        var $cr = $(this);
                //        var dataIndex = $cr.attr("data-index");
                //        $.each(option.data, function (index, value) {
                //            if (value.LAY_TNDEX == dataIndex) {
                //                $cr.find('input').val(value.HResult);
                //                $cr.find('input').val(value.HAnalysisMethod);
                //            }
                //        });
                //    });
                //}
                //, text: {
                //    none: '无数据！'
                //}
            };

            var option_BadRe = {
@@ -543,6 +579,7 @@

                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{
                    "HAnalysisMethod": 1, "HUpLimit": "", "HDownLimit": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HTargetVal": "",
                    "检验项目分类": "", "HQCCheckItemID": 0, "HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  "
                    , "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                    , "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
@@ -587,7 +624,19 @@
                            var rowdata = [];
                            var data = result.data;
                            for (let i = 0; i < result.data.length; i++) {
                                switch (data[i].分析方法) {
                                    case "定性分析":
                                        data[i].分析方法 = "1";
                                        break;
                                    case "定量分析":
                                        data[i].分析方法 = "2";
                                        break;
                                    case "其他分析":
                                        data[i].分析方法 = "3";
                                        break;
                                }
                                rowdata.push({
                                    "HAnalysisMethod": data[i].分析方法, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].HInspectMethodName, "HUpLimit": data[i].上限值, "HDownLimit": data[i].下限值, "HTargetVal": data[i].目标值,
                                    "检验项目分类": data[i].检验项目分类, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].检验项目名称,
                                    "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
                                    "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
@@ -610,6 +659,19 @@
                            option.data = rowdata;
                            table.render(option);
                            for (var i = 0; i < result.data.length; i++) {
                                switch (data[(i - 1)].分析方法) {
                                    case "定性分析":
                                        data[(i - 1)].分析方法 = "1";
                                        break;
                                    case "定量分析":
                                        data[(i - 1)].分析方法 = "2";
                                        break;
                                    case "其他分析":
                                        data[(i - 1)].分析方法 = "3";
                                        break;

                                }
                                $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].分析方法) + "']").attr("selected", true);
                                $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
                                $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
                                $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
@@ -663,6 +725,7 @@
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = {
                    "HInspectMethodID": 0, "HInspectMethodName": "", "HUpLimit": '', "HDownLimit": '', "HInspectVal": '', "HAnalysisMethod": "",
                    "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                    , "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
                };
@@ -672,6 +735,11 @@
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
                        for (var i = 1; i <= option.data.length; i++) {
/*                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                        }
                        form.render('select');
                        rows++;
                        layer.msg('增加一行按钮！')
                        break;
@@ -689,6 +757,11 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            for (var i = 1; i <= option.data.length; i++) {
 /*                               $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                            }
                            form.render('select');
                            //layer.alert(copyrow);
                        }
                        break;
@@ -971,7 +1044,53 @@
                                }
                            });
                        }
                        //if (obj.event == 'HInspectMethodName')  //
                        //{
                        //    //页面层-自定义
                        //    layer.open({
                        //        type: 2,
                        //        skin: 'layui-layer-rim', //加上边框
                        //        title: '检验方法列表',
                        //        closeBtn: 1,
                        //        shift: 2,
                        //        area: ['80%', '80%'],
                        //        maxmin: true,
                        //        content: ['../../基础资料/公用基础资料/Gy_InspectMethod.html?openType=2', 'yes'],
                        //        btn: ['确定', '取消']
                        //        , btn1: function (index, layero) {

                        //            //按钮【按钮一】的回调
                        //            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        //            if (checkStatus.data.length === 0) {
                        //                return layer.msg('请选择数据');
                        //            }
                        //            obj.update({
                        //                HInspectMethodID: checkStatus.data[0].HItemID,
                        //                HInspectMethodName: checkStatus.data[0].检验方法名称,
                        //            });
                        //            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        //        }
                        //        , btn2: function (index, layero) {
                        //            //按钮【按钮二】的回调
                        //            //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                        //        },
                        //        end: function () {
                        //            if (OptionData[0].禁用标记 != '是' || OptionData[0].审核人 != "") {
                        //                //更新表格缓存的数据
                        //                obj.update({
                        //                    "HInspectMethodID": OptionData[0].HItemID
                        //                    , "HInspectMethodName": OptionData[0].检验方法名称
                        //                })
                        //            } else {
                        //                layer.msg("该检验方法已禁用未审核，请重新选择!");
                        //            }
                        //        },
                        //        success: function (layero, index) {

                        //        }
                        //    });
                        //}
                        obj.event = "";
                        return false;

@@ -983,6 +1102,43 @@
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'HInspectMethodName') {
                    $(document).off('keydown').on('keydown', function (e) {
                        if (e.key === "F7" || e.keyCode === 118) {
                            // é˜»æ­¢é»˜è®¤è¡Œä¸º
                            e.preventDefault();

                            // æ‰“开检验方法选择窗口
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim',
                                title: '检验方法列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../基础资料/公用基础资料/Gy_InspectMethod.html?openType=2', 'yes'],
                                btn: ['确定', '取消'],
                                btn1: function (index, layero) {
                                    var iframeWindow = window['layui-layer-iframe' + index];
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }

                                    // æ›´æ–°æ•°æ®
                                    obj.update({
                                        HInspectMethodID: checkStatus.data[0].HItemID,
                                        HInspectMethodName: checkStatus.data[0].检验方法名称,
                                    });
                                    layer.close(index);
                                }
                            });

                            return false;
                        }
                    });
                }
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
@@ -1341,10 +1497,11 @@
                            $("#HQCSchemeID").val(result.data[0].hmainid);
                            $("#HQCSchemeName").val(result.data[0].检验方案名称);
                            var rowdata = [];
                            var data = result.data;                            
                            var data = result.data;
                            for (var i = 0; i < result.data.length; i++) {
                                //子表  èµ‹å€¼
                                rowdata.push({
                                    "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3),
                                    "检验项目分类": data[i]["检验项目分类"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["检验项目"],
                                    "HQCStd": "",
                                    "HQCNote1": "",
@@ -1367,11 +1524,16 @@
                                    "HQCNote7_SN": "",
                                    "HQCNote8_SN": "",
                                    "HQCNote9_SN": "",
                                    "HQCNote10_SN": ""
                                    "HQCNote10_SN": "",
                                    "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].检验方法, "HInspectVal": data[i].检测值, "HUpLimit": data[i].上限值, "HDownLimit": data[i].下限值
                                });
                            }
                            option.data = rowdata;
                            table.render(option);
                            for (let j = 0; j < data.length; j++) {
                                $("#HAnalysisMethod" + (j + 1)).val(data[j].分析方法 == "定性分析" ? 1 : (data[j].分析方法 == "定量分析" ? 2 : 3))
                            }
                            form.render('select');
                        }
                    }
                })
@@ -1785,7 +1947,7 @@
                    });
                }
            }
            

            // åŒæ­¥å­è¡¨SN码到表头
            function syncSubTableToHeader() {
                var tableData = table.cache['mainTable'];
@@ -1952,10 +2114,18 @@
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            } 
                            table.render(option);
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                            }
                        
                        } else {
                            table.render(option);
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                            }
                        
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
@@ -1973,7 +2143,17 @@
                    //}
                }
            });

            //行选择处理（是否委外）
            form.on('select(HAnalysisMethod)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HAnalysisMethod = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //行选择处理（检验记录1）
            form.on('select(HQCNote1)', function (data) {
                //获取下拉框选中的值