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

zrg

2024-10-15 4322ae28f78e1c393eb85eece4d8a4485bb23f7c

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

@@ -194,14 +194,15 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>启用默认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>发起审批</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>查看审批进度</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>多级审核</button>
@@ -300,6 +301,9 @@
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //启用默认
                    case 'set_defaultRoute': set_defaultRoute();
                        break;
                    //发起审批
                    case 'set_startCheckBill': set_startCheckBill();
@@ -1171,6 +1175,39 @@
                get_DisplayPage(sWhere);
            }

            //启用默认
            function set_defaultRoute() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                    layer.confirm("确认要启用该工艺路线为物料默认工艺路线吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Gy_RoutingBill/set_defaultRoute',
                            type: "GET",
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                } else {
                    layer.msg("请选择一条数据!");
                }
            }

            //审核   [1 å®¡æ ¸ã€2 åå®¡æ ¸]
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
@@ -1186,9 +1223,54 @@
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    if (num == 1) {
                                        //检查是否具备启用默认工艺路线的权限，存在，则弹窗提问
                                        $.ajax({
                                            url: GetWEBURL() + '/Gy_RoutingBill/set_defaultRoute_CheckRight',
                                            type: "GET",
                                            async: false,
                                            data: { "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
                                            success: function (result1) {
                                                if (result1.count == 1) {                                        //拥有权限
                                                    layer.confirm("确认要启用该工艺路线为物料默认工艺路线吗?", function (index1) {
                                                        //启用默认工艺路线
                                                        $.ajax({
                                                            url: GetWEBURL() + '/Gy_RoutingBill/set_defaultRoute',
                                                            type: "GET",
                                                            async: false,
                                                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
                                                            success: function (result2) {
                                                                if (result2.count == 1) {
                                                                    get_FastQuery();
                                                                    layer.msg(result2.Message, { icon: 1 });
                                                                } else {
                                                                    layer.alert(result2.code + result2.Message, { icon: 5 });
                                                                }
                                                            }, error: function () {
                                                                layer.alert("接口请求失败!", { icon: 5 });
                                                            }
                                                        });
                                                    })
                                                    get_FastQuery();
                                                    layer.close(wait);
                                                } else {
                                                    get_FastQuery();
                                                    layer.close(wait);
                                                    layer.close(index);
                                                }
                                            }, error: function () {
                                                get_FastQuery();
                                                layer.close(wait);
                                                layer.close(index);
                                            }
                                        });
                                    } else {
                                        get_FastQuery();
                                        layer.close(wait);
                                        layer.close(index);
                                    }
                                    //layer.closeAll('dialog');
                                    
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);