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

chenhaozhe

2025-10-22 cbd3c6396a01e2f78ed4dc82154cdb913abecfa7

 WebTM/views/É豸¹ÜÀí/É豸±¨±í/Sb_EquipMentCollectionTechParam_Temp.html

@@ -205,7 +205,7 @@
            //#endregion

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "工艺参数"];
            var titleData = ["HItemID", "工艺参数", "工序","同步标记"];
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -398,22 +398,18 @@
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            var totalArray = ["数量"];
                            var col = [];                           
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'});
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            for (var i = 0; i < data.length; i++) {                                
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {  //添加计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                else if (data[i].name == '单据号') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
@@ -469,35 +465,7 @@
                });
            }

            //获取列宽
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //获取列宽
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list',
                    async: false,
                    type: "Get",
                    dataType: "json",
                    data: { "colNum": colNum, "Name": Name },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });

                return result;
            }

          
            //快速过滤
            function get_FastQuery(table, option,number) {
                var HSourceCode = $("#HSourceCode").val();//设备编码
@@ -593,8 +561,8 @@
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                sWhere += addSWhereByOpenType();
                //添加查询条件，根据当前登录用户关联职员返回数据
                //sWhere += " and HUserID =" + sessionStorage["Czybm"]

                sWhere += "     order by  æ—¥æœŸ  desc";
                var index = layer.load(0);
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
@@ -661,7 +629,7 @@
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("2");
                $("#HInitTimeCycle").val("0");
            }
            //#endregion