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

chenhaozhe

2026-03-06 750299e7d8bddb7db6fbabc1a8cb7dcdc768e353

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html

@@ -55,10 +55,13 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;" id="BT_HProName">当前工序</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HProName">当前工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" lay-verify="HProcID" name="HProcID" id="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -389,6 +392,11 @@
            btnHBadReason();
        });

        //选着工序
        form.on('submit(btnHProc)', function () {
            btnHProc();
        });

        //选择质检员
        form.on('submit(btnHEmp)', function () {
            btnHEmp();
@@ -513,26 +521,18 @@
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            data: { "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);

                                    var numHProcess = 0;
                                    for (var i = 0; i < data1.data.length; i++) {
                                        if (data1.data[i]["HProcID"] == $("#HProcID").val()) {
                                            numHProcess = data1.data[i]["HProcExchEntryID"];
                                            break;
                                        }
                                    }

                                    $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                                    $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                                    $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                                    $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                                    $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                                    $("#HProcExchEntryID").val(numHProcess);
                                    $("#HProcExchEntryID").val(data1.data[i]["HProcExchEntryID"]);
                                    $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                                    $("#HMaterID").val(data1.data[0]["HMaterID"]);
                                    $("#HMaterName").val(data1.data[0]["物料名称"]);
@@ -562,9 +562,7 @@
                    layer.close(indexs);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });

          
            });          
        }

         //不良原因选择页面
@@ -593,6 +591,30 @@
            })
        }

        //工序选择页面
        function btnHProc() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '工序列表'//标题
                , shift: 2//弹出动画
                , content: ['../../基础资料/生产基础资料/Gy_Process.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('请选择数据');
                    }
                    //获取数据
                    $("#HProName").val(checkStatus.data[0].工序名称);
                    $("#HProcID").val(checkStatus.data[0].HItemID);
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
            })
        }

         //质检员选择页面
        function btnHEmp() {
            layer.open({