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

yusijie

2024-12-16 9536b4d4acb04f9fcc77216c846b58397c02412f

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -113,7 +113,7 @@
                                    </div>
                                    <div class="layui-row" style="padding:10px 0">
                                        <div class="layui-col-xs5 layui-inline" style="margin-top:20px;">
                                            <div class="layui-tab-item layui-show" style="height:800px">
                                            <div class="layui-tab-item layui-show">
                                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                            </div>
                                        </div>
@@ -412,13 +412,11 @@
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , toolbar: '#toolbarDemo'                
                    , totalRow: true
                    , height: 660
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    ,data:[]
                };
@@ -572,9 +570,24 @@
                                    }
                                    else if (data[j].name == '工序') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '工序', templet: function (d) {
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 150, event: '工序', templet: function (d) {
                                                return '<span style="color: blue;">' + d.工序 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else if (data[j].name == '工序号') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 100, event: '工序号'
                                        });
                                    }
                                    else if (data[j].name == '流转卡数量') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 120, event: '流转卡数量'
                                        });
                                    }
                                    else if (data[j].name == '物料名称') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 150, event: '物料名称'
                                        });
                                    }
                                    else {
@@ -597,8 +610,10 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [Listcol[0]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList
                                , height: 'full-80'                                                           
                                , height: 'full-50'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option);
                            //人
@@ -926,6 +941,7 @@
                if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
                    var HMaterID = data.物料id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -934,7 +950,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + ''
                        , resize: false,
                        end: function () {
                        }