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

wtt

2024-10-15 d4a4a6bbb6fc55e21ab6db1319edaf23541bdc2f

 WebTM/views/IpadIndex.html

@@ -995,6 +995,10 @@
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "不良采集")) {
                layer.alert("单据状态不满足不良采集条件!", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2
                , area: ['100%', '100%']
@@ -1248,6 +1252,10 @@
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "工艺参数点检")) {
                layer.alert("单据状态不满足工艺参数点检条件!", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
@@ -1275,6 +1283,40 @@
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            });
        }

        //异常签到处理点击事件
        function SingErrMsg(event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增异常签到处理单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html?OperationType=2',
                end: function () {

                }                
            });
        }

        //异常验收点击事件
        function ErrMsgBackCheck(event, obj) {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增异常反馈验收单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
                end: function () {

                }
            });
        }

@@ -1306,32 +1348,33 @@
                    break;
                case "报检申请":

                    break;
                default:
                    //        break;
                    //    default:
                    //}

                    $.ajax({
                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
                        type: "GET",
                        data: { "sWhere": JSON.stringify(sWhere) },
                        dataType: "json",//数据类型可以为 text xml json  script  jsonp
                        async: false,
                        success: function (data) {

                            if (data.count > 0) {
                                flag = true;

                            }
                            else {
                                flag = false;
                            }
                        },
                        error: function (err) {
                            flag = false;
                        }
                    });

                    return flag;
            }

            $.ajax({
                url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
                type: "GET",
                data: { "sWhere": sWhere },
                dataType: "json",//数据类型可以为 text xml json  script  jsonp
                async: false,
                success: function (data) {

                    if (data.count > 0) {
                        flag = true;

                    }
                    else {
                        flag = false;
                    }
                },
                error: function (err) {
                    flag = false;
                }
            });

            return flag;
        }
    </script>
</head>
@@ -1486,7 +1529,7 @@
                            <div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-unlink imgicon"></span>
                                    <span class="imgtitle">异常</span>
                                    <span class="imgtitle">异常申请</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
@@ -1536,7 +1579,21 @@
                                </div>
                            </div>
                        </div>
                                              
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="SingErrMsg(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-layer imgicon"></span>
                                    <span class="imgtitle">异常签到处理</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="ErrMsgBackCheck(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-layer imgicon"></span>
                                    <span class="imgtitle">异常验收</span>
                                </div>
                            </div>                          
                        </div>

                    </div>
                </fieldset>
            </div>