生产入库检验单、出厂检验单、来料检验单 孙表明细行添加定性分析文本类型字段

yusijie

2025-10-31 8f2347d441deb66bdd16f40544f2e7acbba210be

生产入库检验单、出厂检验单、来料检验单 孙表明细行添加定性分析文本类型字段

 WebTM/WebTM.csproj

@@ -671,6 +671,7 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\制造周期报表\Sc_ProductionCycleBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_New.html" />
    <Content Include="views\生产管理\报工台工序\停工恢复单\Sc_MESStopRestoreWorkBill.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />

 WebTM/views/ÖÊÁ¿¹ÜÀí/²úÆ·Èë¿â¼ìÑéµ¥/QC_LastPieceCheckBill_v2.html

@@ -1684,7 +1684,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HInSpectValueB: checkStatus.data[0].检测值名称
                                        HInSpectValueB: checkStatus.data[0].HItemID,
                                        HInSpectValueB_Text: checkStatus.data[0].检测值名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    var DXValue = checkStatus.data[0].检测值名称; //定性检测值
@@ -2331,7 +2332,7 @@
                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {
                            rowdata_Value.push({
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                            });
                        }
                        option_Value.data = rowdata_Value;
@@ -2356,7 +2357,7 @@

            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -2378,13 +2379,13 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }

                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2458,7 +2459,7 @@
                rowdata_Value = [];
                for (let i = 1; i <= data[data.length - 1].样本量; i++) {
                    rowdata_Value.push({
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;
@@ -2498,7 +2499,7 @@
                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2869,6 +2870,7 @@
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
@@ -2920,7 +2922,7 @@

                //初始表格数据
                rowdata_Value = [{
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                }];
                option_Value = {
                    elem: '#ValueTable'
@@ -2933,7 +2935,8 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HSEQ', title: '序号' }
                        , { field: 'HInSpectResult', title: '检验结果', templet: '#HInSpectResult' }
                        , { field: 'HInSpectValueB', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValueB', title: '检测值ID（定性）', edit: 'text', hide: true }
                        , { field: 'HInSpectValueB_Text', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValue', title: '检测值（定量）', edit: 'text', totalRow: true }
                        , { field: 'HInSpectValueT', title: '检测值（其他）', edit: 'text' }
                        //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -3176,9 +3179,15 @@
                editIndex = Number(nowindex) + Number(1);
                LastIndex = nowindex;

                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                if (option_Check.length > 0) {
                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                    $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                    $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                    //显示当前双击行的检测值页签中的目标值、上限值、下限值
                    $("#HTargetVal").val(option_Check[nowindex].目标值);
                    $("#HUpLimit").val(option_Check[nowindex].上限值);
                    $("#HDownLimit").val(option_Check[nowindex].下限值);
                }

                //选中行改变颜色
                check_row(obj);
@@ -3203,7 +3212,7 @@
                    var row_value = [];
                    for (let i = 0; i < SampleNum[nowindex]; i++) {
                        row_value.push({
                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                            "HSEQ": (i + 1),  "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -3641,17 +3650,17 @@
                        HSampleQty: $("#HSampleQty").val(), //样本量
                        HInspectResultToSee: $("#HInspectResultToSee").val(), //检验结果
                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //检验结果2
                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        HUnitID: $("#HUnitID").val(), //单位ID
                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        //HUnitID: $("#HUnitID").val(), //单位ID
                        HUnitName: $("#HUnitName").val(), //单位
                        HInspectValB: $("#HInspectValB").val(), //检验值ID
                        HInspectVal: $("#HInspectVal").val(), //检验值
                        //HInspectVal: $("#HInspectVal").val(), //检验值
                        HTargetValB: $("#HTargetValB").val(), //目标值ID
                        HTargetVal: $("#HTargetVal").val(), //目标值
                        HUpLimit: $("#HUpLimit").val(), //上限值
                        HDownLimit: $("#HDownLimit").val(), //下限值
                        HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        HDownOffSet: $("#HDownOffSet").val(), //下偏差
                        //HTargetVal: $("#HTargetVal").val(), //目标值
                        //HUpLimit: $("#HUpLimit").val(), //上限值
                        //HDownLimit: $("#HDownLimit").val(), //下限值
                        //HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        //HDownOffSet: $("#HDownOffSet").val(), //下偏差
                    };

                    //获取文本框值
@@ -3908,9 +3917,9 @@
                    $("#HUnitID").val(maindata[nowindex].HUnitID);
                    $("#HUnit").val(maindata[nowindex].HUnit);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].目标值 : "") : maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].上限值 : "") : maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].下限值 : "") : maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3933,7 +3942,7 @@
                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3988,10 +3997,13 @@
                            form.render('select');
                        } else {
                            option_Value.data = [{
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                            }];
                            table.render(option_Value);
                            //layer.msg(result.code + result.Message, { icon: 5 });

                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //隐藏检测值字段
                            form.render('select');
                        }
                    }
                })
@@ -4346,9 +4358,9 @@
            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析
                    option_Value.cols[0][3].hide = false; //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][4].hide = false; //定性
                    option_Value.cols[0][5].hide = true;  //定量
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HComparator").attr("disabled", true); //比较符改为不可编辑
                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//改变上限值输入框背景颜色
@@ -4360,9 +4372,9 @@
                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//目标值按钮启用

                } else if (HAnalysisMethod_Value == 2) { //如果选中【定量分析】，则隐藏定性、其他分析
                    option_Value.cols[0][4].hide = false;  //定量
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][5].hide = false;  //定量
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //上限值改为可编辑
                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //下限值改为可编辑
@@ -4376,9 +4388,9 @@


                } else if (HAnalysisMethod_Value == 3) { //如果选中【其他分析】，则隐藏定量、定性分析
                    option_Value.cols[0][5].hide = false;  //其他
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][6].hide = false;  //其他
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //定量

                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//检验值按钮
                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//目标值按钮

 WebTM/views/ÖÊÁ¿¹ÜÀí/³ö³§¼ìÑéµ¥/QC_OutCompCheckBill.html

@@ -1697,7 +1697,15 @@
                editIndex = Number(nowindex) + Number(1);
                LastIndex = nowindex;

                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                if (option_Check.length > 0) {
                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                    $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                    $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                    //显示当前双击行的检测值页签中的目标值、上限值、下限值
                    $("#HTargetVal").val(option_Check[nowindex].目标值);
                    $("#HUpLimit").val(option_Check[nowindex].上限值);
                    $("#HDownLimit").val(option_Check[nowindex].下限值);
                }

                //选中行改变颜色
                check_row(obj);
@@ -1715,7 +1723,7 @@
                    var row_value = [];
                    for (let i = 0; i < SampleNum[nowindex]; i++) {
                        row_value.push({
                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                            "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -1960,7 +1968,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HInSpectValueB: checkStatus.data[0].检测值名称
                                        HInSpectValueB: checkStatus.data[0].HItemID,
                                        HInSpectValueB_Text: checkStatus.data[0].检测值名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    var DXValue = checkStatus.data[0].检测值名称; //定性检测值
@@ -2282,6 +2291,7 @@
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
@@ -2333,7 +2343,7 @@

                //初始表格数据
                rowdata_Value = [{
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                }];
                option_Value = {
                    elem: '#ValueTable'
@@ -2346,7 +2356,8 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HSEQ', title: '序号' }
                        , { field: 'HInSpectResult', title: '检验结果', templet: '#HInSpectResult' }
                        , { field: 'HInSpectValueB', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValueB', title: '检测值ID（定性）', edit: 'text', hide: true }
                        , { field: 'HInSpectValueB_Text', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValue', title: '检测值（定量）', edit: 'text', totalRow: true }
                        , { field: 'HInSpectValueT', title: '检测值（其他）', edit: 'text' }
                        //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -2683,17 +2694,17 @@
                        HSampleQty: $("#HSampleQty").val(), //样本量
                        HInspectResultToSee: $("#HInspectResultToSee").val(), //检验结果
                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //检验结果2
                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        HUnitID: $("#HUnitID").val(), //单位ID
                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        //HUnitID: $("#HUnitID").val(), //单位ID
                        HUnitName: $("#HUnitName").val(), //单位
                        HInspectValB: $("#HInspectValB").val(), //检验值ID
                        HInspectVal: $("#HInspectVal").val(), //检验值
                        //HInspectVal: $("#HInspectVal").val(), //检验值
                        HTargetValB: $("#HTargetValB").val(), //目标值ID
                        HTargetVal: $("#HTargetVal").val(), //目标值
                        HUpLimit: $("#HUpLimit").val(), //上限值
                        HDownLimit: $("#HDownLimit").val(), //下限值
                        HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        HDownOffSet: $("#HDownOffSet").val(), //下偏差
                        //HTargetVal: $("#HTargetVal").val(), //目标值
                        //HUpLimit: $("#HUpLimit").val(), //上限值
                        //HDownLimit: $("#HDownLimit").val(), //下限值
                        //HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        //HDownOffSet: $("#HDownOffSet").val(), //下偏差
                    };

                    //获取文本框值
@@ -2903,9 +2914,9 @@
                    $("#HUnitID").val(maindata[nowindex].HUnitID);
                    $("#HUnit").val(maindata[nowindex].HUnit);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].目标值 : "") : maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].上限值 : "") : maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].下限值 : "") : maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -2928,7 +2939,7 @@
                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -2977,7 +2988,7 @@
                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -3045,10 +3056,13 @@
                            form.render('select');
                        } else {
                            option_Value.data = [{
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                            }];
                            table.render(option_Value);
                            //layer.msg(result.code + result.Message, { icon: 5 });

                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //隐藏检测值字段
                            form.render('select');
                        }
                    }
                })
@@ -3199,7 +3213,7 @@
                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {
                            rowdata_Value.push({
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                            });
                        }
                        option_Value.data = rowdata_Value;
@@ -3772,9 +3786,9 @@
            //检验项目-页签 é€‰ç€åˆ†æžæ–¹æ³•åŽ  éšè— æ£€æµ‹å€¼é¡µç­¾çš„值
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析
                    option_Value.cols[0][3].hide = false; //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][4].hide = false; //定性
                    option_Value.cols[0][5].hide = true;  //定量
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HComparator").attr("disabled", true); //比较符改为不可编辑
                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//改变上限值输入框背景颜色
@@ -3786,9 +3800,9 @@
                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//目标值按钮启用

                } else if (HAnalysisMethod_Value == 2) { //如果选中【定量分析】，则隐藏定性、其他分析
                    option_Value.cols[0][4].hide = false;  //定量
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][5].hide = false;  //定量
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //上限值改为可编辑
                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //下限值改为可编辑
@@ -3802,9 +3816,9 @@


                } else if (HAnalysisMethod_Value == 3) { //如果选中【其他分析】，则隐藏定量、定性分析
                    option_Value.cols[0][5].hide = false;  //其他
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][6].hide = false;  //其他
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //定量

                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//检验值按钮
                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//目标值按钮
@@ -3878,7 +3892,7 @@

            //选着检验项目后,获取表体
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -3899,13 +3913,13 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }

                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -3978,7 +3992,7 @@
                rowdata_Value = [];
                for (let i = 1; i <= data[data.length - 1].样本量; i++) {
                    rowdata_Value.push({
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;

 WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/QC_Add_Edit_POStockInCheckBillList.html

@@ -1700,7 +1700,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HInSpectValueB: checkStatus.data[0].检测值名称
                                        HInSpectValueB: checkStatus.data[0].HItemID,
                                        HInSpectValueB_Text: checkStatus.data[0].检测值名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    var DXValue = checkStatus.data[0].检测值名称; //定性检测值
@@ -2347,7 +2348,7 @@
                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {
                            rowdata_Value.push({
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                            });
                        }
                        option_Value.data = rowdata_Value;
@@ -2372,7 +2373,7 @@

            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val(); 
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -2394,13 +2395,13 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }

                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2472,7 +2473,7 @@
                rowdata_Value = [];
                for (let i = 1; i <= data[data.length - 1].样本量; i++) {
                    rowdata_Value.push({
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;
@@ -2511,7 +2512,7 @@
                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2882,6 +2883,7 @@
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
@@ -2933,7 +2935,7 @@

                //初始表格数据
                rowdata_Value = [{
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                }];
                option_Value = {
                    elem: '#ValueTable'
@@ -2946,7 +2948,8 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HSEQ', title: '序号' }
                        , { field: 'HInSpectResult', title: '检验结果', templet: '#HInSpectResult' }
                        , { field: 'HInSpectValueB', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValueB', title: '检测值ID（定性）', edit: 'text', hide: true }
                        , { field: 'HInSpectValueB_Text', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValue', title: '检测值（定量）', edit: 'text', totalRow: true }
                        , { field: 'HInSpectValueT', title: '检测值（其他）', edit: 'text' }
                        //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -3189,9 +3192,15 @@
                editIndex = Number(nowindex) + Number(1);
                LastIndex = nowindex;

                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                if (option_Check.length > 0) {
                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                    $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                    $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                    //显示当前双击行的检测值页签中的目标值、上限值、下限值
                    $("#HTargetVal").val(option_Check[nowindex].目标值);
                    $("#HUpLimit").val(option_Check[nowindex].上限值);
                    $("#HDownLimit").val(option_Check[nowindex].下限值);
                }

                //选中行改变颜色
                check_row(obj);
@@ -3216,7 +3225,7 @@
                    var row_value = [];
                    for (let i = 0; i < SampleNum[nowindex]; i++) {
                        row_value.push({
                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                            "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -3654,17 +3663,17 @@
                        HSampleQty: $("#HSampleQty").val(), //样本量
                        HInspectResultToSee: $("#HInspectResultToSee").val(), //检验结果
                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //检验结果2
                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        HUnitID: $("#HUnitID").val(), //单位ID
                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        //HUnitID: $("#HUnitID").val(), //单位ID
                        HUnitName: $("#HUnitName").val(), //单位
                        HInspectValB: $("#HInspectValB").val(), //检验值ID
                        HInspectVal: $("#HInspectVal").val(), //检验值
                        //HInspectVal: $("#HInspectVal").val(), //检验值
                        HTargetValB: $("#HTargetValB").val(), //目标值ID
                        HTargetVal: $("#HTargetVal").val(), //目标值
                        HUpLimit: $("#HUpLimit").val(), //上限值
                        HDownLimit: $("#HDownLimit").val(), //下限值
                        HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        HDownOffSet: $("#HDownOffSet").val(), //下偏差
                        //HTargetVal: $("#HTargetVal").val(), //目标值
                        //HUpLimit: $("#HUpLimit").val(), //上限值
                        //HDownLimit: $("#HDownLimit").val(), //下限值
                        //HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        //HDownOffSet: $("#HDownOffSet").val(), //下偏差
                    };

                    //获取文本框值
@@ -3921,9 +3930,9 @@
                    $("#HUnitID").val(maindata[nowindex].HUnitID);
                    $("#HUnit").val(maindata[nowindex].HUnit);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].目标值 : "") : maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].上限值 : "") : maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].下限值 : "") : maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3946,7 +3955,7 @@
                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -4001,10 +4010,13 @@
                            form.render('select');
                        } else {
                            option_Value.data = [{
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                            }];
                            table.render(option_Value);
                            //layer.msg(result.code + result.Message, { icon: 5 });

                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //隐藏检测值字段
                            form.render('select');
                        }
                    }
                })
@@ -4359,9 +4371,9 @@
            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析
                    option_Value.cols[0][3].hide = false; //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][4].hide = false; //定性
                    option_Value.cols[0][5].hide = true;  //定量
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HComparator").attr("disabled", true); //比较符改为不可编辑
                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//改变上限值输入框背景颜色
@@ -4373,9 +4385,9 @@
                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//目标值按钮启用

                } else if (HAnalysisMethod_Value == 2) { //如果选中【定量分析】，则隐藏定性、其他分析
                    option_Value.cols[0][4].hide = false;  //定量
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][5].hide = false;  //定量
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //上限值改为可编辑
                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //下限值改为可编辑
@@ -4389,9 +4401,9 @@


                } else if (HAnalysisMethod_Value == 3) { //如果选中【其他分析】，则隐藏定量、定性分析
                    option_Value.cols[0][5].hide = false;  //其他
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][6].hide = false;  //其他
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //定量

                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//检验值按钮
                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//目标值按钮