yangle
2022-11-14 62a41c8f5f69c119b5c72758dd6546bb35a75543
审核流程单  修改
4个文件已修改
336 ■■■■ 已修改文件
WebTM/views/系统管理/多级审批/审核流程单/Xt_CheckFlowEdit.html 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/多级审批/审核流程单/Xt_CheckFlowList.html 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/ϵͳ¹ÜÀí/¶à¼¶ÉóÅú/ÉóºËÁ÷³Ìµ¥/Xt_CheckFlowEdit.html
@@ -133,37 +133,8 @@
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var HSouceBillType = params[params[2]];  //从单据获取 æºå•类型
            //判断是否新增
            if (linterid == null || linterid == 0) {
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '8803' },
                    success: function (d) {
                        //赋值
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HName").val(d.data[0].HBillNo);
                    }
                });
            }
            else {//如果修改则走下面 new
             /*   RoadBillMain(linterid, linteridSub);*/
            }
            set_ClearBill();
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../../user/login.html"; });
            //}
            var option = {
                elem: '#mainTable'
@@ -191,6 +162,39 @@
            }];
            option.data = rowdata;
            table.render(option);
            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var OperationType = params[params[1]]; //从参数中获取 å•据内码
            //判断是否新增
            if (linterid == null || linterid == 0) {
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '8803' },
                    success: function (d) {
                        //赋值
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HName").val(d.data[0].HBillNo);
                    }
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid);
            }
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../../user/login.html"; });
            //}
            //#endregion
@@ -465,6 +469,64 @@
                });
            }
            //编辑状态时,根据内码,获取信息并写入界面
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = "and Hmainid=" + linterid;
                //查询审核项目设置是否存在
                $.ajax({
                    url: GetWEBURL() + "/Xt_CheckFlowBill/Xt_CheckFlowBillList",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (d) {
                        if (d.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = d.data[0];
                            var HStandard = data["默认流程"];
                            //禁用标记
                            if (HStandard) {
                                $("input[name='HStandard']").attr("checked", true);
                                $("#HStandard").val(true);
                            }
                            form.render('checkbox');
                            //主表
                            form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HName": d.data[0].流程名称
                                , "HInterID": d.data[0].Hmainid
                                , "HBillTypeID": d.data[0].HBillTypeID
                                , "HDeptID": d.data[0].HDeptID
                                , "HDeptIDName": d.data[0].部门
                                , "HRemark": d.data[0].备注
                            });
                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < d.data.length; i++) {
                                rowdata.push(
                                    {
                                        "HFlowNo": d.data[i].流程号, "HCheckItemID": d.data[i].HCheckItemID, "HCheckItemNumber": d.data[i].HCheckItemNumber
                                        , "HCheckItemName": d.data[i].HCheckItemName, "HJumpFlag": d.data[i].是否允许跳过 == 1 ? true : false
                                        , "HMakerSelf": d.data[i].HMakerSelf == 1 ? true : false, "HCheckMan": d.data[i].HCheckMan
                                    }
                                )
                            }
                            option.data = rowdata;
                            table.render(option);
                            for (var i = 0; i < d.data.length; i++) {
                                if (d.data[i].是否允许跳过) {
                                    $('#HJumpFlag' + (i + 1)).attr("checked", true);
                                }
                                if (d.data[i].HMakerSelf) {
                                    $('#HMakerSelf' + (i + 1)).attr("checked", true);
                                }
                            }
                            form.render('checkbox');
                        }
                    }
                })
            }
            //验证
            function AllowLoadData() {
              
WebTM/views/ϵͳ¹ÜÀí/¶à¼¶ÉóÅú/ÉóºËÁ÷³Ìµ¥/Xt_CheckFlowList.html
@@ -79,7 +79,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>新增</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>编辑</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>列设置</button>
@@ -131,6 +131,10 @@
                //新增按钮
                case 'btn-Add':
                    set_AddNew();
                    break;
                //编辑按钮
                case 'btn-Edit':
                    set_Edit();
                    break;
                case 'btn-Delete':
                    set_DeleteBill();
@@ -372,7 +376,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '../审核流程单/Xt_CheckFlowEdit.html',
                content: '../审核流程单/Xt_CheckFlowEdit.html?linterid=0&HSouceBillType=1',
                end: function () {
                    //刷新页面,
                    get_FastQuery(table, option);
@@ -383,6 +387,36 @@
            });
        }
        //修改
        function set_Edit() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].Hmainid;
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增审核流程单',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../审核流程单/Xt_CheckFlowEdit.html?linterid=' + linterid +'&HSouceBillType=3',
                    end: function () {
                        //刷新页面,
                        get_FastQuery(table, option);
                    },
                    success: function (layero, index) {
                    }
                });
            } else {
                layer.msg('请选择一行数据编辑!');
            }
        }
        // åˆ·æ–°
        function get_Refresh() {
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -53,10 +53,12 @@
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal"  lay-submit="" lay-filter="btnSearch" >预览</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">新增</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">修改</button>
                        <!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal"  lay-submit="" lay-filter="btnSearch" >预览</button>
    <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">新增</button>
    <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">修改</button>-->
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -464,50 +466,6 @@
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化表格
            DisPlay_HideColumn();
            //制单人
            $("#HMaker").val(sessionStorage["HUserName"]);
            //组织
            Organ();
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3301' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
            }
            else {//如果修改则走下面 new
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
@@ -593,6 +551,66 @@
            option.data = rowdata;
            table.render(option);
            //制单人
            $("#HMaker").val(sessionStorage["HUserName"]);
            //组织
            Organ();
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3301' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
            }
            else if (OperationType == 2) {
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid);
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3301' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").attr("readOnly", false);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
            }
            else {//如果修改则走下面 new
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
            //初始化表格
            DisPlay_HideColumn();
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
@@ -627,7 +645,7 @@
                get_checkRoutingGroup();
            });
            //是否默认工艺
            form.on('checkbox(checkboxHStandard)', function (data) {
                $("#HStandard").val(data.elem.checked);
@@ -823,7 +841,16 @@
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                set_AddNew(data);
                    set_AddNew(data);
                }
            });
            //退出
            form.on('submit(btnEdit)', function (data) {
                if (OperationType == 1) {
                    Pub_Close(2);
                } else {
                    Pub_Close(1);
                }
            });
@@ -938,7 +965,7 @@
                //window.close();//关闭当前页
            })
            form.on('submit(Saver)', function (data) { //保存
                //debugger;
                var sMainStr = JSON.stringify(data.field);
@@ -1340,6 +1367,7 @@
                $.ajax({
                    url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (d) {
@@ -1352,13 +1380,13 @@
                        }
                        //主表
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HBillNo": d.data[0].单据号
                            , "HInterID": d.data[0].hmainid
                            "HBillNo": OperationType == 2 ? "" : d.data[0].单据号
                            , "HInterID": OperationType == 2 ? 0 :d.data[0].hmainid
                            , "HDate": Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")
                            , "HName": d.data[0].工艺名称
                            , "HMaterNumber": d.data[0].物料代码
                            , "HMaterName": d.data[0].物料名称
                            , "HMaterID": d.data[0].hmaterid
                            , "HMaterNumber": OperationType == 2 ? "" : d.data[0].物料代码
                            , "HMaterName": OperationType == 2 ? "" : d.data[0].物料名称
                            , "HMaterID": OperationType == 2 ? "" : d.data[0].HMaterID
                            , "HUnitName": d.data[0].计量单位
                            , "HUnitID": d.data[0].hunitid
                            , "HMainTimeUnit": d.data[0].运行时间单位
@@ -1385,7 +1413,7 @@
                            , "HOrgID": d.data[0].HOrgID
                        });
                         //子表  èµ‹å€¼
                        //子表  èµ‹å€¼
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            rowdata.push(
@@ -1446,7 +1474,7 @@
                var sSubStr = JSON.stringify(num);
                //var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
                    type: "POST",
@@ -1457,14 +1485,7 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();关闭页签
                            //        //window.close();//关闭页面,浏览器有效,PDA无效
                            //        parent.location.href = "../../../views/index.html"
                            //    }//关闭
                            //}, function () { window.location.reload(); });//新增
                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                            layer.close(index);
                            layer.msg("提交成功");
                        }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -89,6 +89,7 @@
                            <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_Copy"><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>
@@ -149,6 +150,9 @@
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //浏览
                    case 'get_PrintReport': get_PrintReport();
@@ -486,6 +490,29 @@
            }
            //#endregion
            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工艺路线-编辑'
                        , shift: 0//弹出动画
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();