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

yangle

11 小时以前 76824fbc74817dc6a87cef54c2ab18705490356e

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Æ½Ì¨_PDA/IpadIndex_PDA.html

@@ -239,7 +239,9 @@
        var HBadQty = [];       //不良数量
        var HBadReason = [];       //不良原因
        var HEmpName = "";      //操作员
        var HManagerID = 0;
        var HManagerName = "";      //负责人
        var HGroupID = 0;         //班组ID
        var HGroupName = "";      //班组
        var HProcID = 0;      //工序
        var HSBName = "";   //设备名称
@@ -265,12 +267,11 @@
            } else {
                OperationType = params[params[0]];//操作类型
                linterid = params[params[1]];//源单id
                HGroupID = params[params[2]];//班组ID
            }
            fetchButtonsData();
            fetchListData(linterid);
        });
        var HManagerID = 0;
        var HGroupID = 0;

        //加载当前用户按钮
        function fetchButtonsData() {
@@ -645,7 +646,8 @@
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                        "HSourceBillType": HSourceBillType,
                        "HGroupID": HGroupID
                    });

                    //通过索引获取到当前iframe弹出层
@@ -759,7 +761,8 @@
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                        "HSourceBillType": HSourceBillType,
                        "HGroupID": HGroupID
                    });

                    //通过索引获取到当前iframe弹出层
@@ -798,7 +801,8 @@
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                        "HSourceBillType": HSourceBillType,
                        "HGroupID": HGroupID
                    });

                    //通过索引获取到当前iframe弹出层
@@ -837,7 +841,8 @@
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                        "HSourceBillType": HSourceBillType,
                        "HGroupID": HGroupID
                    });

                    //通过索引获取到当前iframe弹出层
@@ -1041,11 +1046,25 @@
                , content: ['../../生产管理/报工平台_PDA/质量汇报/Sc_QualityReportBill_PDA.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , resize: false
                , cancel: function () {

                }
                , end: function () {

                }
                ,success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HBillType": HBillType,
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType,
                        "HGroupID": HGroupID
                    });

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            })
        }

@@ -1221,7 +1240,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html',
                content: '../../生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html',
                end: function () {

                },