检验方法、检验仪器、检验依据、质量标准 测试完善

yusijie

2024-05-11 8a4045b6e061f770f36845e2a0175a300c9e7a6a

检验方法、检验仪器、检验依据、质量标准  测试完善

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

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

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -145,6 +145,10 @@
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串

@@ -226,7 +230,7 @@
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Gy_InspectBasis[0];
                            var data = result.data.h_v_Gy_InspectBasis_Edit[0];
                            $("#HItemID").val(data.HItemID);//代码ID
                            $("#HNumber").val(data.检验依据代码);//代码
                            $("#HName").val(data.检验依据名称);//名称
@@ -271,6 +275,24 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }

                return true;
            }
            //#endregion
        });


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

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -144,6 +144,10 @@
            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
@@ -271,6 +275,25 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }

                return true;
            }

            //#endregion
        });


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

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -144,6 +144,10 @@
            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
@@ -271,6 +275,25 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();              

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }
             
                return true;
            }

            //#endregion
        });


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

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -144,6 +144,10 @@
            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
@@ -271,6 +275,25 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }

                return true;
            }

            //#endregion
        });


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

@@ -709,13 +709,6 @@
            var editIndex = 0;//编辑下标
            var SampleNum = [];//样本数量

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "7505";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -805,6 +798,11 @@
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
                }
@@ -819,7 +817,7 @@
            //初始化表格
            set_InitGrid();

            //根据源单id获取源单信息
            //根据源单id获取源单信息(进站接收单)
            function LoadingInformation_StationInBill() {
                var wait = layer.load();
                $.ajax({
@@ -859,6 +857,47 @@
                    }
                });
            }
            
            //根据源单id获取源单信息(工序流转卡)
            function LoadingInformation_ProcExchange() {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
                            $("#HProcExchBillNo").val(data.单据号);
                            $("#HProcExchInterID").val(data.HInterID);
                            $("#HProcExchEntryID").val(data.HProcExchEntryID);//
                            $("#HProcExchQty").val(data.流转卡数量);
                            $("#HICMOBillNo").val(data.任务单);
                            $("#HICMOInterID").val(data.HICMOInterID);
                            $("#HICMOQty").val(data.HICMOQty);//
                            $("#HSourceName").val(data.生产资源);//
                            $("#HSourceID").val(data.HSourceID);//
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterName").val(data.产品名称);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.HBillType);
                            $("#HMainSourceInterID").val(data.HInterID);
                            $("#HICMOEntryID").val(data.HICMOEntryID);//
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);//
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //根据源单id获取源单信息--生产订单
            function LoadingInformation_ICMO() {

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

@@ -198,6 +198,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>首检</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
@@ -404,6 +405,9 @@
                        break;
                    //读取方案
                    case 'set_ReadScheme': set_ReadScheme();
                        break;
                    //首检
                    case 'set_FirstPieceCheck': set_FirstPieceCheck();
                        break;
                };
            });
@@ -2499,6 +2503,34 @@
                }
            }

            //首检
            function set_FirstPieceCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '首件检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';