报工平台 完工单审核功能，web完工单列表、编辑、审核

YL

2021-08-13 8938589be5948c6467cc6709d69f4c192fa2d07a

报工平台 完工单审核功能，web完工单列表、编辑、审核

 WebTM/views/PublicPage/UserInformation.html

@@ -241,6 +241,7 @@
        {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            sWhere1 = " where 1=1 ";
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html

@@ -116,19 +116,31 @@
                                </div>
                            </div>
                        </div>

                        <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>

                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">保养项信息</li>
                                <li>配件信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                          </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                        
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                        
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
                             {{d.LAY_TABLE_INDEX+1}}
                         </script>
                    </form>
                </div>
            </div>
@@ -169,8 +181,11 @@
                , laydate = layui.laydate
                , element = layui.element;
            var option;
            var option2;
            var option1;
            var sBillType = "3807";
            var TabRow = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " };
            var TabRow1 = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " };
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -535,17 +550,27 @@
            //初始化表格
            function set_InitGrid()
            {
                Table1();  //保养项列表
                Table2();  //配件项列表
              
            }

            //初始化保养项列表
            function Table1()
            {
                //表头
                columns = [ 
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HMaterID', title: '配件代码', edit: 'text', event: "" }
                    , { field: 'HUnitID', title: '单位代码', edit: 'text', event: "" }
                    , { field: 'HQty', title: '实际用量', edit: 'text' }
                    , { field: 'HQtyMust', title: '标准用量', edit: 'text' }
                    , { field: 'HManagerID', title: '负责人代码', edit: 'text' }
                    , { field: 'HMaintainItemID', title: '保养项目ID', edit: 'text', event: "" }
                    , { field: 'HMaintainNumber', title: '保养项目代码', edit: 'text', event: "" }
                    , { field: 'HMaintainItem', title: '保养项目', edit: 'text', event: "" }
                    , { field: 'HMaintainPart', title: '保养部位', edit: 'text', event: "" }
                    , { field: 'HClaim', title: '具体要求', edit: 'text', event: "" }
                    , { field: 'HManagerID', title: '负责人ID', edit: 'text' }
                    , { field: 'HManagerNumber', title: '负责人代码', edit: 'text' }
                    , { field: 'HManagerName', title: '负责人', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
                option = {
                    id: 'mainTable'
@@ -561,13 +586,45 @@
                };
            }

            //初始化配件项列表
            function Table2() {
                //表头
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HMaintainItemID', title: '保养项目ID', edit: 'text', event: "" }
                    , { field: 'HMaintainNumber', title: '保养项目代码', edit: 'text', event: "" }
                    , { field: 'HMaintainItem', title: '保养项目', edit: 'text', event: "" }
                    , { field: 'HMaintainPart', title: '保养部位', edit: 'text', event: "" }
                    , { field: 'HClaim', title: '具体要求', edit: 'text', event: "" }
                    , { field: 'HManagerID', title: '负责人ID', edit: 'text' }
                    , { field: 'HManagerNumber', title: '负责人代码', edit: 'text' }
                    , { field: 'HManagerName', title: '负责人', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                ];
                option2 = {
                    id: 'mainTable1'
                    , elem: '#mainTable1'
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 120
                    , height: 500
                    , cols: [columns]
                    , done: function (res, curr, count) {

                    }
                };
            }

            //无源单新增
            function set_AddFNew()
            {
                //获取最大单据号
                get_MAXNum();
                //get_MAXNum();
                option.data = [TabRow];
                option2.data = [TabRow1];
                table.render(option);
                table.render(option2);
            }

            //编辑
@@ -577,6 +634,8 @@
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [TabRow];
                table.render(option);
                option2.data = [TabRow1];
                table.render(option2);
            }

            //获取最大单据号及默认值赋值
@@ -654,7 +713,7 @@
                $.ajax({
                    url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai',
                    type: "GET",
                    data: { "sqlWhere": "and HInterID=" + linterid },
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.data;

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

@@ -88,6 +88,7 @@
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>

@@ -619,9 +620,14 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                layer.close(layer.index);
                                window.parent.location.reload();
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    SaveVerify(); //审核
                                }
                            });
                        }
                        else {
@@ -634,9 +640,45 @@
                })
            });

            //审核按钮提交
            form.on('submit(VerIfySaver)', function (data) {
                SaveVerify();
            });

            //审核提交
            function SaveVerify() {
                var InterID = $("#HInterID").val();
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //方法所在页面和方法名
                    async: true,
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }

            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
            });



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

@@ -36,11 +36,23 @@
                                        <input type="date" class="layui-input" id="HDate1">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">订单跟踪号</label>
                                <div class="layui-inline">
                                    <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="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产资源</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HSource" id="HSource">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                      <label class="layui-form-label">订单跟踪号</label>
                                      <div class="layui-input-block">
                                          <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                      </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>
@@ -53,24 +65,20 @@
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <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>
                                    </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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -134,19 +142,24 @@
                        break;
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': set_Refresh();
                        break;
                    //审核按钮
                    case 'btn-Audit': set_CheckBill();
                        break;
                    //反审核按钮
                    case 'btn-DeAudit': set_AbandonCheck();
                    //退出
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                var ajaxLoad = layer.load();
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HSource = $("#HSource").val();//生产资源
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
@@ -156,7 +169,9 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                var index = layer.load(0, { shade: false });
                if (HSource) {
                    sWhere += " and èµ„源代码 like '%" + HSource + "%' or èµ„源名称 like '%" + HSource + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
                    type: "GET",
@@ -165,14 +180,13 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(index);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
@@ -181,9 +195,10 @@

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#WorkCenter").val("");//单据号
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HSource").val("");//生产资源
                $("#btnSearch").click();
            });
            //#endregion
@@ -202,6 +217,8 @@

            //初始化表格
            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -213,7 +230,8 @@
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号' }
                        , { field: 'HBillType', title: 'HBillType', hide: true }
                        , { field: '单据类型', title: '单据类型', hide: true }
                        , { field: 'HBillStatus', title: '单据状态', width: 160 }
                        , { field: '任务单号', title: '任务单号' }
                        , { field: '工序计划单号', title: '工序计划单号' }
                        , { field: '工序流转卡号', title: '工序流转卡号' }
@@ -311,6 +329,11 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
@@ -342,6 +365,11 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                        layer.msg('单据状态不为未审核状态,不允许删除！');
                        return false;
                    }
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
@@ -373,6 +401,11 @@
                }
            }

            //刷新
            function set_Refresh() {
                $("#btnSearch").click();
            }

            //审核
            function set_CheckBill() {
                var checkStatus = table.checkStatus('mainTable')

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

@@ -88,6 +88,7 @@
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>

@@ -769,6 +770,9 @@
            });





            //保存提交
            form.on('submit(Saver)', function (data) {
                var sMainStr = JSON.stringify(data.field);
@@ -784,9 +788,14 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                layer.close(layer.index);
                                window.parent.location.reload();
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    SaveVerify(); //审核
                                }
                            });
                        }
                        else {
@@ -799,9 +808,45 @@
                })
            });

            //审核按钮提交
            form.on('submit(VerIfySaver)', function (data) {
                SaveVerify();
            });

            //审核提交
            function SaveVerify() {
                var InterID = $("#HInterID").val();
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESEndWorkBill/AuditProcessReportList", //方法所在页面和方法名
                    async: true,
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }

            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
            });

            //#endregion

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

@@ -40,6 +40,18 @@
                                        <input type="date" class="layui-input" id="HDate1">
                                    </div>
                                </div>
                                <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>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产资源</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HSource" id="HSource">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                    <div class="layui-input-block">
@@ -72,24 +84,20 @@
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <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>
                                    </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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>

                            </div>
                        </script>
@@ -153,19 +161,24 @@
                        break;
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': set_Refresh();
                        break;
                    //审核按钮
                    case 'btn-Audit': set_CheckBill();
                        break;
                    //反审核按钮
                    case 'btn-DeAudit': set_AbandonCheck();
                    //退出
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
            form.on('submit(btnSearch)', function (data) {
                var ajaxLoad = layer.load();
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HSource = $("#HSource").val();//生产资源
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
@@ -175,7 +188,9 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                var index = layer.load(0);
                if (HSource) {
                    sWhere += " and èµ„源代码 like '%" + HSource + "%' or èµ„源名称 like '%" + HSource + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
                    type: "GET",
@@ -184,14 +199,13 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(index);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
@@ -201,9 +215,10 @@

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HSource").val("");//生产资源
                $("#btnSearch").click();
            });

@@ -222,6 +237,8 @@

            //初始化表格
            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -234,6 +251,7 @@
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160 }
                        , { field: 'HBillStatus', title: '单据状态', width: 160 }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门名称', title: '部门名称', width: 200 }
                        , { field: '班组代码', title: '班组代码', width: 115 }
@@ -307,6 +325,11 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var linterid = data[0].hmainid.toString();
                            var HBillStatus = data[0].HBillStatus.toString();
                            if (HBillStatus != "1") {
                                layer.msg('单据状态不为未审核状态,不允许编辑！');
                                return false;
                            }
                            //if (AllowLoadData(sSubStr) != false) {//非空验证
                            layer.open({
                                type: 2
@@ -338,6 +361,11 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                        layer.msg('单据状态不为未审核状态,不允许编辑！');
                        return false;
                    }
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
@@ -369,6 +397,11 @@
                }
            }

            //刷新
            function set_Refresh() {
                $("#btnSearch").click();
            }

            //审核
            function set_CheckBill() {
                var checkStatus = table.checkStatus('mainTable')

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

@@ -91,7 +91,7 @@
                        <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 layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -223,9 +223,10 @@

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HSource").val("");//生产资源
                $("#btnSearch").click();
            });
            //#endregion
@@ -310,7 +311,6 @@
            //新增
            function set_AddNew()
            {
                alert("aa");
                //页面层-自定义
                layer.open({
                    type: 2,