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

yangle

2023-08-31 8ac8944185fdba9d120d23ebb52cc5c4aa955756

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

@@ -93,15 +93,15 @@
                                                        </div>
                                                    </div>
                                                    <!--<div class="layui-inline">
            <label class="layui-form-label">主计量单位：</label>
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
                <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
                <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                </button>
            </div>
        </div>-->
                <label class="layui-form-label">主计量单位：</label>
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
                    <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                    </button>
                </div>
            </div>-->
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">克重</label>
@@ -164,11 +164,40 @@
                                                        </div>
                                                    </div>
                                                </div>


                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">首件检验方案</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HQCSchemeName_Fst" id="HQCSchemeName_Fst" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
                                                        <input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst" value="0">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">转序检验方案</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HQCSchemeName_Proc" id="HQCSchemeName_Proc" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
                                                        <input type="hidden" name="HQCSchemeID_Proc" id="HQCSchemeID_Proc" value="0">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">巡检检验方案</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HQCSchemeName_Patrol" id="HQCSchemeName_Patrol" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
                                                        <input type="hidden" name="HQCSchemeID_Patrol" id="HQCSchemeID_Patrol" value="0">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                    </div>
                                                </div>
                                            </div>

                                           
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> ç™½å¯è¦æ±‚：</label>
@@ -613,6 +642,20 @@
                $("#HStopwagesFlag").val(data.elem.checked);
            });

            //选择首件检验方案按钮
            form.on('submit(HQCSchemeID_Fst-BT)', function () {
                get_checkQCSchemeID_Fst();
            });

            //选择转序检验方案按钮
            form.on('submit(HQCSchemeID_Proc-BT)', function () {
                get_checkQCSchemeID_Proc();
            });

            //选择巡检检验方案按钮
            form.on('submit(HQCSchemeID_Patrol-BT)', function () {
                get_checkHQCSchemeID_Patrol();
            });

            //读取配置文件
            function get_ReadConfigFile() {
@@ -721,6 +764,12 @@
                                , "HWidth": data.HWidth
                                , "HWeight": data.HWeight
                                , "HColorRemark": data.染色要求
                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
                                , "HQCSchemeName_Fst": data.首件检验方案
                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
                                , "HQCSchemeName_Proc": data.转序检验方案
                                , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
                                , "HQCSchemeName_Patrol": data.巡检检验方案
                            });
                            console.log($('#HUnitGroupID').val());
                        } else {
@@ -1024,6 +1073,80 @@
                parent.layer.close(index); //再执行关闭
            });

            //#region é€‰æ‹©é¦–件检验方案方法
            function get_checkQCSchemeID_Fst() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_QCCheckProjectListView.html', '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('请选择数据');
                        }
                        $("#HQCSchemeName_Fst").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region é€‰æ‹©è½¬åºæ£€éªŒæ–¹æ¡ˆæ–¹æ³•
            function get_checkQCSchemeID_Proc() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_QCCheckProjectListView.html', '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('请选择数据');
                        }
                        $("#HQCSchemeName_Proc").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region é€‰æ‹©å·¡æ£€æ£€éªŒæ–¹æ¡ˆæ–¹æ³•
            function get_checkHQCSchemeID_Patrol() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_QCCheckProjectListView.html', '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('请选择数据');
                        }
                        $("#HQCSchemeName_Patrol").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //选择计量单位
            form.on('submit(HUnitList)', function () {//选择职务