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

zrg

2024-07-01 43c633b50bc7dca4d78855e57546fe16e2e44562

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -263,7 +263,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>工序检</button>                              
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>工序检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_PatrolCheck" id="set_PatrolCheck"><i class="layui-icon layui-icon-form"></i>巡检</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
@@ -477,7 +478,10 @@
                        break;
                    //工序检
                    case 'set_ProcessCheck': set_ProcessCheck();
                        break;                 
                        break;
                    //巡检
                    case 'set_PatrolCheck': set_PatrolCheck();
                        break;                        
                };
            });

@@ -2739,23 +2743,21 @@
                }
            }

            //生产质量汇报单
            function set_ProcessExchange() {
                var checkStatus = table.checkStatus('mainTable2')
            //巡检            
            function set_PatrolCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].HEntryID;
                    var HProcID = data[0].HProcID;
                    var OperationType = 5;
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产质量汇报单-编辑'
                        , title: '巡检记录单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HEntry=0&HProcNo=' + HProcID +'&HEntryID=' + HEntryID + '', 'yes']
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();