1

zrg

2025-06-29 3418c99bff77b033764fb77226976afae16e18a2

1

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

@@ -16,6 +16,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>

    <style>
        .layui-form-item .layui-inline {
@@ -856,7 +857,9 @@
            </div>
        </div>
    </div>

    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script>
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
@@ -880,6 +883,8 @@
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            var option = [];
            var HModName = "Gy_Employee_Add_Edit"
            //#endregion


@@ -900,6 +905,8 @@
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                $("#HItemID").val(0);

                btnAddLine({ HEmpID: $('#HItemID').val(), HEmpName: $("#HName").val(), HPostID: 0, HPostName: "" })
                // ç›‘听按钮点击事件，触发文件输入框的点击事件
                document.getElementById('testList').addEventListener('click', function () {
                    // è§¦å‘文件输入框的点击事件
@@ -925,14 +932,14 @@
                });

                $("#HAge").val(0);
                $("#HGradDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HInComDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HInsuranceDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HContractEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HContractBDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HGradDate").val(Format("9999-13-01", "yyyy-MM-dd"));
                $("#HInComDate").val(Format("9999-13-01", "yyyy-MM-dd"));
                $("#HInsuranceDate").val(Format("9999-13-01", "yyyy-MM-dd"));
                $("#HContractEDate").val(Format("9999-13-01", "yyyy-MM-dd"));
                $("#HContractBDate").val(Format("9999-13-01", "yyyy-MM-dd"));
                $("#HContractYear").val(0);
                $("#HDimissionDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HStayCardEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HDimissionDate").val(Format("9999-13-01", "yyyy-MM-dd"));
                $("#HStayCardEDate").val(Format("9999-13-01", "yyyy-MM-dd"));
            } else if (OperationType == 2) {//复制
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
@@ -972,9 +979,10 @@
            //头工具栏
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                    , data = checkStatus.data;
                var AddRow = table.cache['mainTable'];
                var NewRow = { HEmpID: $('#HItemID').val(), HEmpName: $("#HName").val(), HPostID: 0, HPostName: "" };
                debugger
                var NewRow = { HEmpID: $('#HItemID').val(), HEmpName: $("#HName").val(), HPostID: 0, HPostName: "", HRemark: "" };
                console.log(NewRow);
                switch (obj.event) {
                    //新增一行
@@ -1064,6 +1072,13 @@
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });

            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });
            //#endregion
            //#endregion

            //审核
@@ -1412,6 +1427,7 @@
                                , "HStopflag": data.禁用标记
                                , "HRemark": data.备注
                            });
                            RoadBillSub(linterid)
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -1435,6 +1451,53 @@
                if (day.length < 2) day = '0' + day;

                return [year, month, day].join('-');
            }

            //增加一行
            function btnAddLine(NewRow) {
                debugger
                table.cache["mainTable"].push(NewRow);
                option.data = table.cache["mainTable"];
                table.render(option);
                //rows++;
                // layer.msg('增加一行按钮！')
            }
            //复制一行
            function btnCopyLine(data) {
                var copydata = JSON.stringify(data);
                if (data.length <= 0) {
                    layer.msg("请选择需要复制的一行！");
                }
                else if (data.length > 1) {
                    layer.msg("只能选择复制一行！");
                }
                else {
                    var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                    var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                    table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    table.render(option);//将数据渲染到表格上
                }
            }
            // è¡¨æ ¼è¡Œå†…事件删除
            function set_GridDelete(obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            //obj.del();
                            //layer.close(index);
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1);
                            table.reload('mainTable', { data: oldData });
                            layer.close(index);
                        }
                    });
                }
            }

            //#region ä¿å­˜æ–¹æ³•
@@ -1627,11 +1690,12 @@
                //    layer.msg("请输入职员名称！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Employee/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ";" + sSubStr },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -1661,6 +1725,30 @@
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存后加载数据时保存按钮禁用
            }
            //#endregion

            function RoadBillSub(linterid) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Gy_Employee/listSub",
                    type: "GET",
                    data: {
                        sWhere: " and HEmpID = " + linterid,
                        user: sessionStorage["HUserName"]
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            option.data = result.data;
                            table.render(option);
                        }

                        DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
                        layer.close(ajaxLoad);
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                })
            }

            function AllowLoadData(sSubStr) {
                var Result = true;
@@ -1705,13 +1793,13 @@
                    , totalRow: true
                    , cols: [[ //子表
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'HItemID', title: '岗位信息ID', width: 100, hide: true}
                        , { type: 'HEmpID', title: 'HEmpID', width: 100} // èŒå‘˜å†…码
                        , { type: 'HEmpName', title: '职员名称', width: 100} // èŒå‘˜å†…码
                        , { type: 'HPostID', title: 'HPostID', width: 100} // èŒå‘˜å†…码
                        , { type: 'HPostName', title: '岗位名称', width: 100} // èŒå‘˜å†…码
                        , { field: 'HItemID', title: '岗位信息ID', width: 100, hide: true }
                        , { field: 'HEmpID', title: 'HEmpID', hide: true, width: 100 } // èŒå‘˜å†…码
                        , { field: 'HEmpName', title: '职员名称', width: 100 } // èŒå‘˜å†…码
                        , { field: 'HPostID', title: 'HPostID', hide: true, width: 100 } // èŒå‘˜å†…码
                        , { field: 'HPostName', title: '岗位名称', edit: true, width: 100, event: "HPostNameSelect" } // èŒå‘˜å†…码
                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                        , { title: '操作', toolbar: '#barDemo', width: 70 }
                    ]]
                }

@@ -1825,6 +1913,53 @@
            }
            //#endregion

            //行内快捷键筛选
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == 'HPostNameSelect') {
                            layer.open({
                                type: 2//弹窗类型
                                , skin: 'layui-layer-rim' //加上边框
                                , area: ['90%', '90%']//大小
                                , title: '岗位列表'//标题
                                , shift: 2//弹出动画
                                , content: ['../../../views/基础资料/生产基础资料/Gy_Post.html?Type=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('请选择数据');
                                    }
                                    let data = checkStatus.data[0]
                                    obj.update({
                                        HPostID: data["HItemID"],
                                        HPostName: data["岗位名称"]
                                    })
                                    table.render(option);
                                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) { }
                            })

                        }
                    }
                })
            }

            $("#HName").on("blur", function () {
                let val = $(this).val()
                let data = table.cache['mainTable'];
                for (let dOne of data) {
                    dOne["HEmpName"] = val;
                }

                table.reload("mainTable", {
                    data: data
                })
            })

            //#endregion
        });


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

@@ -1,12 +1,13 @@

<!DOCTYPE html>
<!DOCTYPE html>
<html>

<head>
    <meta charset="utf-8" />
    <title>新增/编辑PNL布局</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <meta name="viewport"
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -24,10 +25,11 @@
            background: #eeeeee;
            border-radius: 5px;
            /*zoom: 1.10;*/
            box-shadow: rgba(0,0,0,0.4) 3px 3px;
            box-shadow: rgba(0, 0, 0, 0.4) 3px 3px;
        }
    </style>
</head>

<body>

    <div id="layout1" class="layui-fluid">
@@ -37,8 +39,12 @@
                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Checker">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
                                    lay-filter="Exit">退出</button>
                            </div>
                        </div>
                        <div class="layui-form-item" style="padding-top: 10px;">
@@ -54,14 +60,16 @@
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PNL布局: </label>
                                                        <label class="layui-form-label"
                                                            style="width: 85px;padding: 9px 18px;">PNL布局: </label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" lay-verify="HLayOutName" name="HLayOutName"
                                                                   id="HLayOutName"
                                                                   style="background-color:#efefef4d;display: inline-block;">
                                                            <input type="hidden" class="layui-input" lay-verify="HInterID" name="HInterID"
                                                                   id="HInterID"
                                                                   style="background-color:#efefef4d;display: inline-block;">
                                                            <input type="text" class="layui-input"
                                                                lay-verify="HLayOutName" name="HLayOutName"
                                                                id="HLayOutName"
                                                                style="background-color:#efefef4d;display: inline-block;">
                                                            <input type="hidden" class="layui-input"
                                                                lay-verify="HInterID" name="HInterID" id="HInterID"
                                                                style="background-color:#efefef4d;display: inline-block;">
                                                            <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                                                    lay-filter="HLayoutList" id="HLayoutList"
                                                                    style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -71,15 +79,17 @@
                                                    </div>

                                                    <div class="layui-inline">
                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PCS图标: </label>
                                                        <label class="layui-form-label"
                                                            style="width: 85px;padding: 9px 18px;">PCS图标: </label>
                                                        <div class="layui-input-block" style="margin-left: 77px;">
                                                            <input type="text" class="layui-input" lay-verify="HIcon" name="HIcon"
                                                                   id="HIcon"
                                                                   style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                                                    lay-filter="HIconFile" id="HIconFile"
                                                                    style="padding: 0 10px;float: right;margin-right: 3px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                            <input type="text" class="layui-input" lay-verify="HIcon"
                                                                name="HIcon" id="HIcon"
                                                                style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                            <button class="layui-btn layuiadmin-btn-order" type="button"
                                                                lay-submit="" lay-filter="HIconFile" id="HIconFile"
                                                                style="padding: 0 10px;float: right;margin-right: 3px;">
                                                                <i
                                                                    class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                            </button>
                                                        </div>
                                                    </div>
@@ -88,7 +98,7 @@
                                                        <label class="layui-form-label">行数:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HRowCount" id="HRowCount"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                        </div>
                                                    </div>

@@ -96,23 +106,23 @@
                                                        <label class="layui-form-label">列数:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HColCount" id="HColCount"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                        </div>
                                                    </div>

                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">PNL二维码烧蚀x坐标:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPNLPosition_x" id="HPNLPosition_x"
                                                                   class="layui-input">
                                                            <input type="number" name="HPNLPosition_x"
                                                                id="HPNLPosition_x" class="layui-input">
                                                        </div>
                                                    </div>

                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">PNL二维码烧蚀y坐标:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPNLPosition_y" id="HPNLPosition_y"
                                                                   class="layui-input">
                                                            <input type="number" name="HPNLPosition_y"
                                                                id="HPNLPosition_y" class="layui-input">
                                                        </div>
                                                    </div>

@@ -127,7 +137,30 @@
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">创建人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                                                        <input type="text" class="layui-input" name="HMaker" id="HMaker"
                                                            style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">修改人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HModifyMan"
                                                            id="HModifyMan" style="background-color:#efefef4d;"
                                                            readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">审核人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HCheckMan"
                                                            id="HCheckMan" style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">禁用人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HStopMan"
                                                            id="HStopMan" style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                            </div>
@@ -135,7 +168,31 @@
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">创建日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                        <input type="text" class="layui-input" name="HMakeDate"
                                                            id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HModifyDate"
                                                            id="HModifyDate" style="background-color:#efefef4d;"
                                                            readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HCheckDate"
                                                            id="HCheckDate" style="background-color:#efefef4d;"
                                                            readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">禁用日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HStopDate"
                                                            id="HStopDate" style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                            </div>
@@ -219,7 +276,7 @@
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
                

            }
            else if (OperationType == 2) {//复制
                set_AddFNew();
@@ -284,12 +341,41 @@
                set_GridDelete(obj);   //行内删除
            });

            // å®¡æ ¸ 
            form.on("submit(Checker)", function () {
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_PNLInfoController/CheckBill", //方法所在页面和方法名
                    data: { "HInterID": linterid, "IsAudit": 0, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true)
                                $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true)
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面

                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            })

            //保存
            form.on('submit(Saver)', function (data) {//保存
                //var isEndCheck = document.getElementById("HStopflag").checked;
                //isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainStr = JSON.stringify(data.field) + ";" + sSubStr + ';'+ sessionStorage["HUserName"]
                var sMainStr = JSON.stringify(data.field) + ";" + sSubStr + ';' + sessionStorage["HUserName"]
                let url = GetWEBURL()
                if (OperationType == 3) {
                    url += "/Gy_PNLInfoController/EditBill"
@@ -311,7 +397,7 @@
                                //set_EditForm(linterid)
                                //关闭页签
                                //Pub_Close(1);
                                

                            }
                            else {
                                f_alert(data.Message);
@@ -395,7 +481,6 @@

            //监听提交
            form.verify({
                // TODO: åˆ¤æ–­ æ¡ç ç¼–号的输入是否符合标准
                numberOrEmpty: function (value, item) {
                    // if (value != '') {
                    if (!/^\d+$/.test(value)) {
@@ -436,11 +521,11 @@
                    , { templet: '#xuhao', field: "序号", title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HInterID', title: '主表ID', hide: true, width: 100 }
                    , { field: 'HEntryID', title: '子表ID', hide: true, width: 100 }
                    , { field: 'HLayOutName', title: 'PNL布局名称', width: 100, event: 'onHLayoutNameKeyDownHandler'}
                    , { field: 'HLayOutName', title: 'PNL布局名称', width: 100, event: 'onHLayoutNameKeyDownHandler' }
                    , { field: 'HSetNo', title: 'set号', width: 100, edit: 'text' }
                    , { field: 'HPCSNo', title: 'PCS号', width: 100, edit: 'text' }
                    , { field: 'HPosition_x', title: 'PCS行索引', width: 100, totalRow: true, edit: 'text' }
                    , { field: 'HPosition_y', title: 'PCS列索引', width: 100, totalRow: true, edit: 'text'  }
                    , { field: 'HPosition_y', title: 'PCS列索引', width: 100, totalRow: true, edit: 'text' }
                    , { field: 'HSetPosition_x', title: 'Set二维码烧蚀x坐标', width: 120 }
                    , { field: 'HSetPosition_y', title: 'Set二维码烧蚀y坐标', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -542,10 +627,19 @@
                            $("#HPNLPosition_y").val(Number(data['PNL二维码烧蚀y坐标']))
                            $("#HMaker").val(data['创建人'])
                            $("#HMakeDate").val(isEmpty(data['创建时间']) === true ? "" : util.toDateString(data['创建时间'], 'yyyy-MM-dd HH:mm:ss'))

                            $("#HModifyMan").val(data['修改人'])
                            $("#HModifyDate").val(isEmpty(data['修改时间']) === true ? "" : util.toDateString(data['修改时间'], 'yyyy-MM-dd HH:mm:ss'))
                            $("#HCheckMan").val(data['审核人'])
                            $("#HCheckDate").val(isEmpty(data['审核时间']) === true ? "" : util.toDateString(data['审核时间'], 'yyyy-MM-dd HH:mm:ss'))
                            $("#HStopMan").val(data['禁用人'])
                            $("#HStopDate").val(isEmpty(data['禁用时间']) === true ? "" : util.toDateString(data['禁用时间'], 'yyyy-MM-dd HH:mm:ss'))
                            layui.form.render();//实时渲染选中和不选中的样式
                            layer.close(load)

                            if(isEmpty(data['审核人']) !== true) {
                                $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
                            }else {
                                $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            layer.close(load)
@@ -573,9 +667,9 @@
                            if (isEmpty(oldData[obj.tr.data('index')].HEntryID) === false, true, true) {
                                delEntryIDList.push(oldData[obj.tr.data('index')].HEntryID) // ä¿å­˜åˆ é™¤è¡Œ HEntryID(非空，非0)
                            }
                            

                            oldData.splice(obj.tr.data('index'), 1);
                           

                            table.reload('mainTable', { data: oldData });
                            layer.close(index);
                        }
@@ -650,7 +744,13 @@
        }
        //#endregion

        
        document.addEventListener('DOMContentLoaded', function () {
            $("#check-btn").addClass("layui-btn-disabled").attr('disabled', true)
        });



    </script>
</body>

</html>

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

@@ -37,7 +37,7 @@
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                            lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
@@ -45,38 +45,38 @@
                                    <label class="layui-form-label" style="width: 85px;">开始日期</label>
                                    <div class="layui-input-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
                                               id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                               placeholder="yyyy-MM-dd">
                                            id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                            placeholder="yyyy-MM-dd">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">结束日期</label>
                                    <div class="layui-input-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
                                               id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                               placeholder="yyyy-MM-dd">
                                            id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                            placeholder="yyyy-MM-dd">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 8rem;">PNL布局名称:</label>
                                    <div class="layui-input-inline">
                                        <input class="layui-input ForFilteringSchemes" name="HBarCode"
                                               lay-verify="HLayOutName" id="HLayOutName" autocomplete="off">
                                            lay-verify="HLayOutName" id="HLayOutName" autocomplete="off">

                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                        lay-filter="btnSearch" id="btnSearch">
                                    lay-filter="btnSearch" id="btnSearch">
                                    æŸ¥è¯¢
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                        lay-filter="btnReSearch" id="btnReSearch">
                                    lay-filter="btnReSearch" id="btnReSearch">
                                    é‡ç½®
                                </button>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
                                         id="HFilterScheme_Now"></div>
                                        id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
@@ -84,13 +84,13 @@
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes"
                                                        lay-filter="ColName" style="width:190px;">
                                                    lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
                                                    lay-filter="Comparator" style="width:190px;">
                                                lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
@@ -110,7 +110,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                   name="ColContent" id="ColContent">
                                                name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
@@ -118,23 +118,21 @@
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1"
                                                        class="ForFilteringSchemes" style="width:190px;">
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <=
                                                </option>
                                                    <= </option>
                                                <option value="<">
                                                    <
                                                </option>
                                                    < </option>
                                                <option value="<>">
                                                    <>
                                                </option>
@@ -146,7 +144,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                   name="ColContent1" id="ColContent1">
                                                name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
@@ -154,23 +152,21 @@
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2"
                                                        class="ForFilteringSchemes" style="width:190px;">
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <=
                                                </option>
                                                    <= </option>
                                                <option value="<">
                                                    <
                                                </option>
                                                    < </option>
                                                <option value="<>">
                                                    <>
                                                </option>
@@ -182,7 +178,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                   name="ColContent2" id="ColContent2">
                                                name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -203,12 +199,14 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_StopBill" id="set_StopBill"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonStop" id="set_AbandonStop"><i class="layui-icon layui-icon-circle"></i>反禁用</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>-->
                                <!-- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button> -->
                                <!-- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button> -->
                                <!-- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button> -->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></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>
@@ -249,7 +247,7 @@
        var sWhere = "";
        var option = [];
        var titleData = ['sorderid', 'hmainid', 'HInterid'];
        

        var ins;
        var HModName = "Gy_PNLInfo";
        var HBillType = "10003";
@@ -303,11 +301,19 @@
                    break;
                //审核
                case 'set_CheckBill':
                    set_CheckBill(1);
                    set_CheckBill(0);
                    break;
                //反审核
                case 'set_AbandonCheck':
                    set_CheckBill(2);
                    set_CheckBill(1);
                    break;
                //禁用
                case 'set_StopBill':
                    set_StopBill(0);
                    break;
                //反禁用
                case 'set_AbandonStop':
                    set_StopBill(1);
                    break;
                //列设置
                case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -538,6 +544,78 @@
            });
        }

        //#region åå®¡æ ¸/审核数据
        function set_CheckBill(num) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var InterID = data[0].HInterID.toString();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_PNLInfoController/CheckBill", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsAudit": num, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            else {
                layer.msg('请选择一行数据审核！');
            }
        }
        //#endregion

        //#region åç¦ç”¨/禁用数据
        function set_StopBill(num) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var InterID = data[0].HInterID.toString();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_PNLInfoController/StopBill", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsStop": num, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            else {
                layer.msg('请选择一行数据审核！');
            }
        }
        //#endregion

        //快速过滤
        function get_FastQuery() {

@@ -725,7 +803,7 @@
                success: function (layero, index) {

                }
               ,end: function () {
                , end: function () {
                    //刷新页面,
                    get_FastQuery();
                },
@@ -757,8 +835,10 @@
        function set_DeleteBill() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length  === 1) {

            if (checkStatus.data.length === 1) {
                if (isEmpty(data[0]['审核人']) === false) {
                    return layer.alert("已审核的数据不能删除!", { icon: 5 })
                }
                //逻辑删除方法
                layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax({

 WebTM/views/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBillList.html

@@ -979,8 +979,9 @@

            //#region åŒæ­¥é’‰é’‰æ•°æ®
            form.on('submit(btnGetOAData)', function (data) {
                //清空过滤条件
                get_OAData();
                if (set_ModCheck("Pay_ErrWorkTimesRequestBill_Edit") == true) {
                    get_OAData();
                }
            });

            //重置过滤条件
@@ -1010,6 +1011,27 @@
                });
            }

            //权限判定
            function set_ModCheck(ModRightNameCheck) {
                var Permission = false;
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    async: false,
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            Permission = true;
                        } else {
                            layer.alert("当前模块没有查询权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                return Permission;
            }

            //#endregion

            //#region é‡ç½®æŒ‰é’®

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm.html

@@ -1893,15 +1893,15 @@
                        //列设置
                        DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
                        ins = table.render(option);
                        //var HinterID_S = [];
                        //for (var i = 0; i < data1.data.length; i++) {
                        //    HinterID_S.push(data1.data[i]["hmainid"]);
                        //}
                        var HinterID_S = [];
                        for (var i = 0; i < data1.data.length; i++) {
                            HinterID_S.push(data1.data[i]["hmainid"]);
                        }
                        layer.close(ajaxLoad);
                        //if (HinterID_S.length > 0) {
                        //    get_Display_1(HinterID_S);
                        //    get_Display_2(HinterID_S);
                        //}
                        if (HinterID_S.length > 0) {
                            /*get_Display_1(HinterID_S);*/
                            get_Display_2(HinterID_S);
                        }

                    } else {
                        layer.close(ajaxLoad);
@@ -3719,10 +3719,14 @@
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length != 1) {
                        if (checkStatus.data.length == 1) {
                            OptionData[0] = checkStatus.data[0];
                        } else if (checkStatus.data.length == 0) {
                            //等于0时清空生产资源
                            OptionData[0] = { "HItemID": 0, "生产资源名称": "" };
                        } else {
                            return layer.msg("请选择一条数据");
                        }
                        OptionData[0] = checkStatus.data[0];
                        layer.close(index);//关闭弹窗
                    }
                    , end: function () {

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatFormImport_SS.html

@@ -198,6 +198,7 @@
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, edit: true, hide: true });
            columns.push({ field: '物料编码', title: '物料编码', width: 150, edit: true });
            columns.push({ field: '客户订单号', title: '客户订单号', width: 200, edit: true });
            columns.push({ field: '明细行号', title: '明细行号', width: 150});
            columns.push({ field: '计划结束日期', title: '计划结束日期', width: 150, event: "HPlanEndDate", edit: true});

            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatFormImport_SS_Sec.html

@@ -204,6 +204,7 @@
            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', width: 150, hide: true });
            columns.push({ field: '客户订单号', title: '客户订单号', width: 200, edit: true });
            columns.push({ field: '物料编码', title: '物料编码', width: 150, edit: true });
            columns.push({ field: '明细行号', title: '明细行号', width: 150 });
            columns.push({ field: '小时产能', title: '小时产能', edit: 'text' });
            columns.push({ field: '优先级', title: '优先级' });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList1.html

 WebTM/views/ÖÊÁ¿¹ÜÀí/PNL¼ìÑéÐÅÏ¢/QC_CheckNote_PNL_TempEdit.html

@@ -1,12 +1,13 @@

<!DOCTYPE html>
<!DOCTYPE html>
<html>

<head>
    <meta charset="utf-8" />
    <title>新增/编辑PNL检验信息</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <meta name="viewport"
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -19,6 +20,7 @@
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/HideButton_New.js"></script>
</head>

<body>

    <div id="layout1" class="layui-fluid">
@@ -28,8 +30,12 @@
                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Checker">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
                                    lay-filter="Exit">退出</button>
                            </div>
                        </div>
                        <div class="layui-form-item" style="padding-top: 10px;">
@@ -49,9 +55,9 @@
                                                        <label class="layui-form-label">条码编号:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HBarCode" id="HBarCode"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                            <input type="hidden" name="HItemID" id="HItemID"
                                                                   class="layui-input" />
                                                                class="layui-input" />
                                                        </div>
                                                    </div>

@@ -59,7 +65,7 @@
                                                        <label class="layui-form-label">set号:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HSetNo" id="HSetNo"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                        </div>
                                                    </div>

@@ -67,7 +73,7 @@
                                                        <label class="layui-form-label">PCS号:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HPCSNo" id="HPCSNo"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                        </div>
                                                    </div>

@@ -75,7 +81,7 @@
                                                        <label class="layui-form-label">PCS行索引:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPosition_x" id="HPosition_x"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                        </div>
                                                    </div>

@@ -83,7 +89,7 @@
                                                        <label class="layui-form-label">PCS列索引:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPosition_y" id="HPosition_y"
                                                                   class="layui-input">
                                                                class="layui-input">
                                                        </div>
                                                    </div>

@@ -91,8 +97,10 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">检验工序:</label>
                                                        <div class="layui-input-inline">
                                                            <select name="HCheckProc" lay-filter="HCheckProc" id="HCheckProc">
                                                                <option value="炬森VRS内层" selected="selected">炬森VRS内层</option>
                                                            <select name="HCheckProc" lay-filter="HCheckProc"
                                                                id="HCheckProc">
                                                                <option value="炬森VRS内层" selected="selected">炬森VRS内层
                                                                </option>
                                                                <option value="炬森VRS外层">炬森VRS外层</option>
                                                                <option value="AVI">AVI</option>
                                                                <option value="电测">电测</option>
@@ -103,8 +111,10 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">正反面:</label>
                                                        <div class="layui-input-inline">
                                                            <select name="HPageIndex" lay-filter="HPageIndex" id="HPageIndex">
                                                                <option value="正面" data-value="1" selected="selected">正面</option>
                                                            <select name="HPageIndex" lay-filter="HPageIndex"
                                                                id="HPageIndex">
                                                                <option value="正面" data-value="1" selected="selected">正面
                                                                </option>
                                                                <option value="反面" data-value="0">反面</option>
                                                            </select>
                                                        </div>
@@ -115,7 +125,8 @@
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">不良原因:</label>
                                                            <div class="layui-input-inline">
                                                                <textarea name="HPNLPosition_y" id="HPNLPosition_y"  class="layui-textarea"></textarea>
                                                                <textarea name="HPNLPosition_y" id="HPNLPosition_y"
                                                                    class="layui-textarea"></textarea>
                                                            </div>
                                                        </div>
                                                    </div>
@@ -130,7 +141,23 @@
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">创建人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                                                        <input type="text" class="layui-input" name="HMaker" id="HMaker"
                                                            style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">修改人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HModifyMan"
                                                            id="HModifyMan" style="background-color:#efefef4d;"
                                                            readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">审核人</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HCheckMan"
                                                            id="HCheckMan" style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                            </div>
@@ -138,7 +165,24 @@
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">创建日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                        <input type="text" class="layui-input" name="HMakeDate"
                                                            id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HModifyDate"
                                                            id="HModifyDate" style="background-color:#efefef4d;"
                                                            readonly>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HCheckDate"
                                                            id="HCheckDate" style="background-color:#efefef4d;"
                                                            readonly>
                                                    </div>
                                                </div>
                                            </div>
@@ -198,7 +242,7 @@
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
                

            }
            else if (OperationType == 2) {//复制
                set_AddFNew();
@@ -221,7 +265,7 @@
                //var isEndCheck = document.getElementById("HStopflag").checked;
                //isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
                data.field['HPageIndex'] = $("#HPageIndex option:selected").data('value');
/*                data.field['HCheckProc'] = $("#HCheckProc option:selected").data('value');*/
                /*                data.field['HCheckProc'] = $("#HCheckProc option:selected").data('value');*/
                var sMainStr = JSON.stringify(data.field) + ';' + sessionStorage["HUserName"]

                debugger
@@ -245,7 +289,7 @@
                                //set_EditForm(linterid)
                                //关闭页签
                                //Pub_Close(1);
                                

                            }
                            else {
                                f_alert(data.Message);
@@ -275,6 +319,36 @@
            form.on('submit(HLayoutList)', function () {
                get_layoutPanel()
            })

            // å®¡æ ¸ 
            form.on("submit(Checker)", function () {
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/CheckBill", //方法所在页面和方法名
                    data: { "HInterID": linterid, "IsAudit": 0, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true)
                                $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true)
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面

                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            })


            //监听提交
            form.verify({
@@ -306,11 +380,12 @@
            function roadBillMain() {
                set_EditForm(linterid)
            }
            



            //编辑加载表头
            function set_EditForm(linterid) {
                let load = layer.load()
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/GetQC_CheckNote_PNL_TempList",
@@ -334,8 +409,17 @@
                            $("#HPosition_y").val(Number(data['PCS所在列的索引']))
                            $("#HMaker").val(data['创建人'])
                            $("#HMakeDate").val(isEmpty(data['创建时间']) === true ? "" : util.toDateString(data['创建时间'], 'yyyy-MM-dd HH:mm:ss'))

                            $("#HModifyMan").val(data['修改人'])
                            $("#HModifyDate").val(isEmpty(data['修改时间']) === true ? "" : util.toDateString(data['修改时间'], 'yyyy-MM-dd HH:mm:ss'))
                            $("#HCheckMan").val(data['审核人'])
                            $("#HCheckDate").val(isEmpty(data['审核时间']) === true ? "" : util.toDateString(data['审核时间'], 'yyyy-MM-dd HH:mm:ss'))
                            layui.form.render();//实时渲染选中和不选中的样式
                            layer.close(load)
                            if (isEmpty(data['审核人']) !== true) {
                                $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
                            } else {
                                $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
                            }

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
@@ -345,7 +429,7 @@
                    }
                });
            }
            

            //
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });
@@ -361,6 +445,11 @@

        }
        //#endregion

        document.addEventListener('DOMContentLoaded', function () {
            $("#check-btn").addClass("layui-btn-disabled").attr('disabled', true)
        });
    </script>
</body>

</html>

 WebTM/views/ÖÊÁ¿¹ÜÀí/PNL¼ìÑéÐÅÏ¢/QC_CheckNote_PNL_TempList.html

@@ -37,7 +37,7 @@
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                            lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
@@ -45,38 +45,38 @@
                                    <label class="layui-form-label" style="width: 85px;">开始日期</label>
                                    <div class="layui-input-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
                                               id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                               placeholder="yyyy-MM-dd">
                                            id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                            placeholder="yyyy-MM-dd">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">结束日期</label>
                                    <div class="layui-input-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
                                               id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                               placeholder="yyyy-MM-dd">
                                            id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
                                            placeholder="yyyy-MM-dd">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 8rem;">PNL条码编号:</label>
                                    <div class="layui-input-inline">
                                        <input class="layui-input ForFilteringSchemes" name="HBarCode"
                                               lay-verify="HBarCode" id="HBarCode" autocomplete="off">
                                            lay-verify="HBarCode" id="HBarCode" autocomplete="off">

                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                        lay-filter="btnSearch" id="btnSearch">
                                    lay-filter="btnSearch" id="btnSearch">
                                    æŸ¥è¯¢
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                        lay-filter="btnReSearch" id="btnReSearch">
                                    lay-filter="btnReSearch" id="btnReSearch">
                                    é‡ç½®
                                </button>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
                                         id="HFilterScheme_Now"></div>
                                        id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
@@ -84,13 +84,13 @@
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes"
                                                        lay-filter="ColName" style="width:190px;">
                                                    lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
                                                    lay-filter="Comparator" style="width:190px;">
                                                lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
@@ -110,7 +110,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                   name="ColContent" id="ColContent">
                                                name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
@@ -118,23 +118,21 @@
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1"
                                                        class="ForFilteringSchemes" style="width:190px;">
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <=
                                                </option>
                                                    <= </option>
                                                <option value="<">
                                                    <
                                                </option>
                                                    < </option>
                                                <option value="<>">
                                                    <>
                                                </option>
@@ -146,7 +144,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                   name="ColContent1" id="ColContent1">
                                                name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
@@ -154,23 +152,21 @@
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2"
                                                        class="ForFilteringSchemes" style="width:190px;">
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
                                                    class="ForFilteringSchemes" style="width:190px;">
                                                class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <=
                                                </option>
                                                    <= </option>
                                                <option value="<">
                                                    <
                                                </option>
                                                    < </option>
                                                <option value="<>">
                                                    <>
                                                </option>
@@ -182,7 +178,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                   name="ColContent2" id="ColContent2">
                                                name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -203,8 +199,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>-->
@@ -303,11 +299,11 @@
                    break;
                //审核
                case 'set_CheckBill':
                    set_CheckBill(1);
                    set_CheckBill(0);
                    break;
                //反审核
                case 'set_AbandonCheck':
                    set_CheckBill(2);
                    set_CheckBill(1);
                    break;
                //列设置
                case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -538,6 +534,42 @@
            });
        }

        //#region åå®¡æ ¸/审核数据
        function set_CheckBill(num) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var InterID = data[0].HItemID.toString();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/CheckBill", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsAudit": num, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            else {
                layer.msg('请选择一行数据审核！');
            }
        }
        //#endregion

        //快速过滤
        function get_FastQuery() {

@@ -757,8 +789,10 @@
        function set_DeleteBill() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length  === 1) {

            if (checkStatus.data.length === 1) {
                if (isEmpty(data[0]["审核人"]) !== true) {
                    return layer.alert("已被审核的数据不能被删除!", { icon: 5 })
                }
                //逻辑删除方法
                layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax({
@@ -1287,5 +1321,8 @@
            }
        });
    }

    //#endregion
  

</script>

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectTaskFeesQuery.html

@@ -159,8 +159,8 @@
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">工程类别</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HProcType"
                                                            lay-verify="HProcType" id="HProcType" disabled>
                                                        <input type="text" class="layui-input" name="HBillSubType"
                                                            lay-verify="HBillSubType" id="HBillSubType" disabled>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
@@ -1098,6 +1098,7 @@
                form.val("formData", {
                    HInterID: data["HInterID"], // éšè—å­—段
                    HProNumber: data["工程编号"], // å¯¹åº”前端name="HProNumber"
                    HBillSubType: data["工程类型"],
                    HReDate: isEmpty(data["受理日期"]) === true ? "" : util.toDateString(data["受理日期"], "yyyy-MM-dd"), // å¯¹åº”name="HReDate"
                    HPicNo: data["任务单编号"], // å¯¹åº”name="HPicNo"
                    HProName: data["工程名称"], // å¯¹åº”name="HProName"

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectTaskStepsQuery.html

@@ -168,8 +168,8 @@
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">工程类别</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HProcType"
                                                            lay-verify="HProcType" id="HProcType" disabled>
                                                        <input type="text" class="layui-input" name="HBillSubType"
                                                            lay-verify="HBillSubType" id="HBillSubType" disabled>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
@@ -952,6 +952,7 @@
                    // åŸºç¡€å­—段（键名与前端name完全一致）
                    HInterID: data.HInterID, // éšè—å­—段
                    HProNumber: data.工程编号, // å¯¹åº”前端name="HProNumber"
                    HBillSubType: data["工程类型"],
                    HReDate: isEmpty(data["受理日期"]) === true ? "" : util.toDateString(data["受理日期"], "yyyy-MM-dd"), // å¯¹åº”name="HReDate"
                    HPicNo: data.任务单编号, // å¯¹åº”name="HPicNo"
                    HProName: data.工程名称, // å¯¹åº”name="HProName"