Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yxj

2024-12-06 24ee69cf7ec887b3319e6a7b199e5b7c47e5c2dc

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -77,6 +77,7 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">多级审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">多级反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">驳回</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_WithdrawCheck_Flow" id="set_WithdrawCheck_Flow">撤回</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -681,7 +682,8 @@
                    //, { field: 'HAutoTrunFlag', title: '自动移转', templet: "#HAutoTrunFlag" }//chenbox
                    //, { field: 'HProcCheckNote', title: '本工序确认记录', edit: 'text' }
                    //, { field: 'HProcWorkNum', title: '程序号', edit: 'text' }
                    //, { field: 'HWorkTimes_S', title: '产品单件工时', edit: 'text' }
                    /* , { field: 'HWorkTimes_S', title: '产品单件工时', edit: 'text' }*/
                    , { field: 'HWorkTimes_S', title: '单件生产节拍', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                //, done: function (res, curr, count) {
@@ -1013,7 +1015,10 @@
            form.on('submit(set_RejectCheck_Flow)', function (data) {
                set_RejectCheck_Flow();
            });

            //撤回
            form.on('submit(set_WithdrawCheck_Flow)', function (data) {
                set_WithdrawCheck_Flow();
            });
            //复制
            form.on('submit(set_Copy)', function (data) {
                set_Copy();
@@ -1987,6 +1992,39 @@
            }
            //#endregion

            //#region æ’¤å›ž
            function set_WithdrawCheck_Flow() {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/WithdrawCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择在审批流的单据驳回！');
                }
            }
            //#endregion

            //#region å¤åˆ¶
            function set_Copy() {
                //制单人