1
沈泽
2021-09-02 2fa623a9392f2c08bd2314d05b5ff599d470cd8c
1
23个文件已修改
2003 ■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Material.html 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_PropertyList.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Unit.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html 412 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_Group.html 286 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Process.html 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Source.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/销售基础资料/Gy_Customer.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 363 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 375 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Unit.html
@@ -148,8 +148,8 @@
            function RoadBillMain(hID)//加载表头
            {
                alert(hID);
                //查询检验方案单是否存在
                //alert(hID);
               // æŸ¥è¯¢æ£€éªŒæ–¹æ¡ˆå•是否存在
                $.ajax({
                    url: GetWEBURL() + "GetGy_UnitDetail",
                    type: "GET",
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_DepartmentList.html
@@ -231,26 +231,34 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    var ajaxLoad = layer.load();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + 'DeltetGy_Department',
                        type: "GET",
                        data: { "HItemID": ItemID },
                        success: function (result) {
                            console.log('gouba' + result);
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                                layer.msg(result.Message, { icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(wait);
                                    //修改为功后刷新界面
                                    window.location.reload();
                                });
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                  })
                }
                else {
                    layer.msg('请选择一行数据删除!');
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html
@@ -22,11 +22,7 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">职员代码</label>
                                    <div class="layui-input-block">
@@ -52,6 +48,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>-->
@@ -60,8 +57,7 @@
                        </script>
                    </form>
                </div>
            </div>
        </div>
            </div>/       </div>
    </div>x
    <script>
@@ -109,6 +105,9 @@
                        break;
                    case 'btn-Delete':
                        set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //审核按钮
                    case 'btn-Audit':
@@ -169,6 +168,8 @@
            //#endregion
        //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                //初始化网格
@@ -182,7 +183,7 @@
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                        , { field: '职员代码', title: '职员代码', sort: true }
                        , { field: '职员代码', title: '职员代码', sort: true, width: 175 }
                        , { field: '职员名称', title: '职员名称', sort: true }
                        , { field: '条码编号', title: '条码编号' }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
@@ -341,7 +342,15 @@
                    layer.msg('请选择一行数据打印!');
                }
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
            //以上是layui模块
        });
        //#endregion
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html
@@ -144,10 +144,7 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HModel").val("");
                $("#HOrgName").val("");
                set_ClearQuery();
                //$("#btnSearch").click();
            });
            //#endregion
@@ -201,6 +198,16 @@
            }
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HModel").val("");
                $("#HOrgName").val("");
                sWhere = "";
            }
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_PropertyList.html
@@ -19,23 +19,19 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">辅助属性代码</label>
                                    <div class="layui-input-block">
                                    <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="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">辅助属性名称</label>
                                    <div class="layui-input-block">
                                    <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="HName" id="HName">
                                    </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>
@@ -137,6 +133,7 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                var ajaxLoad = layer.load();
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
@@ -154,11 +151,14 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Unit.html
@@ -19,51 +19,57 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                <!--<div style="padding: 10px;">
        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">重置</button>
        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">删除</button>
        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">修改</button>
        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">禁用</button>
        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">反禁用</button>
    </div>-->
                                <!--<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">-->
                                <!--<div class="layui-row" style="padding:10px 0">-->
                                <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
        <div id="treeunit" lay-filter="treeunit" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
    </div>-->
                                <!--<div class="layui-col-xs9 layui-inline">-->
                                <!--<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="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <!--<div style="padding: 10px;">
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">重置</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">删除</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">修改</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">禁用</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">反禁用</button>
                                <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="HName" id="HName">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">计量单位代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">计量单位名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>-->
                                <!--<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">-->
                                    <!--<div class="layui-row" style="padding:10px 0">-->
                                        <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
                                            <div id="treeunit" lay-filter="treeunit" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
                                        </div>-->
                                        <!--<div class="layui-col-xs9 layui-inline">-->
                                            <!--<div class="layui-row">-->
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">计量单位代码</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">计量单位名称</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HName" id="HName">
                                                    </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>
                                            <!--</div>-->
                                            <!--<div>
                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                            </div>-->
                                        <!--</div>-->
                                    <!--</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>
                                <!--</div>-->
                                <!--<div>
        <table class="" id="mainTable" lay-filter="mainTable"></table>
    </div>-->
                                <!--</div>-->
                                <!--</div>-->
                                <!--</div>-->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -240,6 +246,7 @@
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var ajaxLoad = layer.load();
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
@@ -256,11 +263,14 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Warehouse.html
@@ -261,26 +261,35 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + 'DeltetGy_Warehouse',
                        type: "GET",
                        data: { "HItemID": ItemID },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_Warehouse',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter.html
@@ -8,11 +8,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style media="screen">
        /*.custom-tree-item-clicked {
            color: #FC9003
        }*/
    </style>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -21,103 +21,44 @@
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <!--<div class="layui-collapse">
                            <div class="layui-colla-item">-->
                                <!--<div style="padding: 10px;">-->
                                    <!--<div class="layui-col-xs2">
                                        <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
                                    </div>-->
                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>修改</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                </div>-->
                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
                                    <div class="layui-row" style="padding:10px 0">
                                        <div class="layui-col-xs12 layui-inline" >
                                            <!--<div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>-->
                                        </div>
                                        <div class="layui-col-xs12 layui-inline">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">代码</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">名称</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HName" id="HName">
                                                    </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>
                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                            </div>
                                        </div>
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <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="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-row layui-form-item">
                                    <!--<div class="layui-inline">
                                        <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
                                    </div>-->
                                    <!--<div class="" style="padding-top: 10px;">
                                        <div class="layui-row">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">部门代码</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">部门名称</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input" name="HName" id="HName">
                                                </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>
                                        </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="HName" id="HName">
                                    </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="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <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>
                        </script>
                    </form>
                          </div>
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                            <script type="text/html" id="toolbarDemo">
                                <div class="layui-btn-container">
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                </div>
                            </script>
                        </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
    <!--<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>-->
    <script>
        var treeCkData = { id: 0 };
        var TagId = "";
        var TagParentId = "";
@@ -139,6 +80,7 @@
                , tree = layui.tree
                , util = layui.util
                  var sWhere = "";
                  var option = [];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -153,8 +95,23 @@
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //浏览
                    case 'get_PrintReport': get_PrintReport();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
@@ -163,9 +120,7 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                //$("#btnSearch").click();
                set_ClearQuery();
            });
            //#endregion
@@ -174,59 +129,60 @@
                get_FastQuery();
            });
            //#endregion
            //#region ä¿®æ”¹æŒ‰é’®
            form.on('submit(btnModify)', function (data) {
                if (TagId != "") {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '编辑工作中心'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../公用基础资料/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
                else {
                    var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                    if (checkStatus.data.length === 1) {
                        var hID = data[0].HItemID.toString();
                        TagParentId = data[0].ParentID.toString();
                        //if (AllowLoadData(sSubStr) != false) {//非空验证
                        layer.open({
                            type: 2
                            , area: ['50%', '50%']
                            , title: '编辑工作中心'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: ['../公用基础资料/Add_Edit_Gy_WorkCenter.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
                            , resize: false,
                            end: function () {
                                //刷新页面,
                                location.reload();
                            }
                            , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");
                            }
                        })
                    } else {
                        layer.msg('请选择一行数据编辑!');
                    }
                }
            });
            ////#region ä¿®æ”¹æŒ‰é’®
            //form.on('submit(btnModify)', function (data) {
            //    if (TagId != "") {
            //        layer.open({
            //            type: 2
            //            , area: ['50%', '50%']
            //            , title: '编辑工作中心'
            //            , closeBtn: 1
            //            , shade: 0.6 //遮罩透明度
            //            , maxmin: true //允许全屏最小化
            //            , anim: 0 //0-6的动画形式,-1不开启
            //            , content: ['../公用基础资料/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
            //            , resize: false,
            //            end: function () {
            //                //刷新页面,
            //                location.reload();
            //            }
            //            , cancel: function () {
            //                //$(".layui-btn").removeClass("layui-btn-disabled");
            //            }
            //        })
            //    }
            //    else {
            //        var checkStatus = table.checkStatus('mainTable')
            //            , data = checkStatus.data;
            //        if (checkStatus.data.length === 1) {
            //            var hID = data[0].HItemID.toString();
            //            TagParentId = data[0].ParentID.toString();
            //            //if (AllowLoadData(sSubStr) != false) {//非空验证
            //            layer.open({
            //                type: 2
            //                , area: ['50%', '50%']
            //                , title: '编辑工作中心'
            //                , closeBtn: 1
            //                , shade: 0.6 //遮罩透明度
            //                , maxmin: true //允许全屏最小化
            //                , anim: 0 //0-6的动画形式,-1不开启
            //                , content: ['../公用基础资料/Add_Edit_Gy_WorkCenter.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
            //                , resize: false,
            //                end: function () {
            //                    //刷新页面,
            //                    location.reload();
            //                }
            //                , cancel: function () {
            //                    //$(".layui-btn").removeClass("layui-btn-disabled");
            //                }
            //            })
            //        } else {
            //            layer.msg('请选择一行数据编辑!');
            //        }
            //    }
            //});
                //#endregion
            //#endregion
@@ -309,30 +265,28 @@
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
            //#region æ–°å¢ž
            form.on('submit(btnAdd)', function (obj) {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增工作中心',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../公用基础资料/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + ''],
                    end: function () {
                        //刷新页面,
                        location.reload();
                    },
                    success: function (layero, index) {
                    }
                });
                return false;//这里加个return false;就不会两次提交
            })
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
            }
            //#endregion
            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '工作中心-新增'
                    , shift: 0//弹出动画
                    , content: '../公用基础资料/Gy_WorkCenter_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion
            //#region ç¼–辑
            function set_ShowBill() {
@@ -353,84 +307,56 @@
                }
            }
            //#endregion
            //#region åˆ é™¤
            form.on('submit(btndelete)', function (obj) {
                var ModRightNameDelete = 'Gy_WorkCenter_Delete'
                if (TagId != "") {
                    layer.confirm('您确定要删除吗?', {
                        btn: ['确定', '取消'] //按钮
                        , yes: function (index, layero) {
                            $.ajax({
                                url: GetWEBURL() + '/Gy_WorkCenter/Delete_Json',
                                type: "GET",
                                //async: true,
                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
                                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);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            //重载tree
                                            tree.reload('treeDepartment', {});
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_WorkCenter',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            })
                        }
                    });
                }
                else {
                    //var data = obj.data //获得当前行数据
                    //    , layEvent = obj.event; //获得 lay-event å¯¹åº”的值
                    var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                    var layEvent = checkStatus.event;
                    if (checkStatus.data.length === 1) {
                        layer.confirm('您确定要删除吗?', {
                            btn: ['确定', '取消'] //按钮
                            , yes: function (index, layero) {
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_WorkCenter/Delete_Json',
                                    type: "GET",
                                    //async: true,
                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
                                    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);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                                //重载tree
                                                tree.reload('treeDepartment', {});
                                            });
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                        }
                                    }
                                })
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    }
                    else {
                        layer.msg('请选择一行数据编辑!');
                    }
                    })
                }
            });
                //#endregion
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
            
            //以上是layui模块
        });
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html
@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>新增/编辑生产资源</title>
    <title>新增/编辑工作中心</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -303,7 +303,7 @@
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            ReRoadBillMain();
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
@@ -312,7 +312,7 @@
                    },
                    error: function (err) {
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                        //console.log("Reason" + sMainStr);
                    }
                });
            }
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Xt_ORGANIZATIONSList.html
@@ -19,23 +19,19 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <!--<div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">组织代码</label>
                                    <div class="layui-input-block">
                                    <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="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">组织名称</label>
                                    <div class="layui-input-block">
                                    <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="HName" id="HName">
                                    </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>
@@ -128,6 +124,7 @@
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var ajaxLoad = layer.load();
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
@@ -145,11 +142,14 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html
@@ -8,14 +8,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
    <style media="screen">
          /* .custom-tree-item-clicked {
            color: #FC9003*/
        /*}*/
    </style>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -24,41 +21,35 @@
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
                            <div class="layui-row" style="padding:10px 0">
                                <div class="layui-col-xs12 layui-inline">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">代码</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">名称</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HName" id="HName">
                                            </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-collapse">
                            <div class="layui-colla-item">
                                <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="HNumber" id="HNumber">
                                    </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="HName" id="HName">
                                    </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>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -103,9 +94,20 @@
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
@@ -114,70 +116,13 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                //$("#btnSearch").click();
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion
            //#region ä¿®æ”¹æŒ‰é’®
            form.on('submit(btnModify)', function (data) {
                if (TagId != "") {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '编辑班组'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../工资基础资料/Gy_Group_Add_Edit.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            location.reload();
                        }
                    })
                }
                else {
                    var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                    if (checkStatus.data.length === 1) {
                        var hID = data[0].HItemID.toString();
                        TagParentId = data[0].ParentID.toString();
                        //if (AllowLoadData(sSubStr) != false) {//非空验证
                        layer.open({
                            type: 2
                            , area: ['50%', '50%']
                            , title: '编辑班组'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: ['../工资基础资料/Gy_Group_Add_Edit.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
                            , resize: false,
                            end: function () {
                                //刷新页面,
                                location.reload();
                            }
                            , cancel: function () {
                                location.reload();
                            }
                        })
                    } else {
                        layer.msg('请选择一行数据编辑!');
                    }
                }
            });
            //#endregion
@@ -222,7 +167,8 @@
            //#endregion
            //#region æŸ¥è¯¢
                function get_Display(sWhere) {
            function get_Display(sWhere) {
                    var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Group/list',
@@ -232,11 +178,14 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
@@ -259,29 +208,25 @@
            }
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
            }
            //#endregion
            //#region æ–°å¢ž
            form.on('submit(btnAdd)', function (obj) {
                //页面层-自定义
            function set_AddNew() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增班组',
                    closeBtn: 1,
                    shift: 2,
                    area: ['50%', '50%'],
                    maxmin: true,
                    content: ['../工资基础资料/Add_Edit_Gy_Group.html?hID=' + TagId + ''],
                    end: function () {
                        //刷新页面,
                        location.reload();
                    },
                    success: function (layero, index) {
                    }
                });
                return false;//这里加个return false;就不会两次提交
            })
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '生产资源-新增'
                    , shift: 0//弹出动画
                    , content: '../工资基础资料/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion
            //#region ç¼–辑
@@ -305,82 +250,53 @@
            //#endregion
            //#region åˆ é™¤
            form.on('submit(btndelete)', function (obj) {
                var ModRightNameDelete = 'Gy_Group_Delete'
                if (TagId != "") {
                    layer.confirm('您确定要删除吗?', {
                        btn: ['确定', '取消'] //按钮
                        , yes: function (index, layero) {
                            $.ajax({
                                url: GetWEBURL() + '/Gy_Group/Delete_Json',
                                type: "GET",
                                //async: true,
                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
                                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);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            //重载tree
                                            tree.reload('treeDepartment', {});
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'Gy_Group/EditBill',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            })
                        }
                    });
                }
                else {
                    //var data = obj.data //获得当前行数据
                    //    , layEvent = obj.event; //获得 lay-event å¯¹åº”的值
                    var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                    var layEvent = checkStatus.event;
                    if (checkStatus.data.length === 1) {
                        layer.confirm('您确定要删除吗?', {
                            btn: ['确定', '取消'] //按钮
                            , yes: function (index, layero) {
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_Group/Delete_Json',
                                    type: "GET",
                                    //async: true,
                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
                                    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);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                                //重载tree
                                                tree.reload('treeDepartment', {});
                                            });
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                        }
                                    }
                                })
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    }
                    else {
                        layer.msg('请选择一行数据编辑!');
                    }
                    })
                }
            });
           // #endregion
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
        //#endregion
            //以上是layui模块
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html
@@ -299,7 +299,7 @@
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            ReRoadBillMain();
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html
@@ -421,7 +421,7 @@
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            ReRoadBillMain();
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html
@@ -21,11 +21,7 @@
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">不良原因代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
@@ -49,9 +45,9 @@
                        <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="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            </div>
                        </script>
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html
@@ -8,11 +8,16 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -23,20 +28,15 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序代码</label>
                                    <div class="layui-input-block">
                                    <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="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序名称</label>
                                    <div class="layui-input-block">
                                    <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="HName" id="HName">
                                    </div>
                                </div>
@@ -50,15 +50,11 @@
                        <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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -97,19 +93,29 @@
            //#region å¤´å·¥å…·æ äº‹ä»¶
           table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
               switch (obj.event) {
                   //新增
                   case 'set_AddNew': set_AddNew();
                       break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                       break;
                   //删除
                   case 'set_DeleteBill': set_DeleteBill();
                       break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                       break;
                   //退出按钮
                   case 'get_Exit': Pub_Close(2);
                       break;
                };
            });
            //#endregion
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");//工序代码
                $("#HName").val("");//工序名称
                //$("#btnSearch").click();
                set_ClearQuery();
            });
            //#endregion
@@ -153,15 +159,15 @@
                        , { field: '禁用标记', title: '禁用标记' }
                        , { field: '部门', title: '部门' }
                        , { field: '序号', title: '序号' }
                        , { field: '对应K3代码', title: '对应K3代码' }
                        , { field: '对应K3代码', title: '对应K3代码', width: 115 }
                        , { field: '条形码', title: '条形码' }
                        , { field: '班产定额', title: '班产定额' }
                        , { field: '加班补贴定额', title: '加班补贴定额' }
                        , { field: '加班补贴定额', title: '加班补贴定额', width: 120 }
                        , { field: '自动移转', title: '自动移转' }
                        , { field: '备注', title: '备注' }
                        , { field: 'HProcessID_K3', title: 'HProcessID_K3' }
                        , { field: 'ERP工序代码', title: 'ERP工序代码' }
                        , { field: 'ERP工序名称', title: 'ERP工序名称' }
                        , { field: 'HProcessID_K3', title: 'HProcessID_K3', width: 130 }
                        , { field: 'ERP工序代码', title: 'ERP工序代码', width: 125 }
                        , { field: 'ERP工序名称', title: 'ERP工序名称', width: 125 }
                    ]]
                };
            }
@@ -210,6 +216,27 @@
            }
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
            }
            //#endregion
            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '生产资源-新增'
                    , shift: 0//弹出动画
                    , content: '../生产基础资料/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion
            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -230,6 +257,55 @@
            }
            //#endregion
            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_Process',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
        });
        
        //#endregion
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html
@@ -237,26 +237,34 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + 'DeltetGy_Source',
                        type: "GET",
                        data: { "HItemID": ItemID },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_Source',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html
@@ -21,11 +21,7 @@
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">供应商代码</label>
                                    <div class="layui-input-block">
WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer.html
@@ -21,11 +21,7 @@
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">客户代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
@@ -50,11 +46,11 @@
                        <table class="" id="mainTable" lay-filter="mainTable"> </table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" ><i class="layui-icon layui-icon-form"></i>删除</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-form"></i>新增</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>修改</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-form"></i>禁用</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-form"></i>反禁用</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-form"></i>禁用</button>-->
                                <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-form"></i>反禁用</button>-->
                            </div>
                        </script>
@@ -180,6 +176,7 @@
            }
            //快速查询按钮
            function get_FastQuery() {
                var ajaxLoad = layer.load();
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
@@ -197,11 +194,14 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>生产任务单列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,10 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -37,9 +40,9 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">订单跟踪号</label>
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -67,12 +70,16 @@
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>下推</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>下推</button>-->
                            </div>
                        </script>
                    </form>
@@ -100,106 +107,151 @@
            , laydate = layui.laydate
            //var sWhere = " äº§å“ä»£ç  = 'BX0002'";
            var sWhere = "";
            var sWhere = "";
            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                ,height: 'full-50'
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    , { field: '日期', title: '日期', sort: true, width: 120 }
                    , { field: '单据号', title: '单据号', sort: true, width: 170 }
                    , { field: '订单跟踪号', title: '订单跟踪号', width: 105 }
                    //, { field: 'HDeptID', title: 'HDeptID' }
                    , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                    , { field: '生产车间', title: '生产车间', width: 115 }
                    //, { field: 'HMaterID', title: 'HMaterID' }
                    , { field: '产品代码', title: '产品代码', width: 160 }
                    , { field: '产品名称', title: '产品名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 215 }
                    //, { field: 'hunitid', title: 'hunitid' }
                    , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                    , { field: '计量单位', title: '计量单位' }
                    //, { field: 'hempid', title: 'hempid' }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }
                    , { field: '业务员', title: '业务员' }
                    , { field: 'hcusid', title: 'hcusid' }
                    , { field: '客户代码', title: '客户代码' }
                    , { field: '客户', title: '客户' }
                    //, { field: 'HCenterID', title: 'HCenterID' }
                    , { field: '工作中心代码', title: '工作中心代码' }
                    , { field: '工作中心', title: '工作中心' }
                    //, { field: 'hbomid', title: 'hbomid' }
                    , { field: 'BOM单编码', title: 'BOM单编码' }
                    //, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
                    , { field: '工艺路线代码', title: '工艺路线代码' }
                    , { field: '工艺路线', title: '工艺路线' }
                    , { field: '计划开工日期', title: '计划开工日期' }
                    , { field: '计划完工日期', title: '计划完工日期' }
                    , { field: '最迟开工日期', title: '最迟开工日期' }
                    , { field: '最迟完工日期', title: '最迟完工日期' }
                    , { field: '齐套数量', title: '齐套数量' }
                    , { field: '计划生产数量', title: '计划生产数量' }
                    , { field: '关联数量', title: '关联数量' }
                    , { field: '未关联数量', title: '未关联数量' }
                    , { field: '表头备注', title: '表头备注' }
                    //, { field: 'hsubid', title: 'hsubid' }
                    , { field: '源单单号', title: '源单单号' }
                    , { field: '源单主内码', title: '源单主内码' }
                    , { field: '源单子内码', title: '源单子内码' }
                    , { field: '制单人', title: '制单人' }
                    , { field: '制单日期', title: '制单日期' }
                    , { field: '审核人', title: '审核人' }
                    , { field: '审核日期', title: '审核日期' }
                    , { field: '修改人', title: '修改人' }
                    , { field: '修改日期', title: '修改日期' }
                    , { field: '关闭人', title: '关闭人' }
                    , { field: '关闭日期', title: '关闭日期' }
                    , { field: '作废人', title: '作废人' }
                    , { field: '作废日期', title: '作废日期' }
                    , { field: '行关闭人', title: '行关闭人' }
                    , { field: '关闭类型', title: '关闭类型' }
                    , { field: '单据类型', title: '单据类型' }
                    , { field: '计划跟踪号', title: '计划跟踪号' }
                ]]
            };
            //进入页面显示的缓存列表
            var index0 = layer.load(0, { shade: false });
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index0);
                    } else {
                        layer.close(index0);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index0);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            //初始化界面
            set_ClearBill();
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //下推
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#WorkCenter").val("");//单据号
                $("#btnSearch").click();
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                get_FastQuery();
            });
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //#endregion
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                        , { field: '日期', title: '日期', sort: true, width: 120 }
                        , { field: '单据号', title: '单据号', sort: true, width: 170 }
                        , { field: '订单跟踪号', title: '订单跟踪号', width: 105 }
                        //, { field: 'HDeptID', title: 'HDeptID' }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间', width: 115 }
                        //, { field: 'HMaterID', title: 'HMaterID' }
                        , { field: '产品代码', title: '产品代码', width: 160 }
                        , { field: '产品名称', title: '产品名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        //, { field: 'hunitid', title: 'hunitid' }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '计量单位', title: '计量单位' }
                        //, { field: 'hempid', title: 'hempid' }
                        , { field: '业务员代码', title: '业务员代码', width: 100 }
                        , { field: '业务员', title: '业务员' }
                        , { field: 'hcusid', title: 'hcusid' }
                        , { field: '客户代码', title: '客户代码' }
                        , { field: '客户', title: '客户' }
                        //, { field: 'HCenterID', title: 'HCenterID' }
                        , { field: '工作中心代码', title: '工作中心代码' }
                        , { field: '工作中心', title: '工作中心' }
                        //, { field: 'hbomid', title: 'hbomid' }
                        , { field: 'BOM单编码', title: 'BOM单编码' }
                        //, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
                        , { field: '工艺路线代码', title: '工艺路线代码' }
                        , { field: '工艺路线', title: '工艺路线' }
                        , { field: '计划开工日期', title: '计划开工日期' }
                        , { field: '计划完工日期', title: '计划完工日期' }
                        , { field: '最迟开工日期', title: '最迟开工日期' }
                        , { field: '最迟完工日期', title: '最迟完工日期' }
                        , { field: '齐套数量', title: '齐套数量' }
                        , { field: '计划生产数量', title: '计划生产数量' }
                        , { field: '关联数量', title: '关联数量' }
                        , { field: '未关联数量', title: '未关联数量' }
                        , { field: '表头备注', title: '表头备注' }
                        //, { field: 'hsubid', title: 'hsubid' }
                        , { field: '源单单号', title: '源单单号' }
                        , { field: '源单主内码', title: '源单主内码' }
                        , { field: '源单子内码', title: '源单子内码' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期' }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期' }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期' }
                        , { field: '关闭人', title: '关闭人' }
                        , { field: '关闭日期', title: '关闭日期' }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期' }
                        , { field: '行关闭人', title: '行关闭人' }
                        , { field: '关闭类型', title: '关闭类型' }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: '计划跟踪号', title: '计划跟踪号' }
                    ]]
                };
            }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
@@ -216,40 +268,44 @@
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                }
                var index = layer.load(0, { shade: false });
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            });
            }
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //下推
                    case 'set_pushDown': set_pushDown();
                        break;
                };
            });
            //下推单据
            function set_pushDown() {
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#WorkCenter").val("");//单据号
                $("#btnSearch").click();
                sWhere = "";
            }
            //#endregion
            ////进入页面显示的缓存列表
            //var index0 = layer.load(0, { shade: false });
            //$.ajax({
            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
            //    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
            //    type: "GET",
            //    data: { "sWhere": sWhere },
            //    success: function (data1) {
            //        if (data1.count == 1) {
            //            option.data = data1.data;
            //            table.render(option);
            //            layer.close(index0);
            //        } else {
            //            layer.close(index0);
            //            layer.alert(data1.code + data1.Message, { icon: 5 });
            //        }
            //    }, error: function () {
            //        layer.close(index0);
            //        layer.alert("接口请求失败!", { icon: 5 });
            //    }
            //});
            //编辑单据
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length === 1) {
@@ -265,13 +321,52 @@
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hmainid = data[0].hmainid;
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + 'DeltetSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": hmainid },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            //#endregion
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
            //以上是layui模块
        });
WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillList.html
@@ -302,7 +302,7 @@
                        , area: ['100%', '100%']
                        , title: '质量汇报单-浏览'
                        , shift: 0//弹出动画
                        , content: '../生产质量汇报单/Add_Edit_Gy_Sc_QualityReportBillListnew.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
                        , content: '../质量汇报单/Add_Edit_Gy_Sc_QualityReportBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据浏览!');
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -9,6 +9,11 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
@@ -44,6 +49,10 @@
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">保存</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">
                            <i class="layui-icon layui-icon-logout layuiadmin-button-btn"><span class="btn-title">退出</span></i>
                        </button>
                        <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>-->
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -328,10 +337,7 @@
        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
        {{#  } }}
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
@@ -465,6 +471,7 @@
                        }
                        break;
                }
            });
            //行内事件
@@ -829,6 +836,15 @@
            else {
                return true;
            }
            //退出按钮
            form.on('submit(Cancel)', function () {
                if (OperationType == 1) {
                    Pub_Close(2);
                }
                else if (OperationType == 2) {
                    Pub_Close(1);
                }
            })
        }
    </script>
</body>
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>工艺路线列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,11 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -19,11 +23,6 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -31,7 +30,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="hnumber" id="hnumber">
                                    </div>
@@ -52,13 +51,11 @@
                        <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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
@@ -67,10 +64,6 @@
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -87,87 +80,147 @@
            , laydate = layui.laydate
            //var sWhere = " äº§å“ä»£ç  = 'BX0002'";
            var sWhere = "";
            var option = [];
            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                ,height: 'full-50'
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', width: 110 }
                    { field: '单据号', title: '单据号', sort: true, width: 165 }
                    , { field: '单据类型', title: '单据类型' }
                    , { field: '工艺名称', title: '工艺名称', width: 170 }
                    //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 215 }
                    , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                    , { field: '计量单位', title: '计量单位' }
                    , { field: '默认工艺', title: '默认工艺' }
                    , { field: '表头备注', title: '表头备注' }
                    //, { field: 'hsubid', title: 'hsubid', width: 80 }
                    , { field: '工序号', title: '工序号' }
                    , { field: '委外标记', title: '委外标记' }
                    //, { field: 'hprocid', title: 'hprocid', width: 105 }
                    , { field: '工序代码', title: '工序代码' }
                    , { field: '工序', title: '工序' }
                    //, { field: 'HSupID', title: 'HSupID', width: 105 }
                    , { field: '供应商代码', title: '供应商代码' }
                    , { field: '供应商', title: '供应商' }
                    //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                    , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                    , { field: '工作中心名称', title: '工作中心名称', width: 115 }
                    , { field: '时间单位', title: '时间单位' }
                    , { field: '运行时间', title: '运行时间' }
                    , { field: '加工数量', title: '加工数量' }
                    , { field: '准备时间', title: '准备时间' }
                    , { field: '排队时间', title: '排队时间' }
                    , { field: '转移时间', title: '转移时间' }
                    , { field: '良率', title: '良率' }
                    , { field: '累计良率', title: '累计良率' }
                    , { field: '表体备注', title: '表体备注' }
                    , { field: '制单人', title: '制单人' }
                    , { field: '制单日期', title: '制单日期' }
                    , { field: '审核人', title: '审核人' }
                    , { field: '审核日期', title: '审核日期' }
                    , { field: '修改人', title: '修改人' }
                    , { field: '修改日期', title: '修改日期' }
                    , { field: '作废人', title: '作废人' }
                    , { field: '作废日期', title: '作废日期' }
                    //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                    //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                    //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                    //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                    , { field: '加工单价', title: '加工单价' }
                    //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                    , { field: '下道流转工序', title: '下道流转工序'}
                    , { field: '流转工序', title: '流转工序' }
                ]]
            };
            var index = layer.load(0, { shade: false });
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //浏览
                    case 'get_PrintReport': get_PrintReport();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
            //#endregion
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //#endregion
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        //{ field: 'hmainid', title: 'hmainid', width: 110 }
                        ,{ field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: '工艺名称', title: '工艺名称', width: 170 }
                        //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                        , { field: '物料代码', title: '物料代码', width: 160 }
                        , { field: '物料名称', title: '物料名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '默认工艺', title: '默认工艺' }
                        , { field: '表头备注', title: '表头备注' }
                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
                        , { field: '工序号', title: '工序号' }
                        , { field: '委外标记', title: '委外标记' }
                        //, { field: 'hprocid', title: 'hprocid', width: 105 }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序', title: '工序' }
                        //, { field: 'HSupID', title: 'HSupID', width: 105 }
                        , { field: '供应商代码', title: '供应商代码' }
                        , { field: '供应商', title: '供应商' }
                        //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                        , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                        , { field: '工作中心名称', title: '工作中心名称', width: 115 }
                        , { field: '时间单位', title: '时间单位' }
                        , { field: '运行时间', title: '运行时间' }
                        , { field: '加工数量', title: '加工数量' }
                        , { field: '准备时间', title: '准备时间' }
                        , { field: '排队时间', title: '排队时间' }
                        , { field: '转移时间', title: '转移时间' }
                        , { field: '良率', title: '良率' }
                        , { field: '累计良率', title: '累计良率' }
                        , { field: '表体备注', title: '表体备注' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', width: 195 }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', width: 180 }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期', width: 180 }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期' }
                        //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                        //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                        //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                        //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                        , { field: '加工单价', title: '加工单价' }
                        //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                        , { field: '下道流转工序', title: '下道流转工序', width:150 }
                        , { field: '流转工序', title: '流转工序' }
                    ]]
                };
            }
            //var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            //$.ajax({
            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
            //    url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
            //    type: "GET",
            //    data: { "sWhere": sWhere },
            //    success: function (data1) {
            //        if (data1.count == 1) {
            //            option.data = data1.data;
            //            table.render(option);
            //            layer.close(index);
            //        } else {
            //            layer.close(index);
            //            layer.alert(data1.code + data1.Message, { icon: 5 });
            //        }
            //    }, error: function () {
            //        layer.close(index);
            //        layer.alert("接口请求失败!", { icon: 5 });
            //    }
            //});
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
            }
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {//选择仓位
                get_FastQuery();
            });
            //#endregion
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
@@ -175,22 +228,12 @@
                $("#hnumber").val("");//物料
                $("#HOrderProcNO").val("");//单据类型
                $("#btnSearch").click();
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                var hnumber = $("#hnumber").val();//物料
                var WorkCenter = $("#WorkCenter").val();//单据号
                if (HOrderProcNO) {
                    sWhere += " and å•据类型 like '%" + HOrderProcNO + "%'";
                }
                if (hnumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + hnumber + "%' or ç‰©æ–™åç§° like '%" + hnumber + "%'"
                }
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
@@ -200,25 +243,117 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                var hnumber = $("#hnumber").val();
                //var HName = $("#HName").val();
                var WorkCenter = $("#WorkCenter").val();//单据号
                if (HOrderProcNO) {
                    sWhere += " and å•据类型 like '%" + HOrderProcNO + "%'";
                }
                if (hnumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + hnumber + "%' or ç‰©æ–™åç§° like '%" + hnumber + "%'";
                }
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            });
            }
            //#endregion
            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '工作中心-新增'
                    , shift: 0//弹出动画
                    , content: '../工艺路线/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID;
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工作中心-编辑'
                        , shift: 0//弹出动画
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#endregion
            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hmainid = data[0].hmainid;
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
                        type: "GET",
                        data: { "lngBillKey": hmainid },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
            //以上是layui模块
        });
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html
@@ -22,55 +22,47 @@
    </div>
    <div class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <div class="layui-card-body">
                        <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
                        <form class="layui-form" action="">
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                <div class="layui-card" style="padding: 1px">
                    <div class="layui-card-body" style="padding: 1px;">
                        <form class="layui-form" action="" lay-filter="component-form-group">
                            <div class="layui-collapse">
                                <div class="layui-colla-item">
                                    <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="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                    <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="HDate1" id="HDate1">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                    <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="HDate2" id="HDate2">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
                                    <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>
                        </form>
                        <!--</div>-->
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                                 <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="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                        </div>
                    </script>
                    </form>
                </div>
            </div>
        </div>
              </div>
          </div>
    </div>
    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
@@ -161,18 +153,18 @@
                  { type: 'checkbox', fixed: 'left' }
                  , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                  , { field: 'hsubid', title: 'hsubid' ,hide: true }
                  , { field: '日期', title: '日期', sort: true, width: 120 }
                  , { field: '日期', title: '日期', sort: true, width: 170 }
                  , { field: '单据号', title: '单据号', sort: true, width: 170 }
                  , { field: '表头备注 ', title: '表头备注', width: 105 }
                  , { field: '生产资源名称', title: '生产资源名称' }
                  , { field: '生产资源代码', title: '生产资源代码' }
                  , { field: '生产资源名称', title: '生产资源名称', width: 125 }
                  , { field: '生产资源代码', title: '生产资源代码', width: 125 }
                  , { field: '产品内码', title: '产品内码' }
                  , { field: '产品名称', title: '产品名称' }
                  , { field: '产品型号', title: '产品型号', width: 115 }
                  , { field: '检验员代码', title: '检验员代码', width: 115 }
                  , { field: '检验员代码', title: '检验员代码', width: 175 }
                  , { field: '检验员名称', title: '检验员名称' }
                  , { field: '制单人', title: '制单人', width: 160 }
                  , { field: '制单日期', title: '制单日期', width: 160 }
                  , { field: '制单日期', title: '制单日期', width: 195 }
                  , { field: '审核人', title: '审核人', width: 160 }
                  , { field: '审核日期', title: '审核日期', width: 160 }
                  , { field: '修改人', title: '修改人', width: 160 }