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

YL

2022-02-07 ccca1e769915b9b76a0da381d0948ab224379a1b

 WebTM/views/IpadStepIndex.html

@@ -376,7 +376,7 @@
            HICMOInterID = $("#df" + i + "").html();     //生产订单主内码
            HICMOEntryID = $("#ds" + i + "").html();     //生产订单子内码
            HProcID = $("#ps" + i + "").html();          //工序ID
            console.log(HProcID);


            if (workcode != "" && workcode != null) {
                $('.cns').removeClass('check1');  //删除不同父级clss样式相同的所有元素
@@ -715,6 +715,8 @@

                },
                success: function (dom, index) {
                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    var data = [];
                    data.push({
                        "workcode": workcode,
@@ -725,11 +727,10 @@
                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                        "Czybm": sessionStorage["Czybm"],
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HSourceBillType": HSourceBillType
                        "HSourceInterID": HSourceInterID,
                        "HSourceBillType": HSourceBillType,
                        "HProcID": HProcID
                    });

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

                },
                success: function (dom, index) {
                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    var data = [];
                    data.push({
                        "HBillType": HBillType,
@@ -767,9 +770,6 @@
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                    });

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
@@ -790,7 +790,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html?OperationType=2&linterid=&HSouceBillType=',
                content: '生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {

                },
@@ -826,7 +826,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['生产管理/质量汇报单/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , content: ['生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , resize: false
                , cancel: function () {

@@ -852,6 +852,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,

                content: '生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {

@@ -883,7 +884,7 @@
        //单据状态验证
        function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
            var flag = false;
            var sWhere = "";
            var sWhere = ""; //任务单状态(0待生产，1生产中，2挂起，3已完工)
            switch (btn) {
                case "开工":
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')";   //是否有不为开工开工状态、停工状态