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

zzr99

2021-12-09 e2c6a82eb77a7f1044a63e941d78d7b91167f025

 WebTM/views/IpadStepIndex.html

@@ -35,6 +35,7 @@
        var HSourceBillType = "";  //源单类型
        var HICMOInterID = "";     //生产订单主内码
        var HICMOEntryID = "";     //生产订单子内码
        var HProcID = "";     //工序ID
        var HICMOBillNo = "";      //任务单号
        //注意：选项卡 依赖 element 模块，否则无法进行功能性操作
        layui.config({
@@ -171,7 +172,7 @@
                                html1 += '<h1 style="display:none;"><span>源单类型：</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>生产订单号主ID：</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>生产订单子ID：</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';

                                html1 += '<h1 style="display:none;"><span>工序ID：</span><span id="ps' + (i + 1) + '">' + LoadData1[i].HProcID + '</span></h1>';

                                html1 += '<h1><span>工单号：</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
                                html1 += '<h1><span>产品名称：</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
@@ -179,16 +180,16 @@
                                html1 += '<h1><span>计划数量：</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">汇报总数：</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
                                switch (LoadData1[i].HICMOStatus) {
                                    case "待生产":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">工序：</span><span>' + LoadData1[i].HProcName +'</span></h1>';
                                        break;
                                    case "生产中":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">工序：</span><span>' + LoadData1[i].HProcName +'</span></h1>';
                                        break;
                                    case "挂起":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">工序：</span><span>' + LoadData1[i].HProcName +'</span></h1>';
                                        break;
                                    case "完工":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">工序：</span><span>' + LoadData1[i].HProcName +'</span></h1>';
                                        break;
                                    default:
                                }
@@ -227,7 +228,8 @@
                                    html1 += '<h1><span>进度：</span><span>' + (LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100 + '%</span></h1>';
                                }
                                html1 += '<h1><span>本单运行时间：</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
                                html1 += '<h1><span>本资源运行时间：</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
                                html1 += '<h1><span>当前工序：</span><span>' + LoadData2[i].HProcName + '</span></h1>';
                                /*html1 += '<h1><span>本资源运行时间：</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';*/
                                html1 += '</dd>';
                                html1 += '</dl>';
                                html1 += '</div>';
@@ -373,7 +375,8 @@
            HSourceBillType = $("#st" + i + "").html(); //通过样式ID获取html内容(源单类型)
            HICMOInterID = $("#df" + i + "").html();     //生产订单主内码
            HICMOEntryID = $("#ds" + i + "").html();     //生产订单子内码

            HProcID = $("#ps" + i + "").html();          //工序ID
            console.log(HProcID);

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

        //首检检验
        function OpenFistCheck(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            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=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , resize: false
                , cancel: function () {
                }
                , end: function () {

                }
            })
        }

        //过程检验
        function OpenProcess(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '工序检验单-编辑'
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , resize: false
                , cancel: function () {

                }
                , end: function () {

                }
            })
        }

        //不良采集
        function BadGather() {
@@ -1073,26 +1030,6 @@
                                    <span class="imgtitle">返工申请</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md3" onclick="OpenFistCheck(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">首检</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md3">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">巡检</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md3" onclick="OpenProcess(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">过程检验</span>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md3" onclick="OpenInSpection(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-release imgicon"></span>
@@ -1111,14 +1048,14 @@
                                    <span class="imgtitle">不良采集</span>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md3" onclick="ExceFeedback(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-unlink imgicon"></span>
                                    <span class="imgtitle">异常</span>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md3" onclick="Esc(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-close imgicon"></span>