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

zgq

2021-07-21 ae96bf12f34774cd2fcad88991ff0bc9158fc6b2

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

 WebTM/views/IpadIndex.html

@@ -717,7 +717,9 @@
                        "HSourceName": HSourceName1,
                        "HICMOInterID": HICMOInterID,
                        "HICMOEntryID": HICMOEntryID,
                        "HMaker": "Admin"    //sessionStorage["HUserName"]
                        "HMaker": "Admin",    //sessionStorage["HUserName"]
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HSourceBillType": HSourceBillType
                    });

                    //通过索引获取到当前iframe弹出层
@@ -726,6 +728,26 @@
                    iframe.edit(data);
                },
            });
        }

        function OpenFistCheck(event, obj)
        {
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '首件检验单-编辑'
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HSourceBillType, 'yes']
                , resize: false
                , cancel: function () {
                    btnIs();
                }
                , end: function () {
                    get_FastQuery(table, option);
                }
            })
        }

        //单据状态验证
@@ -866,7 +888,7 @@
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4">
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenFistCheck(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">首检</span>

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -119,6 +119,7 @@
        var HSourceID = ""; //资源ID
        var HICMOInterID = ""; //生产订单主ID
        var HICMOEntryID = ""; //生产订单子ID
        var HSourceBillType = ""; //源单类型
        var SchWhere = ""; //按钮查询参数
        function getUrlVars() {
            var vars = [], hash;
@@ -142,6 +143,7 @@
            HICMOInterID = data[0].HICMOInterID;
            HICMOEntryID = data[0].HICMOEntryID;
            HMaker = data[0].HMaker;
            HSourceBillType = data[0].HSourceBillType;
        }

        layui.config({
@@ -269,18 +271,13 @@
            //申请检验
            form.on('submit(AskReport)', function (data)
            {
                var sSubStr = JSON.stringify(table.cache['mainTable']);             
                //if (!AllowLoadData(sSubStr))//数据验证
                //{
                //    return false;
                //}

                var ScMaxWork = ScMaxWork();    //获取最大生产汇报单号              
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //方法所在页面和方法名
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        data: { "ScMaxWork": ScMaxWork,"HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -364,9 +361,21 @@
            //以上是layui模块
        });




        //获取最大生产汇报单号
        function ScMaxWork()
        {
            var ScMaxWork = "";
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                async: false,
                data: { "HBillType": '3711' },
                success: function (d) {
                    ScMaxWork = d.data[0].HBillNo;
                }
            });
            return ScMaxWork;
        }
    </script>

</body>