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

yangle

2024-01-31 54ddbb9eba145dfdcee0c3d28bdd1a91aec34122

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html

@@ -379,9 +379,17 @@

            //判断操作类型
            if (OperationType == 1) {//无源单
                $("#HEmpID").val(sessionStorage["HEmpID"]); //根据登录用户带出操作员ID
                $("#HEmpName").val(sessionStorage["HEmpName"]); //根据登录用户带出操作员
                $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                set_AddFNew();
            }
            else if (OperationType == 2) {//有源单
                $("#HEmpID").val(sessionStorage["HEmpID"]); //根据登录用户带出操作员ID
                $("#HEmpName").val(sessionStorage["HEmpName"]); //根据登录用户带出操作员
                $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                set_AddNew();
            }
            else if (OperationType == 3) {//编辑
@@ -625,18 +633,30 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //    if (data.Verify == "Y") //自动审核
                            //    {
                            //        layer.close(index);
                            //        SaveVerify(); //审核
                            //    }
                            //    else {
                            //        layer.close(index);
                            //    }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })