开工单停工单完工单优化，技能考核优化

wtt

2025-05-28 2a7f42931793527ceebfbc2eb9f4b7525084f764

开工单停工单完工单优化，技能考核优化

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Sc_ProcessExchangeBillListView.html

@@ -46,7 +46,7 @@
            var params = get_UrlVars();
            var HProcID = params[params[0]]; //从参数中获取 å·¥åºid
            var HSourceID = params[params[1]]; //从参数中获取 ç”Ÿäº§èµ„源id

            var HMaterID = params[params[2]];//从参数中获取物料ID
            form.on('submit(HQuery)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
@@ -210,8 +210,14 @@
                if (Value != "") {
                    sWhere = " and å•æ®å· like '%" + Value + "%' ";
                }
                if (HProcID != '' && HSourceID != '' && HProcID != undefined && HSourceID != undefined) {
                    sWhere += ' and HProcID=' + HProcID + ' and HSourceID=' + HSourceID+''
                if (HProcID != '' && HProcID != undefined && HProcID != 0) {
                    sWhere += ' and HProcID=' + HProcID
                }
                if (HSourceID != '' && HSourceID != undefined && HSourceID != 0) {
                    sWhere += ' and HSourceID=' + HSourceID + ''
                }
                if (HMaterID != '' && HMaterID != undefined && HMaterID != 0) {
                    sWhere += ' and HMaterID=' + HMaterID
                }
                $.ajax({
                    type: "get",

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

@@ -1517,7 +1517,10 @@
                    } else if (openType2 == "SeOrder") {
                        sWhere += " and ç‰©æ–™å±žæ€§='自制' "
                    }
                    Organ(HOrgID);
                    if (typeof (HOrgID) != "undefined") {
                        Organ(HOrgID);
                    }
                    
                }
            }
            //#endregion

 WebTM/views/¹¤×ʹÜÀí/¼¼ÄÜ¿¼ºË/HR_EmployeeSkillExamBill.html

@@ -43,7 +43,7 @@
                        <h1 style="text-align: center; padding: 10px 0;"><b>人员技能考核记录单</b></h1>
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                            <li lay-id="2" style="padding:1px;">其他信息</li>
                            <li lay-id="2" style="padding:1px;">制单信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
@@ -116,6 +116,20 @@
                                            </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="HMaterName" lay-verify="HMaterName" id="HMaterName" 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="HMaterModel" lay-verify="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -125,18 +139,6 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">事业部<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 128px; width: 185px;">
@@ -151,7 +153,19 @@
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                    </div>                                  
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--其他信息-->
@@ -349,6 +363,30 @@
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            } else if (OperationType == 2) {                                  //复制
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                //初始化项目阶段表
                get_InitGrid();
                RoadBillMain(linterid);
                //生成并设置主表的内码和单据号
                createBillNo();

                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HUpdater").val();
                $("#HUpdaterDate").val();
                $("#HChecker").val();
                $("#HCheckerDate").val();
                $("#HCloseMan").val();
                $("#HCloseManDate").val();
                $("#HDeleteMan").val();
                $("#HDeleteManDate").val();
                $("#HBacker").val();
                $("#HBackerDate").val();
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
@@ -594,7 +632,7 @@
                        , { type: 'numbers', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HEmpID', title: '考试人ID', hide: true }
                        , { field: 'HEmpNumber', title: '考试人代码', edit: 'text', event: "HEmpNumber" }//f7
                        , { field: 'HEmpName', title: '考试人名称' } 
                        , { field: 'HEmpName', title: '考试人名称', style: 'background-color:#efefef4d;' }
                        , { field: 'HLowMark', title: '最低要求分数', edit: 'text' }
                        , { field: 'HMark', title: '分数', edit: 'text' }
                        , { field: 'HRemark', title: '备注', edit: 'text' }
@@ -634,7 +672,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?HType=2&HOrgName='+sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -718,7 +756,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '物料列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -729,7 +767,8 @@
                        //获取数据
                        $("#HMaterID").val(checkStatus.data[0].HItemID);//物料id
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);//物料代码

                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HMaterModel").val(checkStatus.data[0].规格型号);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -746,7 +785,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -774,7 +813,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '生产资源列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html?Type=&Type2=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -912,21 +951,23 @@
                            , "HCheckEmpName": data[0]["评定人名称"]
                            , "HMaterID": data[0]["HMaterID"]
                            , "HMaterNumber": data[0]["物料代码"]
                            , "HMaterName": data[0]["物料名称"]
                            , "HMaterModel": data[0]["规格型号"]
                            , "HProcID": data[0]["HProcID"]
                            , "HProcName": data[0]["工序名称"]
                            , "HSourceID": data[0]["HSourceID"]
                            , "HSourceName": data[0]["生产资源名称"]
                            , "HRemark": data[0]["表头备注"]
                            , "HMaker": data[0]["制单人"]
                            , "HMakeDate": data[0]["制单日期"] == null ? "" : Format(new Date(data[0]["制单日期"]), "yyyy-MM-dd")
                            , "HUpDater": data[0]["修改人"]
                            , "HUpDateDate": data[0]["修改日期"] == null ? "" : Format(new Date(data[0]["修改日期"]), "yyyy-MM-dd")
                            , "HMakerDate": data[0]["制单日期"] == null ? "" : Format(new Date(data[0]["制单日期"]), "yyyy-MM-dd")
                            , "HUpdater": data[0]["修改人"]
                            , "HUpdaterDate": data[0]["修改日期"] == null ? "" : Format(new Date(data[0]["修改日期"]), "yyyy-MM-dd")
                            , "HChecker": data[0]["审核人"]
                            , "HCheckDate": data[0]["审核日期"] == null ? "" : Format(new Date(data[0]["审核日期"]), "yyyy-MM-dd")
                            , "HCheckerDate": data[0]["审核日期"] == null ? "" : Format(new Date(data[0]["审核日期"]), "yyyy-MM-dd")
                            , "HCloseMan": data[0]["关闭人"]
                            , "HCloseDate": data[0]["关闭日期"] == null ? "" : Format(new Date(data[0]["关闭日期"]), "yyyy-MM-dd")
                            , "HCloseManDate": data[0]["关闭日期"] == null ? "" : Format(new Date(data[0]["关闭日期"]), "yyyy-MM-dd")
                            , "HDeleteMan": data[0]["作废人"]
                            , "HDeleteDate": data[0]["作废日期"] == null ? "" : Format(new Date(data[0]["作废日期"]), "yyyy-MM-dd")
                            , "HDeleteManDate": data[0]["作废日期"] == null ? "" : Format(new Date(data[0]["作废日期"]), "yyyy-MM-dd")
                        });

                        //组织的值HOrgID变化，重新渲染
@@ -1266,6 +1307,8 @@
        function GetGyMaterial(obj) {
            $("#HMaterID").val(obj.HItemID);//物料id
            $("#HMaterNumber").val(obj.物料代码);//物料名称
            $("#HMaterName").val(obj.物料名称);
            $("#HMaterModel").val(obj.规格型号);
        }
        //工序
        function GetProcessValue(obj) {

 WebTM/views/¹¤×ʹÜÀí/¼¼ÄÜ¿¼ºË/HR_EmployeeSkillExamBillList.html

@@ -15,7 +15,8 @@
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>

    <script src="../../../layuiadmin/HideButton_New.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -30,10 +31,12 @@
                                        <span>更多</span>
                                    </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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -48,6 +51,14 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>

                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -143,19 +154,22 @@
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                            </div>
@@ -183,7 +197,8 @@
            var option = [];
            var sWhere = "";
            var HModName = "HR_EmployeeSkillExamBillList";

            var HBillType = "2332";
            var set_HideButton_ID = "toolbarDemo_ButtonSet";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HProcID","HMaterID"];

@@ -223,6 +238,9 @@
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
@@ -260,8 +278,12 @@
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme();
@@ -269,7 +291,31 @@
                    //读取方案
                    case 'set_ReadScheme': set_ReadScheme();
                        break;
                    //按钮设置
                    case 'set_HideButton':
                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
            //#endregion

            //#region æ—¥æœŸé—´éš”下拉列表监听
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                if (HInitTimeCycle != -1) {
                    //$('#HDate').prop('disabled', true);
                    //$('#HDate1').prop('disabled', true);

                    $("#HBeginDate").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//欠料日期
                    $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//至

                    //执行查询方法
                    get_FastQuery(2);
                } else {
                    //$('#HDate').prop('disabled', false);
                    //$('#HDate1').prop('disabled', false);
                }
            });
            //#endregion

@@ -305,6 +351,31 @@
                get_FastQuery(2);
            });
            //#endregion
            //超链接跳转
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var HInterID = obj.data.HInterID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '技能考核记录-编辑'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../工资管理/技能考核/HR_EmployeeSkillExamBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        , end: function () {
                            //刷新页面,
                            get_FastQuery(table, option);
                        }
                    })
                }
            });

            //#endregion

@@ -312,12 +383,17 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //初始化日期
                $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//提料日期
                $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//至
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);
                get_FastQuery(2);
                //Organ();

                //查询当前登录用户有没有在当前模块设置默认过滤方案
@@ -369,6 +445,12 @@
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '单据号') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -394,12 +476,13 @@
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
                            ins = table.render(option);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                            layer.close(ajaxLoad);

                            //layer.alert("查询成功", { icon: 1 });
@@ -552,6 +635,34 @@
            }
            //#endregion

            //#region å¤åˆ¶
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '复制-技能考核记录'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../工资管理/技能考核/HR_EmployeeSkillExamBill.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -577,12 +688,43 @@
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "";
                option.data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                        }
                    }
                });
                table.exportFile(ins.config.id, option.data, "xlsx");
                //逻辑审核方法
                //$.ajax({
                //    type: "GET",
                //    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                //    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                //    success: function (result) {
                //        if (result.count == 1) {
                            
                //        } else {
                //            layer.alert("当前模块没有导出权限!", { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //    }
                //});
            }
            //#endregion

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人=="") {
                    var HInterID = data[0].hmainid.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
@@ -614,7 +756,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                    layer.msg('请选择一行未审核数据删除！');
                }

            }
@@ -734,125 +876,6 @@
            }
            //#endregion

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
@@ -867,6 +890,25 @@
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion

            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [7, 30, 45, 60];
                var titleList = ["近7天", "近一月", "近45天", "近60天"];

                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
                for (var i = 0; i < valueList.length; i++) {
                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);


                $("#HInitTimeCycle").val("30");
                form.render('select');
            }
            //#endregion
@@ -910,7 +952,6 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery(1)
                            form.render("select");
                        }
                    }, error: function () {

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í£¹¤/Sc_MESStopStepWorkBillList.html

@@ -505,8 +505,7 @@
                set_InitGrid();
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                
            }


@@ -670,6 +669,11 @@
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid   
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    var HBillStatus = data.单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
@@ -791,7 +795,11 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -823,8 +831,10 @@
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                //查询当前登录用户有没有在当前模块设置默认过滤方案
                                get_DefaultModule();
                            }
                        } else {
                            layer.close(ajaxLoad);
@@ -865,8 +875,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                    var HBillStatus = data[0].单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
@@ -901,9 +911,9 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                        layer.msg('单据状态不为未审核状态,不允许删除！');
                    var HBillStatus = data[0].单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
                    //逻辑删除方法

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í깤/Sc_MESEndStepWorkBillList.html

@@ -67,10 +67,10 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HSource" id="HSource">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; ">重置</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>
@@ -238,7 +238,7 @@
            //过滤条件的classç±»
            var HClassTag = "ForFilteringSchemes";
            //模块名称（中文版） æ¯ä¸ªæ¨¡å—页面都需要修改
            window.HModuleName = "停工单维护";
            window.HModuleName = "完工单维护";
            //是否已经选择了过滤方案（全局变量）
            window.HDefaultFilter = "";
            //选择的过滤方案内码（全局变量）
@@ -514,8 +514,7 @@
                set_InitGrid();
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                
            }

            //初始化表格
@@ -659,6 +658,11 @@
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid   
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    var HBillStatus = data.单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
@@ -796,7 +800,11 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -828,8 +836,10 @@
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                //查询当前登录用户有没有在当前模块设置默认过滤方案
                                get_DefaultModule();
                            }
                        } else {
                            layer.close(ajaxLoad);
@@ -870,8 +880,8 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var linterid = data[0].hmainid.toString();
                            var HBillStatus = data[0].HBillStatus.toString();
                            if (HBillStatus != "1") {
                            var HBillStatus = data[0].单据状态.toString();
                            if (HBillStatus != "创建") {
                                layer.msg('单据状态不为未审核状态,不允许编辑！');
                                return false;
                            }
@@ -906,8 +916,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                    var HBillStatus = data[0].单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
@@ -1186,8 +1196,7 @@
                            //当前用户没有设置默认的过滤方案
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery()
                            
                            form.render("select");
                        }
                    }, error: function () {

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_Add_MESBeginStepWorkBillList.html

@@ -286,19 +286,19 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
                                                        </div>
                                                    </div>
                                                </div>
@@ -320,13 +320,13 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                </div>
@@ -921,7 +921,6 @@
            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
            });



 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_MESBeginStepWorkBillList.html

@@ -492,8 +492,7 @@
                set_InitGrid();
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                
            }


@@ -638,7 +637,12 @@

                //单据号超链接
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid   
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid 
                    var HBillStatus = data.单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
@@ -768,6 +772,12 @@
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '单据号') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -799,8 +809,10 @@
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                //查询当前登录用户有没有在当前模块设置默认过滤方案
                                get_DefaultModule();
                            }
                        } else {
                            layer.close(ajaxLoad);
@@ -865,8 +877,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1")
                    var HBillStatus = data[0].单据状态.toString();
                    if (HBillStatus != "创建")
                    {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
@@ -903,8 +915,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                    var HBillStatus = data[0].单据状态.toString();
                    if (HBillStatus != "创建") {
                        layer.msg('单据状态不为未审核状态,不允许删除！');
                        return false;
                    }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html

@@ -110,7 +110,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
                                                            <input id="HMaker" name="HMaker" type="hidden" /><!--制单人-->
                                                            <!--<input id="HMaker" name="HMaker" type="hidden" />--><!--制单人-->
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -287,73 +287,74 @@
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-tab-item">
                                                    <div class="layui-form-item">
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">制单人:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">修改人:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">审核人:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
                                                            </div>

                                            </div>
                                            <div class="layui-tab-item">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-form-item">
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">制单日期:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">修改日期:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">审核日期:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-form-item">
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">关闭人:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">作废人:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
                                                            </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-form-item">
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">关闭日期:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">作废日期:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                </div>
@@ -1102,7 +1103,7 @@
                    return Result = false;
                }
                //if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
                //    layer.msg("停工原因不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    layer.msg("停工描述不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return Result = false;
                //}
                return Result;

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ깤µ¥/Sc_Add_MESEndWorkBillList.html

@@ -264,19 +264,19 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                </div>
@@ -298,13 +298,13 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                </div>

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -273,19 +273,19 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"  disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
                                                        </div>
                                                    </div>
                                                </div>
@@ -307,13 +307,13 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
                                                        </div>
                                                    </div>
                                                </div>
@@ -1060,7 +1060,7 @@
                        , { field: 'HICMOBillNo', title: '生产订单号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HProcExchInterID', title: '工序流转卡内码', hide: true }
                        , { field: 'HProcExchEntryID', title: '工序流转卡子内码', hide: true }
                        , { field: 'HProcExchBillNo', title: '工序流转卡号', templet: "#HProcExchInterID" }
                        , { field: 'HProcExchBillNo', title: '工序流转卡号', templet: "#HProcExchInterID", style: 'background-color: #f9f9f9;' }
                        , { field: 'HRemark', title: '备注', edit: 'text' }
                        , { field: 'HSourceInterID', title: '源单内码', hide: true }
                        , { field: 'HSourceEntryID', title: '源单子内码', hide: true }
@@ -1132,6 +1132,7 @@
                        if (obj.event == "HRelationBillNo") {
                            var HProcID = $("#HProcID").val();
                            var HSourceID = $("#HSourceID").val();
                            var HMaterID = $("#HMaterID").val();
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
@@ -1140,7 +1141,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../../views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
                                , content: ['../../../views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID + '&HMaterID=' + HMaterID, 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1243,6 +1244,91 @@
                                , btn2: function (index, layero) { }
                                , end: function () {

                                }
                            })
                        }
                        obj.event = "";
                        return false;
                    }
                    if (event.key == "F6") {
                        if (obj.event == "HRelationBillNo") {
                            var HProcID = $("#HProcID").val();
                            var HSourceID = $("#HSourceID").val();
                            var HMaterID = $("#HMaterID").val();
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
                                , title: "副产计划单"                             //标题
                                , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../../views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID, 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    if ($("#HSourceName").val() == checkStatus.data[0].生产资源 && $("#HProcName").val() == checkStatus.data[0].工序) {
                                        obj.update({
                                            "HProcExchInterID": checkStatus.data[0].hmainid
                                            , "HProcExchEntryID": checkStatus.data[0].hsubid
                                            , "HProcExchBillNo": checkStatus.data[0].单据号
                                            , "HRelationBillInterID": checkStatus.data[0].hmainid
                                            , "HRelationBillEntryID": checkStatus.data[0].hsubid
                                            , "HRelationBillNo": checkStatus.data[0].单据号
                                            , "HICMOInterID": checkStatus.data[0].hicmointerid
                                            , "HICMOEntryID": checkStatus.data[0].HICMOEntryID
                                            , "HICMOBillNo": checkStatus.data[0].生产订单号
                                            , "HMaterID": checkStatus.data[0].HMaterID
                                            , "HMaterName": checkStatus.data[0].产品
                                            , "HProcID": checkStatus.data[0].HProcID
                                            , "HProcName": checkStatus.data[0].工序
                                            , "HSourceInterID": checkStatus.data[0].hmainid
                                            , "HSourceEntryID": checkStatus.data[0].hsubid
                                            , "HSourceBillNo": checkStatus.data[0].单据号
                                            , "HSourceBillType": 3772

                                        })
                                    }
                                    else {
                                        return layer.msg("选择副产计划单的生产资源与工序,跟当前生产资源与工序不匹配");
                                    }

                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
                                , end: function () {
                                    if ($("#HSourceName").val() == OptionData[0].生产资源 && $("#HProcName").val() == OptionData[0].工序) {
                                        obj.update({
                                            "HProcExchInterID": OptionData[0].hmainid
                                            , "HProcExchEntryID": OptionData[0].hsubid
                                            , "HProcExchBillNo": OptionData[0].单据号
                                            , "HRelationBillInterID": OptionData[0].hmainid
                                            , "HRelationBillEntryID": OptionData[0].hsubid
                                            , "HRelationBillNo": OptionData[0].单据号
                                            , "HICMOInterID": OptionData[0].hicmointerid
                                            , "HICMOEntryID": OptionData[0].HICMOEntryID
                                            , "HICMOBillNo": OptionData[0].生产订单号
                                            , "HMaterID": OptionData[0].HMaterID
                                            , "HMaterName": OptionData[0].产品
                                            , "HProcID": OptionData[0].HProcID
                                            , "HProcName": OptionData[0].工序
                                            , "HSourceInterID": OptionData[0].hmainid
                                            , "HSourceEntryID": OptionData[0].hsubid
                                            , "HSourceBillNo": OptionData[0].单据号
                                            , "HSourceBillType": 3772

                                        })
                                    } else {
                                        return layer.msg("选择副产计划单的生产资源与工序,跟当前生产资源与工序不匹配");
                                    }

                                    OptionData = [];
                                }
                            })
                        }
@@ -1472,8 +1558,8 @@

        //生产班次
        function GetHWorkShiftsValue(obj) {
            $("#HWorkShiftID").val(obj[0].HInterID); //当前工序ID
            $("#HWorkShiftName").val(obj[0].班次名称); //当前工序
            $("#HWorkShiftID").val(obj[0].HInterID); //当前班次
            $("#HWorkShiftName").val(obj[0].班次名称); //当前班次名称
        }

        function GetSwipeCardStart(obj) {