1.更新菜单栏,报工台跳转过来时,根据物料+工序+生产资源带出对应清单信息
2.报工台跳转过来时,根据物料带出对应产品防错验证清单清单信息
4个文件已修改
237 ■■■■■ 已修改文件
WebTM/views/IpadIndex.html 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBill.html 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html
@@ -1056,7 +1056,6 @@
            });
        }
        //当前工单(赋码)按钮点击事件
        function CodingReport(event, obj) {
            if (wktag == 0) {
@@ -1106,6 +1105,65 @@
            });
        }
        //设备启动点检按钮点击事件
        function BeginDotCheck(event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增设备启动点检单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html?OperationType=4&linterid=&HSouceBillType=',
                end: function () {
                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HMaterID": HMaterID,
                        "HProcID": HProcID,
                        "HSourceID": HSourceID1,
                    });
                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            });
        }
        //防错验证清单按钮点击事件
        function PreventErrMouldCheck(event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增防错验证',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '车间管理/防错验证/Qc_PreventErrMouldCheckBill.html?OperationType=4&linterid=&HSouceBillType=',
                end: function () {
                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HMaterID": HMaterID
                    });
                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            });
        }
        //退出
        function Esc(event, obj) {
            parent.location.href = "index.html"
@@ -1334,6 +1392,20 @@
                                    <span class="imgtitle">当前工单(赋码)</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="BeginDotCheck(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">设备启动点检</span>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="PreventErrMouldCheck(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-engine imgicon"></span>
                                    <span class="imgtitle">防错验证</span>
                                </div>
                            </div>
                        </div>
                    </div>
                </fieldset>
WebTM/views/É豸¹ÜÀí/Sb_Add_EqpRepairCheckBillList.html
@@ -624,8 +624,8 @@
                                , "HCheckResult": data.验收结论           //验收结论
                                , "HExplanation": data.摘要               //摘要
                                , "HRemark": data.表头备注                //备注
                                , "HMouldRepairWorkID": data.HMouldRepairWorkID                //备注
                                , "HMouldRepairWorkName": data.HMouldRepairWorkNo                //备注
                                , "HMouldRepairWorkID": data.HMouldRepairWorkID                //维修记录内码
                                , "HMouldRepairWorkName": data.HMouldRepairWorkNo                //维修记录
                            });
WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Sc_WorkBeginDotCheckBill.html
@@ -306,6 +306,15 @@
    </script>
    <script>
        var HMaterID = "";  //物料
        var HSourceID = ""; //生产资源
        var HProcID = "";  //工序
        var edit = function (data) {
            HMaterID = data[0].HMaterID;
            HSourceID = data[0].HSourceID;
            HProcID = data[0].HProcID;
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -331,8 +340,9 @@
            var HOrgIDBar = 0;
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑   4 æŠ¥å·¥å¹³å°æŒ‰é’®è·³è½¬
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            //#endregion
@@ -376,7 +386,6 @@
                $('#HOrgID').attr("disabled", true);
            }
            else if (OperationType == 3) {//如果修改则走下面 new
                //初始化子表
@@ -384,6 +393,23 @@
                
                RoadBillMain(linterid);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
            else if (OperationType==4) {
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化子表
                get_InitGrid();
                //获取报工台跳转数据
                RoadBillEdit(HMaterID, HProcID, HSourceID);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
@@ -1083,7 +1109,7 @@
            //#region é¡¹ç›®é˜¶æ®µè¡¨ï¼šåˆ é™¤æŒ‡å®šè¡Œ
            //#region åˆ é™¤æŒ‡å®šè¡Œ
            function set_GridDelete(obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
@@ -1171,6 +1197,58 @@
            }
            //#endregion
            //#region  æŠ¥å·¥å¹³å°è·³è½¬èµ‹å€¼
            function RoadBillEdit(HMaterID, HProcID, HSourceID)//加载表头
            {
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/Sc_WorkBeginDotCheckBillList",
                    type: "GET",
                    async: false,
                    data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableMain = result.data;
                        var tableSub = result.data;
                        //主表 èµ‹å€¼
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HICMOInterID": tableMain[0]["生产主内码"]
                            , "HICMOEntryID": tableMain[0]["生产子内码"]
                            , "HICMOBillNo": tableMain[0]["生产订单号"]
                            , "HProcExchInterID": tableMain[0]["工序流转卡主内码"]
                            , "HProcExchEntryID": tableMain[0]["工序流转卡子内码"]
                            , "HProcExchBillNo": tableMain[0]["工序流转卡号"]
                            , "HMaterID": tableMain[0]["物料ID"]
                            , "HMaterName": tableMain[0]["物料名称"]
                            , "HSourceID": tableMain[0]["生产资源ID"]
                            , "HSourceName": tableMain[0]["生产资源名称"]
                        });
                        //组织的值HOrgID变化,重新渲染
                        HOrgIDBar = sessionStorage["OrganizationID"];
                        //子表  èµ‹å€¼
                        var rowdata = [];
                        for (var i = 0; i < tableSub.length; i++) {
                            rowdata.push(
                                {
                                    "HCheckNoteItemID": tableSub[i]["检查项目ID"],
                                    "HCheckNoteItemName": tableSub[i]["检查项目"],
                                    "HCheckPostID": tableSub[i]["确认者角色ID"],
                                    "HCheckPostName": tableSub[i]["确认者角色"],
                                    "HCheckResult": "",
                                    "HRemark":""
                                }
                            );
                        }
                        option.data = rowdata;
                        table.render(option);
                    }
                })
            }
            //#endregion
            //#endregion
WebTM/views/³µ¼ä¹ÜÀí/·À´íÑéÖ¤/Qc_PreventErrMouldCheckBill.html
@@ -252,6 +252,10 @@
    </script>
    <script>
        var HMaterID = "";  //物料
        var edit = function (data) {
            HMaterID = data[0].HMaterID;
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -277,7 +281,7 @@
            var HOrgIDBar = 0;
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑 4报工台跳转
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            //#endregion
@@ -322,14 +326,30 @@
                $('#HOrgID').attr("disabled", true);
            }
            else if (OperationType == 3) {//如果修改则走下面 new
                //初始化子表
                get_InitGrid();
                RoadBillMain(linterid);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
            else if (OperationType==4) {
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化子表
                get_InitGrid();
                //获取报工台跳转数据
                RoadBillEdit(HMaterID);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
@@ -904,6 +924,55 @@
            }
             //#endregion
            //#region  æŠ¥å·¥å¹³å°è·³è½¬èµ‹å€¼
            function RoadBillEdit(HMaterID)//加载表头
            {
                $.ajax({
                    url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/Qc_PreventErrMouldCheckBillList",
                    type: "GET",
                    async: false,
                    data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableMain = result.data;
                        var tableSub = result.data;
                        //主表 èµ‹å€¼
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HMaterID": tableMain[0]["物料ID"]
                            , "HMaterName": tableMain[0]["物料名称"]
                        });
                        //组织的值HOrgID变化,重新渲染
                        HOrgIDBar = sessionStorage["OrganizationID"];
                        //子表  èµ‹å€¼
                        var rowdata = [];
                        for (var i = 0; i < tableSub.length; i++) {
                            rowdata.push(
                                {
                                    "HPreventErrMouldID": tableSub[i]["防错装置ID"],
                                    "HPreventErrMouldName": tableSub[i]["防错装置"],
                                    "HPreventErrNote": tableSub[i]["防错功能"],
                                    "HLoseMode": tableSub[i]["失效模式"],
                                    "HLoseCheck": tableSub[i]["失效验证方法"],
                                    "HCheckResult": tableSub[i]["结果"],
                                    "HRemark": tableSub[i]["表体备注"]
                                }
                            );
                        }
                        option.data = rowdata;
                        table.render(option);
                        for (var i = 0; i < rowdata.length; i++) {
                            $('#HCheckResult' + (i + 1)).find("option[value='" + tableSub[i].结果 + "']").attr("selected", true);
                        }
                        form.render('select');
                    }
                })
            }
            //#endregion
            //#endregion
        });