班次,岗位,岗位技能,工位,班次开班单,岗位技能清单,员工技能清单优化
14个文件已修改
1235 ■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html 196 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_WorkStationList.html 351 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Post.html 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_PostSkillList.html 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Post.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_WorkShiftEdit.html 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_WorkShiftList.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBill.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBillList.html 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBill.html 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBillList.html 110 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBillList.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBill_Add_Edit.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_WorkStationList.html
@@ -35,58 +35,115 @@
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">工位代码</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                    <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                            <ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>
                                <li>制单信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工位代码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                                <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工位名称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">助记码:</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">禁用标记</label>
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">创建组织</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID" autocomplete="off" placeholder="" class="layui-input" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <input id="HItemID" name="HItemID" type="hidden" value="0" />
                                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
                                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
                                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
                                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">工位名称</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">助记码:</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <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="HMakeEmp" id="HMakeEmp" 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="HStopEmp" id="HStopEmp" 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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <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="HMakeTime" id="HMakeTime" 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="HStopTime" id="HStopTime" 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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">禁用标记</label>
                                <div class="layui-input-inline">
                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">创建组织</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID" autocomplete="off" placeholder="" class="layui-input" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">备注</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                </div>
                            </div>
                        </div>
                    </div>
                    <input id="HItemID" name="HItemID" type="hidden" value="0" />
                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
                     </div>
                </form>
            </div>
        </div>
@@ -134,6 +191,16 @@
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                $("#HItemID").val(0);
                $("#HMakeEmp").val(sessionStorage["HMaker"]); //根据登录用户带出创建人
                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
            } else if (OperationType == 2) {//复制
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                $("#HItemID").val(0);
                $("#HNumber").val('');
                $("#HName").val('');
                $("#HMakeEmp").val(sessionStorage["HMaker"]); //根据登录用户带出创建人
                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
@@ -151,7 +218,6 @@
            }
            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
            $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
            //#endregion
@@ -176,11 +242,42 @@
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //#endregion
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_WorkStation/AuditGy_WorkStation", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": 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);
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            //#region åˆ¤æ–­æ˜¯å¦ç™»å½• æœªç™»å½•则跳到登录页
            function get_LoginIs() {
@@ -199,6 +296,7 @@
                $.ajax({
                    url: GetWEBURL() + "Gy_WorkStationBill/cx",
                    type: "GET",
                    async:false,
                    data: {
                        "HInterID": linterid
                    },
@@ -217,6 +315,12 @@
                                , "HHelpCode": data.助记码
                                , "HRemark": data.备注
                                , "HCREATEORGID": data.创建组织
                                , "HMakeEmp": data.创建人 == "" ? sessionStorage["HMaker"] : data.创建人
                                , "HMakeTime": data.创建日期 == null ? "" : Format(new Date(data.创建日期), "yyyy-MM-dd")
                                , "HStopEmp": data.禁用人
                                , "HStopTime": data.禁用日期 == null ? "" : Format(new Date(data.禁用日期), "yyyy-MM-dd")
                                , "HCheckEmp": data.审核人
                                , "HCheckTime": data.审核日期 == null ? "" : Format(new Date(data.审核日期), "yyyy-MM-dd")
                            });
                            layer.close(ajaxLoad);
                        } else {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkStationList.html
@@ -15,7 +15,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -78,12 +78,69 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </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="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_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_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -151,13 +208,47 @@
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '工位代码') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 ''。如果等于,则执行if循环
                    var linterid = data.HItemID.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑'  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_WorkStationList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //设置 iframe çš„ URL,URL ä¸­åŒ…含了查询参数,来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                            get_FastQuery(table, option);
                        }
                        , cancel: function () {  //点击取消时使用回调
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
@@ -199,7 +290,7 @@
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                        break;
                };
            });
@@ -212,6 +303,12 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');
                sWhere = "";
@@ -284,6 +381,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) {
@@ -309,10 +412,10 @@
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            //刷新表格数据
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
@@ -339,7 +442,12 @@
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
@@ -361,6 +469,48 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HNumber) {
                    sWhere += " and å·¥ä½ä»£ç  like '%" + HNumber + "%'";
                }
@@ -377,10 +527,69 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                sWhere = "";
            }
            //#endregion
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Gy_WorkStation_Query";
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            //(参数一:表格id)
                            table.exportFile('mainTable', option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¤åˆ¶
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '复制-工位列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_WorkStationList.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#endregion
            //#region æ–°å¢ž
            function set_AddNew() {
@@ -419,7 +628,7 @@
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人==='') {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
@@ -452,7 +661,7 @@
                }
                else {
                    layer.msg('请选择一行数据删除!');
                    layer.msg('请选择一行未审核数据删除!');
                }
            }
@@ -559,128 +768,6 @@
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; 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) {
                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "Gy_WorkStation";
                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        //刷新表格数据
                        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 - 2; 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>';
@@ -691,6 +778,10 @@
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Post.html
@@ -25,6 +25,7 @@
                        <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 class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
                        </div>
@@ -58,46 +59,48 @@
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" >使用组织:</label>
                                                <div class="layui-input-inline">
                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                    </select>
                                                <label class="layui-form-label" style="width: 120px"> å¤‡æ³¨ï¼š</label>
                                                <div class="layui-input-inline" style="width: 550px">
                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">创建组织:</label>
                                                <div class="layui-input-inline">
                                                    <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" >使用状态:</label>
                                                <div class="layui-input-inline">
                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" readonly>
                                                        <option value="未检测" selected>未检测</option>
                                                        <option value="未使用">未使用</option>
                                                        <option value="已使用">已使用</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px"> ç¦ç”¨æ ‡å¿—:</label>
                                                <div class="layui-input-inline">
                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
                                                </div>
                                            </div>
                                        </div>
                                        <!--<div class="layui-form-item">
                                        </div>-->
                                        <div class="layui-form-item">
                                            <div class="layui-col-xs11">
                                                <label class="layui-form-label"> å¤‡æ³¨ï¼š</label>
                                                <div class="layui-input-block">
                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">使用组织:</label>
                                                <div class="layui-input-inline">
                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">创建组织:</label>
                                                <div class="layui-input-inline">
                                                    <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">使用状态:</label>
                                                <div class="layui-input-inline">
                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" readonly>
                                                        <option value="未检测" selected>未检测</option>
                                                        <option value="未使用">未使用</option>
                                                        <option value="已使用">已使用</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
@@ -249,7 +252,10 @@
                    Pub_Close(1);
                }
            });
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {
@@ -265,6 +271,34 @@
            //#region å½“前页面面所有的方法
            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_Post", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": 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);
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            //初始化界面
            function set_ClearBill() {
                $("#HUSEORGID").attr("disabled", true);
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_PostSkillList.html
@@ -25,6 +25,7 @@
                        <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 class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
                        </div>
@@ -257,6 +258,10 @@
                        }
                    });
            });
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //退出
            form.on('submit(Exit)', function (data) {//
                if (linterid == undefined) {
@@ -297,6 +302,34 @@
            //#region å½“前页面面所有的方法
            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_PostSkill", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": 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);
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            //初始化界面
            function set_ClearBill() {
@@ -375,7 +408,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '员工表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Post.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Post.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -403,7 +436,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]  //获取弹框页面
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Post.html
@@ -704,7 +704,7 @@
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人==='') {
                    var HItemID = data[0].HItemID.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
@@ -733,7 +733,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                    layer.msg('请选择一行未审核数据删除!');
                }
            }
            //#endregion
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_PostSkillList.html
@@ -700,7 +700,7 @@
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人==='') {
                    var HItemID = data[0].HItemID.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
@@ -729,7 +729,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                    layer.msg('请选择一行未审核数据删除!');
                }
            }
            //#endregion
@@ -835,10 +835,15 @@
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HProcID = params[params[1]];//对应工序
                var result = ""
                if (typeof (openType) != "undefined") {
                    return " and ç¦ç”¨æ ‡å¿— != '是' and ISNULL(审核人,'')  != '' ";
                    result += " and ç¦ç”¨æ ‡å¿— != '是' and ISNULL(审核人,'')  != '' ";
                    if (typeof (HProcID) != "undefined" && HProcID != "0") {
                        result += " and HProcID=" + HProcID
                    }
                }
                return "";
                return result;
            }
            //#endregion
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_WorkShiftEdit.html
@@ -18,6 +18,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
@@ -38,6 +39,7 @@
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -259,6 +261,7 @@
                , form = layui.form
                , element = layui.element;
            var HInterID = $('#HInterID').val();
            var HModName = "Gy_WorkShifEdit"
            var OperationType = 1       //操作类型(1新增、2编辑)
            //#endregion
@@ -292,6 +295,8 @@
                });
                get_InitGrid();
                //设置表格格式
                DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
            } else if (OperationType == 2) {
                //修改时主表ID
@@ -306,12 +311,14 @@
                $("#HStopTime").val("");
                $("#HCheckTime").val("");
                $("#HItemID").val(0);
                DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
            }
            else if (OperationType == 3) {  //编辑
                $("#HInterID").val(HInterID);//修改时主表ID
                get_InitGrid();
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(HInterID);
                DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
@@ -422,7 +429,7 @@
                    , area: ['90%', '90%']//大小
                    , title: "工作中心列表"  //标题
                    , shift: 2//弹出动画
                    , content: ["../../基础资料/公用基础资料/Gy_WorkCenter.html", "yes"]
                    , content: ["../../基础资料/公用基础资料/Gy_WorkCenter.html?Htype=2", "yes"]
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -451,7 +458,7 @@
                    , shift: 2                  //弹出动画
                    , area: ["90%", "90%"]      //窗体大小
                    , maxmin: true              //设置最大最小按钮是否显示
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Htype=2&Organization=' + sessionStorage["Organization"], 'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
@@ -533,7 +540,7 @@
                        break;
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                        break;
                    //上一行
                    case 'btn_up':
@@ -684,11 +691,45 @@
            //#endregion
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //#region é€€å‡º
            form.on('submit(btn_Cancel)', function () {
                Pub_Close(1);
            });
            //#endregion
            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_ShiftsController/AuditGy_Shifts", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": 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);
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            //#region   å­è¡¨åˆå§‹åŒ–
            function get_InitGrid() {
@@ -700,7 +741,7 @@
                    , height: 400
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { type: 'numbers',field:'序号', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HSNO', title: '序号', edit: 'text', totalRow: true }
                        , { field: 'HStartDate', title: '开始时间', event: "HStartDate" }
                        , { field: 'HEndDate', title: '结束时间', event: "HEndDate" }
@@ -753,7 +794,7 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗?', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && option.data.length===1) {
                            layer.msg('首行无法删除!!!');
                        } else {
                            var oldData = table.cache["mainTable"];
@@ -796,6 +837,11 @@
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }
        function GetWorkCenterValue(obj)  //返回工作中心
        {
            $("#HWorkCenterName").val(obj[0].工作中心名称);
            $("#HWorkCenterID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_WorkShiftList.html
@@ -231,6 +231,8 @@
                set_StockOrg();
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();               
            }
@@ -293,9 +295,8 @@
                        , title: '班次-编辑'
                        , shift: 0  //弹出动画
                        , content: '../生产基础资料/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                        ,end: function (index, layero, that) {
                            //刷新页面
                            $("#btn_Search").trigger('click');
                        }
@@ -397,9 +398,8 @@
                    , title: '班次-新增'
                    , shift: 0  //弹出动画
                    , content: '../生产基础资料/Gy_WorkShiftEdit.html?OperationType=1&HInterID='
                    , btn: ['确定'],
                    // æŒ‰é’®1 çš„回调
                    end: function (index, layero, that) {
                    ,end: function (index, layero, that) {
                        //刷新页面
                        $("#btn_Search").trigger('click');
                    }
@@ -419,9 +419,8 @@
                        , title: '班次-编辑'
                        , shift: 0  //弹出动画
                        , content: '../生产基础资料/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                        ,end: function (index, layero, that) {
                            //刷新页面
                            $("#btn_Search").trigger('click');
                        }
@@ -436,7 +435,7 @@
            function btn_Delete() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人==='') {
                    var HInterID = data[0].HInterID.toString();
                    layer.confirm("确认要删除选中行数据?删除后将不可恢复!", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
@@ -466,7 +465,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                    layer.msg('请选择一行未审核数据删除!');
                }
            }
            //#endregion
@@ -880,7 +879,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery();
                            //get_FastQuery();
                            form.render("select");
                        }
                    },
WebTM/views/¹¤×ʹÜÀí/Ô±¹¤¼¼ÄÜÇåµ¥/HR_EmployeeSkillBill.html
@@ -55,6 +55,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                                <input type="hidden" name="HInnerBillNo" id="HInnerBillNo" lay-verify="HInnerBillNo">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -115,19 +116,6 @@
                                                </button>
                                            </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="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">对应工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -138,10 +126,28 @@
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">内部订单号</label>
                                            <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="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo">
                                                <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName">
                                            </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">
                                            </div>
                                        </div>
                                    </div>
@@ -884,7 +890,8 @@
                        $("#HMaterID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//部门名称
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);//
                        $("#HMaterModel").val(checkStatus.data[0].规格型号);//
                        table.render(option);
                        layer.closeAll();
                    }
@@ -905,7 +912,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工序表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?openType=2', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?openType=2&HProcID=' + $("#HProcID").val(), 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1179,21 +1186,40 @@
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    if (checkStatus.data[0].关闭人 == null || checkStatus.data[0].关闭人 == "") {
                                    if (checkStatus.data.length === 1) {
                                        //同步更新表格和缓存对应的值
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HPostSkillid": checkStatus.data[0].HItemID
                                            , "HPostSkillNumber": checkStatus.data[0].岗位技能代码
                                            , "HPostSkillName": checkStatus.data[0].岗位技能名称
                                        })
                                        layer.close(index);//关闭弹窗
                                    } else {
                                        layer.msg("该任务已关闭,请重新选择!");
                                        //(多选行)
                                        //将原有表体数据写入数组
                                        var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                                        buttonArr = [];//清空数组
                                        for (var i = 0; i < tableBak.length; i++) {
                                            if (tableBak[i]["HPostSkillid"] != 0 && tableBak[i]["HPostSkillid"] != "" && tableBak[i]["HPostSkillid"] != undefined && tableBak[i]["HPostSkillid"] != null) {
                                                buttonArr.push(tableBak[i]);  //如果关键字段不为空,则将之前的数据存储
                                            }
                                        }
                                        //将批量选择的数据写入数组(多选行)
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            buttonArr.push({
                                                "HPostSkillid": checkStatus.data[i].HItemID, "HPostSkillNumber": checkStatus.data[i].岗位技能代码, "HPostSkillName": checkStatus.data[i].岗位技能名称, "HRemark": "", "HSkillLev": "1", "HTrainDate": Format(new Date(), "yyyy-MM-dd"), "HSourceInterID": "0"
                                                , "HSourceEntryID": "0"
                                                , "HSourceBillNo": ""
                                                , "HSourceBillType": "" });
                                        }
                                        // é‡æ–°æ¸²æŸ“表格,更新数据
                                        table.reload('mainTable', {
                                            data: buttonArr
                                        });
                                    }
                                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
@@ -1255,6 +1281,8 @@
        function GetGyMaterial(obj) {
            $("#HMaterID").val(obj.HItemID);//物料id
            $("#HMaterName").val(obj.物料名称);//物料名称
            $("#HMaterNumber").val(obj.物料代码);//物料代码
            $("#HMaterModel").val(obj.规格型号);//规格型号
        }
        //工序
WebTM/views/¹¤×ʹÜÀí/Ô±¹¤¼¼ÄÜÇåµ¥/HR_EmployeeSkillBillList.html
@@ -33,6 +33,17 @@
                                    </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>
                                <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">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -51,25 +62,16 @@
                                        <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; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <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>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">组织</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
                                                <!--动态渲染组织-->
                                            </select>
                                        </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>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
@@ -239,6 +241,35 @@
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //单据号超链接
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 ''。如果等于,则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑'  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../工资管理/员工技能清单/HR_EmployeeSkillBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //设置 iframe çš„ URL,URL ä¸­åŒ…含了查询参数,来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                            get_FastQuery(2);
                        }
                        , cancel: function () {  //点击取消时使用回调
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
            //#region å¤´å·¥å…·æ äº‹ä»¶
@@ -434,6 +465,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) {
@@ -567,14 +604,13 @@
                if (HOrgID) {
                    sWhere += " and HOrgID = '" + HOrgID + "'";
                }
                if (number==2) {
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                    }
                    if (HDate1) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                    }
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
@@ -723,7 +759,7 @@
            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();
@@ -755,7 +791,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                    layer.msg('请选择一行未审核数据删除!');
                }
            }
WebTM/views/¹¤×ʹÜÀí/¸Úλ¼¼ÄÜÇåµ¥/HR_PostSkillBill.html
@@ -64,18 +64,6 @@
                                            </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="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" 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;padding: 9px 18px;">部门</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -85,16 +73,9 @@
                                                </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="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" 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;padding: 9px 18px;">对应工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -103,6 +84,40 @@
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" 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>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="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" id="HMaterModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -715,7 +730,8 @@
                        $("#HMaterID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//部门名称
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);//
                        $("#HMaterModel").val(checkStatus.data[0].规格型号);//
                        table.render(option);
                        layer.closeAll();
                    }
@@ -993,28 +1009,49 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../基础资料/生产基础资料/Gy_PostSkillList.html', "yes"]
                                , content: ['../../基础资料/生产基础资料/Gy_PostSkillList.html?HType=2&HProcID=' + $("#HProcID").val(), "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 (checkStatus.data[0].关闭人 == null || checkStatus.data[0].关闭人 == "") {
                                    if (checkStatus.data.length === 1) {
                                        //同步更新表格和缓存对应的值
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HPostSkillid": checkStatus.data[0].HItemID
                                            , "HPostSkillNumber": checkStatus.data[0].岗位技能代码
                                            , "HPostSkillName": checkStatus.data[0].岗位技能名称
                                        })
                                        layer.close(index);//关闭弹窗
                                    } else {
                                        layer.msg("该任务已关闭,请重新选择!");
                                        //(多选行)
                                        //将原有表体数据写入数组
                                        var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                                        buttonArr = [];//清空数组
                                        for (var i = 0; i < tableBak.length; i++) {
                                            if (tableBak[i]["HPostSkillid"] != 0 && tableBak[i]["HPostSkillid"] != "" && tableBak[i]["HPostSkillid"] != undefined && tableBak[i]["HPostSkillid"] != null) {
                                                buttonArr.push(tableBak[i]);  //如果关键字段不为空,则将之前的数据存储
                                            }
                                        }
                                        //将批量选择的数据写入数组(多选行)
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            buttonArr.push({
                                                "HPostSkillid": checkStatus.data[i].HItemID, "HPostSkillNumber": checkStatus.data[i].岗位技能代码, "HPostSkillName": checkStatus.data[i].岗位技能名称, "HRemark": "", "HSkillLev": "1", "HSourceInterID": "0"
                                                , "HSourceEntryID": "0"
                                                , "HSourceBillNo": ""
                                                , "HSourceBillType": "" });
                                        }
                                        // é‡æ–°æ¸²æŸ“表格,更新数据
                                        table.reload('mainTable', {
                                            data: buttonArr
                                        });
                                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                    }
                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
@@ -1187,6 +1224,8 @@
        function GetGyMaterial(obj) {
            $("#HMaterID").val(obj.HItemID);//物料id
            $("#HMaterName").val(obj.物料名称);//物料名称
            $("#HMaterNumber").val(obj.物料代码);//物料名称
            $("#HMaterModel").val(obj.规格型号);//物料名称
        }
        //工序
WebTM/views/¹¤×ʹÜÀí/¸Úλ¼¼ÄÜÇåµ¥/HR_PostSkillBillList.html
@@ -33,6 +33,16 @@
                                    </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>
                                <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">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -51,26 +61,30 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <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>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">组织</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </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>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <!--<div class="layui-inline">
            <label class="layui-form-label" style="width: 85px;">组织</label>
            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">-->
                                    <!--动态渲染组织-->
                                    <!--</select>
            </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>
        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                                </div>
                                <!--显示当前过滤方案-->
                                <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>
@@ -107,12 +121,12 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
@@ -127,19 +141,19 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
@@ -154,7 +168,7 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -239,6 +253,36 @@
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //单据号超链接
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 ''。如果等于,则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑'  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../工资管理/岗位技能清单/HR_PostSkillBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //设置 iframe çš„ URL,URL ä¸­åŒ…含了查询参数,来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                            get_FastQuery(2);
                        }
                        , cancel: function () {  //点击取消时使用回调
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
            //#region å¤´å·¥å…·æ äº‹ä»¶
@@ -386,7 +430,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);
                get_FastQuery(2);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -432,6 +476,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) {
@@ -718,7 +768,7 @@
            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();
@@ -750,7 +800,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                    layer.msg('请选择一行未审核数据删除!');
                }
            }
@@ -927,7 +977,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery(1)
                            //get_FastQuery(1)
                            form.render("select");
                        }
                    }, error: function () {
@@ -1088,7 +1138,7 @@
                    }
                    , end: function () {
                        if (HIsClose_Manual != true) {
                            get_FastQuery()
                            get_FastQuery(2)
                            form.render("select");
                        }
                    }
WebTM/views/Éú²ú¹ÜÀí/°à´Î¿ª°àµ¥/Sc_ShiftsBeginInfoBillList.html
@@ -32,18 +32,19 @@
                                    </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>
                                <div class="layui-inline">
                                    <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">
                                    <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>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
@@ -382,6 +383,8 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -639,6 +642,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_ShiftsBeginInfoBill/getSc_ShiftsBeginInfoBillListPage',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
@@ -662,7 +666,10 @@
                                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>'
                                        } });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -994,9 +1001,9 @@
                            //当前用户设置有默认的过滤方案
                            var data = data1.data;
                            //当前选择的过滤方案
                            HInterID_Choose = data[0].HInterID;
                            HInterID_Choose = data[0].hmainid;
                            //过滤方案内码
                            HInterID = data[0].HInterID
                            HInterID = data[0].hmainid
                            //过滤方案名称
                            HDefaultFilter = data[0].方案名称
                            //过滤方案的备注(方案信息描述)
@@ -1019,7 +1026,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery(1)
                            //get_FastQuery(1)
                            form.render("select");
                        }
                    }, error: function () {
WebTM/views/Éú²ú¹ÜÀí/°à´Î¿ª°àµ¥/Sc_ShiftsBeginInfoBill_Add_Edit.html
@@ -29,6 +29,7 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -311,7 +312,7 @@
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                GetDefValByUser();
            }
            else if (OperationType == 2) {//如果修改则走下面 new                                        //复制
                OperationType = 1;
@@ -323,6 +324,14 @@
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HUpDater").val('');
                $("#HUpDateDate").val('');
                $("#HChecker").val('');
                $("#HCheckDate").val('');
                $("#HCloseMan").val('');
                $("#HCloseDate").val('');
                $("#HDeleteMan").val('');
                $("#HDeleteDate").val('');
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
@@ -387,6 +396,11 @@
                }
            });
            //#endregion
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(1);
            });
            //#region é€€å‡º
            form.on('submit(btnEdit)', function (data) {
@@ -548,7 +562,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HWorker&openType=2', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -837,6 +851,39 @@
            }
            //#endregion          
            //#region é€šè¿‡ç™»å½•用户获取默认值
            function GetDefValByUser() {
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
                    type: "GET",
                    async: false,
                    data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        form.val("formData", {
                            //"HSourceID": data.HSourceID,
                            //"HSourceName": data.生产资源名称,
                            "HDeptID": data["HDeptID"]
                            , "HDeptName": data["部门名称"]
                            , "HWorkCenterID": data["HWorkCenterID"]
                            , "HWorkCenterName": data["工作中心名称"]
                            , "HSourceID": data["HSourceID"]
                            , "HSourceName": data["生产资源名称"]
                            , "HGroupID": data["HGroupID"]
                            , "HGroupName": data["生产班组名称"]
                        });
                        layer.close(index);
                    }
                    , error: function () {
                        layer.close(index);
                        layer.msg("接口请求失败");
                    }
                })
            }
            //#endregion
            //#region éžç©ºéªŒè¯
            function AllowLoadData(data) {
                //#region è¡¨å¤´æ•°æ®æ£€éªŒ
@@ -920,7 +967,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=&openType=2', "yes"]
                                , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -962,6 +1009,16 @@
                                }
                                , btn2: function (index, layero) { }
                                , end: function () {
                                    if (typeof (OptionData[0].HItemID) != "undefined") {
                                        obj.update({
                                            "HWorkEmpID": OptionData[0].HItemID
                                            , "HWorkEmpNumber": OptionData[0].职员代码
                                            , "HWorkEmpName": OptionData[0].职员名称
                                        })
                                    }
                                    OptionData = "";
                                }
                            });
                        }