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

yusijie

2024-04-12 7f7179d00825d06ec064f8bbbccdf406424a4609

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html

@@ -206,6 +206,18 @@
                                                                    </div>
                                                                </div>
                                                            </div>
                                                            <div class="layui-inline">
                                                                <label class="layui-form-label">检验员</label>
                                                                <div class="layui-input-inline">
                                                                    <div class="layui-input-inline">
                                                                        <input type="text" name="HCheckEmpName" id="HCheckEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                        <input type="text" name="HCheckEmpID" id="HCheckEmpID" value="0" hidden>
                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHCheckEmp" style="width:40px;">
                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                        </button>
                                                                    </div>
                                                                </div>
                                                            </div>
                                                        </div>
                                                        <div class="layui-form-item">
                                                            <div class="layui-inline">
@@ -437,6 +449,11 @@
            //表头信息  ç”Ÿäº§èµ„源
            form.on('submit(btnHSource)', function () {
                btnHSource();
            });

            //表头信息  æ£€éªŒå‘˜
            form.on('submit(btnHCheckEmp)', function () {
                btnHCheckEmp();
            });


@@ -852,6 +869,35 @@
                    }
                });
            }

            //检验员列表
            function btnHCheckEmp() {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '检验员列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/基础资料/公用基础资料/Gy_EmployeeList.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('请选择数据');
                        }

                        $("#HCheckEmpName").val(checkStatus.data[0].职员名称);
                        $("#HCheckEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            }
            
            //编辑获取表头信息
            function set_EditFromGrid(linterid)
@@ -898,6 +944,8 @@
                                , "HGroupName": data.班组
                                , "HSourceID": data.HSourceID
                                , "HSourceName": data.生产资源
                                , "HCheckEmpID": data.HCheckEmpID
                                , "HCheckEmpName": data.检验员
                            });

                        } else {