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

zrg

2024-10-29 a62338fd82c5f8c01cba3190898d314bafde550b

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

 WebTM/WebTM.csproj

@@ -97,6 +97,7 @@
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\modules\tableFilter2.js" />
    <Content Include="layuiadmin\PlateBinding.js" />
    <Content Include="layuiadmin\PageTitle.js" />
    <Content Include="layuiadmin\HideButton.js" />
@@ -139,6 +140,9 @@
    <Content Include="layuiadmin\Scripts\webConfig2.js" />
    <Content Include="layuiadmin\serial-reader.js" />
    <Content Include="layuiadmin\soulTable.slim.js" />
    <Content Include="layuiadmin\style\tableFilter.css">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
@@ -376,6 +380,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
@@ -2268,6 +2273,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/layuiadmin/modules/tableFilter2.js

New file
@@ -0,0 +1,532 @@
/**
    TABLEFILTER
**/

layui.define(['table', 'jquery', 'form', 'laydate'], function (exports) {

    var MOD_NAME = 'tableFilter',
        $ = layui.jquery,
        table = layui.table,
        form = layui.form,
        laydate = layui.laydate;

    var tableFilter = {
        "v": '1.0.0'
    };

    //缓存
    tableFilter.cache = {}

    //渲染
    tableFilter.render = function (opt) {

        //配置默认值
        var elem = $(opt.elem || '#table'),
            elemId = elem.attr("id") || "table_" + new Date().getTime(),
            filters = opt.filters || [],
            parent = opt.parent || 'body',
            mode = opt.mode || "local";
        opt.done = opt.done || function () { };

        //写入默认缓存
        tableFilter.cache[elemId] = {};

        //主运行
        var main = function () {

            //默认过滤
            if (mode == "local") {
                var trsIndex = tableFilter.getShowTrIndex(elem, elemId, filters);
                if (trsIndex.length > 0) {
                    var trs = elem.next().find('.layui-table-body tr');
                    trs.each(function (i, tr) {
                        if ($.inArray($(tr).data("index"), trsIndex) != -1) {
                            $(tr).removeClass("layui-hide")
                        } else {
                            $(tr).addClass("layui-hide")
                        }
                    })
                } else {
                    elem.next().find('.layui-table-body tr').removeClass("layui-hide")
                }

                //FIX全选监听
                tableFilter.fixAll(elem);
                //重载表格尺寸 (FIX刷新表格时的表格异常)
                table.resize(elemId);
            }




            //遍历过滤项
            layui.each(filters, function (i, filter) {
                var filterField = filter.field,
                    filterName = filter.name || filter.field,
                    filterType = filter.type || "input",
                    filterData = filter.data || [],
                    filterUrl = filter.url || "";

                //插入图标	
                var th = elem.next().find('.layui-table-header th[data-field="' + filterField + '"]');
                var icon = filterType == 'input' ? 'layui-icon-search' : 'layui-icon-down';
                var filterIcon = $('<span class="layui-table-filter layui-inline"><i class="layui-icon ' + icon + '"></i></span>');
                th.find('.layui-table-cell').append(filterIcon)

                //图标默认高亮
                if (tableFilter.cache[elemId][filterName]) {
                    filterIcon.addClass("tableFilter-has")
                } else {
                    filterIcon.removeClass("tableFilter-has")
                }

                //图标点击事件
                filterIcon.on("click", function (e) {
                    e.stopPropagation();
                    //得到过滤项的选项
                    //如果开启本地 å¹¶ä¸”没设置数据 å°±è¯»æœ¬åœ°æ•°æ®
                    if (!filter.data && !filterUrl && filterType != "input") {
                        filterData = tableFilter.eachTds(elem, filterField);
                    }

                    //弹出层
                    var t = $(this).offset().top + $(parent).scrollTop() + $(this).outerHeight() + 5 + "px";
                    var l_fix = filterType == "date" ? 530 : 164;
                    var l = $(this).offset().left - ($('body').outerWidth(true) - $(parent).outerWidth(true)) - l_fix + "px";

                    var filterBox = $('<div class="layui-table-filter-view layui-anim layui-anim-fadein" style="top:' + t + ';left:' + l + ';"><div class="layui-table-filter-box"><form class="layui-form" lay-filter="table-filter-form"></form></div></div>');
                    if (filterType == "input") {
                        filterBox.find('form').append('<input type="search" name="' + filterName + '" lay-verify="required" lay-verType="tips" placeholder="关键词" class="layui-input">');
                    }
                    if (filterType == "checkbox") {
                        filterBox.find('form').append('<ul></ul>');
                        if (!filterUrl) {
                            layui.each(filterData, function (i, item) {
                                filterBox.find('ul').append('<li><input type="checkbox" name="' + filterName + '[' + item.key + ']" value="' + item.key + '" title="' + item.value + '" lay-skin="primary"></li>');
                            })
                        }
                    }
                    if (filterType == "radio") {
                        filterBox.find('form').append('<ul class="radio"></ul>');
                        if (!filterUrl) {
                            filterBox.find('ul').append('<li><input type="radio" name="' + filterName + '" value="" title="All" checked></li>');
                            layui.each(filterData, function (i, item) {
                                filterBox.find('ul').append('<li><input type="radio" name="' + filterName + '" value="' + item.key + '" title="' + item.value + '"></li>');
                            })
                        }
                    }
                    if (filterType == "date") {
                        filterBox.find('form').append('<div class="layui-table-filter-date"></div>');
                        filterBox.find('form').append('<input type="text" name="' + filterName + '" lay-verify="required" lay-verType="tips" placeholder="请选择日期" class="layui-input">');

                    }
                    filterBox.find('form').append('<button class="layui-btn layui-btn-normal layui-btn-sm" lay-submit lay-filter="tableFilter">确定</button>');
                    filterBox.find('form').append('<button type="button" class="layui-btn layui-btn-primary layui-btn-sm filter-del layui-btn-disabled" disabled>取消过滤</button>');

                    //设置清除是否可用
                    $(this).hasClass('tableFilter-has') && filterBox.find('.filter-del').removeClass("layui-btn-disabled").removeAttr("disabled", "disabled");

                    //加入DOM
                    $(parent).append(filterBox);

                    //赋值FORM
                    form.val("table-filter-form", tableFilter.toLayuiFrom(elemId, filterName, filterType));

                    //渲染layui form
                    form.render(null, 'table-filter-form');

                    //渲染日期
                    if (filterType == "date") {
                        laydate.render({
                            elem: '.layui-table-filter-date',
                            range: true,
                            type: 'date',
                            value: $('.layui-table-filter-date').next().val(),
                            position: 'static',
                            showBottom: false,
                            change: function (value, date, endDate) {
                                $('.layui-table-filter-date').next().val(value)
                            }
                        });
                    }

                    //渲染FORM å¦‚果是searchInput å°±é»˜è®¤é€‰ä¸­
                    var searchInput = filterBox.find('form input[type="search"]');
                    searchInput.focus().select();

                    //处理异步filterData
                    if ((filterType == 'checkbox' || filterType == 'radio') && filterUrl) {
                        var filterBoxUl = filterBox.find('.layui-table-filter-box ul');
                        filterBoxUl.append('<div class="loading"><i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i></div>');
                        $.getJSON(filterUrl + "?_t=" + new Date().getTime(), function (res, status, xhr) {
                            filterBoxUl.empty();
                            filterType == "radio" && filterBoxUl.append('<li><input type="radio" name="' + filterName + '" value="" title="All" checked></li>');
                            layui.each(res.data, function (i, item) {
                                filterType == "checkbox" && filterBoxUl.append('<li><input type="checkbox" name="' + filterName + '[' + item.key + ']" value="' + item.key + '" title="' + item.value + '" lay-skin="primary"></li>');
                                filterType == "radio" && filterBoxUl.append('<li><input type="radio" name="' + filterName + '" value="' + item.key + '" title="' + item.value + '"></li>');
                            })
                            form.render(null, 'table-filter-form');
                            form.val("table-filter-form", tableFilter.toLayuiFrom(elemId, filterName, filterType));
                        });
                    }

                    //点击确认开始过滤
                    form.on('submit(tableFilter)', function (data) {
                        //重构复选框结果
                        if (filterType == "checkbox") {
                            var NEWfield = [];
                            for (var key in data.field) {
                                NEWfield.push(data.field[key])
                            }
                            data.field[filterName] = NEWfield
                        }

                        //过滤项写入缓存
                        tableFilter.cache[elemId][filterName] = data.field[filterName];

                        //如果有过滤项 icon就高亮
                        if (tableFilter.cache[elemId][filterName].length > 0) {
                            filterIcon.addClass("tableFilter-has")
                        } else {
                            filterIcon.removeClass("tableFilter-has")
                        }

                        if (mode == "local") {
                            //本地交叉过滤
                            var trsIndex = tableFilter.getShowTrIndex(elem, elemId, filters);
                            if (trsIndex.length > 0 || data.field[filterName].length > 0) {
                                var trs = elem.next().find('.layui-table-body tr');
                                trs.each(function (i, tr) {
                                    if ($.inArray($(tr).data("index"), trsIndex) != -1) {
                                        $(tr).removeClass("layui-hide")
                                    } else {
                                        $(tr).addClass("layui-hide")
                                    }
                                })
                            } else {
                                elem.next().find('.layui-table-body tr').removeClass("layui-hide")
                            }
                            //更新合计行
                            tableFilter.updataTotal(elem);
                            //更新序列号
                            tableFilter.upNumbers(elem);
                            //取消表格选中
                            tableFilter.uncheck(elem);
                            //重载表格尺寸
                            table.resize(elemId)
                        } else if (mode == "api") {
                            //服务端交叉过滤
                            //将数组转字符串
                            var new_where = {};
                            for (var key in tableFilter.cache[elemId]) {
                                var filterKey = key,
                                    filterValue = tableFilter.cache[elemId][key];
                                if ($.isArray(filterValue)) {
                                    new_where[filterKey] = filterValue.join(",");
                                } else {
                                    new_where[filterKey] = filterValue;
                                }
                            }
                            table.reload(elemId, { "where": new_where })
                        }

                        //写入回调函数
                        opt.done(tableFilter.cache[elemId]);

                        filterBox.remove();
                        return false;
                    })

                    //点击清除此项过滤
                    filterBox.find('.layui-table-filter-box .filter-del').on('click', function (e) {
                        delete tableFilter.cache[elemId][filterName];
                        filterIcon.removeClass("tableFilter-has");
                        if (mode == "local") {
                            var trsIndex = tableFilter.getShowTrIndex(elem, elemId, filters);
                            if (trsIndex.length > 0) {
                                var trs = elem.next().find('.layui-table-body tr');
                                trs.each(function (i, tr) {
                                    if ($.inArray($(tr).data("index"), trsIndex) != -1) {
                                        $(tr).removeClass("layui-hide")
                                    } else {
                                        $(tr).addClass("layui-hide")
                                    }
                                })
                            } else {
                                elem.next().find('.layui-table-body tr').removeClass("layui-hide")
                            }
                            //更新合计行
                            tableFilter.updataTotal(elem)
                            //更新序列号
                            tableFilter.upNumbers(elem)
                            //取消表格选中
                            tableFilter.uncheck(elem)
                            //重载表格尺寸
                            table.resize(elemId)
                        } else if (mode == "api") {
                            //需要清除where里的对应的值
                            var where = {};
                            where[filterName] = ''
                            table.reload(elemId, { "where": where })
                        }

                        opt.done(tableFilter.cache[elemId]);
                        filterBox.remove();
                    })

                    //点击其他区域关闭
                    $(document).mouseup(function (e) {
                        var userSet_con = $('.layui-table-filter-view');
                        if (!userSet_con.is(e.target) && userSet_con.has(e.target).length === 0) {
                            filterBox.remove();
                        }
                    });

                })
            })

        };
        main();

        //函数返回
        var returnObj = {
            'config': opt,
            'reload': function (opt) {
                main();
                //更新序列号
                tableFilter.upNumbers(elem);
            }
        }
        return returnObj
    }

    //遍历行获取本地列集合 return tdsArray[]
    tableFilter.eachTds = function (elem, filterField) {
        var tdsText = [],
            tdsArray = [];
        var tds = elem.next().find('.layui-table-body td[data-field="' + filterField + '"]');
        tds.each(function (i, td) {
            tdsText.push($.trim(td.innerText))
        })
        tdsText = tableFilter.tool.uniqueObjArray(tdsText);
        layui.each(tdsText, function (i, item) {
            tdsArray.push({ 'key': item, 'value': item })
        })
        return tdsArray;
    }

    //获取匹配的TR的data-index  return trsIndex[]
    tableFilter.getShowTrIndex = function (elem, elemId, filters) {
        var trsIndex = [];
        var filterValues = tableFilter.cache[elemId];

        for (var key in filterValues) {
            var filterKey = key,
                filterValue = filterValues[key];

            //如果有name比对filterField
            layui.each(filters, function (i, item) {
                if (filterKey == item.name) {
                    filterKey = item.field
                }
            })

            var tds = elem.next().find('.layui-table-body td[data-field="' + filterKey + '"]');
            //获取这一次过滤的匹配
            var this_trsIndex = [];
            tds.each(function (i, td) {
                if ($.isArray(filterValue)) {
                    //过滤值=数组 inArray å¤é€‰æ¡†
                    if ($.inArray($.trim(td.innerText), filterValue) >= 0 && filterValue && filterValue.length > 0) {
                        this_trsIndex.push($(td).parent().data("index"))
                    }
                } else if (filterValue.indexOf(" - ") >= 0) {
                    //是否在时间段内
                    var d = $.trim(td.innerText);
                    var s = filterValue.split(" - ")[0];
                    var e = filterValue.split(" - ")[1];
                    if (tableFilter.tool.isDuringDate(d, s, e)) {
                        this_trsIndex.push($(td).parent().data("index"))
                    }
                } else {
                    //过滤值=字符串 indexOf å•é€‰æ¡† è¾“入框
                    if ($.trim(td.innerText).indexOf(filterValue) >= 0) {
                        this_trsIndex.push($(td).parent().data("index"))
                    }
                }
            })
            //取最终结果 åˆå¹¶æ•°ç»„后去相同值
            //第一次 ä¸åˆå¹¶
            if (trsIndex.length <= 0) {
                trsIndex = this_trsIndex
            } else {
                if (this_trsIndex.length > 0) {
                    //这一次有值 å’Œå‰é¢N次取相同值
                    trsIndex = tableFilter.tool.getSameArray(trsIndex, this_trsIndex);
                } else {
                    //这一次没值 å‰é¢N次有值,如果字符串过滤未有值 å°±æ˜¾ç¤ºç©º
                    trsIndex = $.isArray(filterValue) ? trsIndex : [];
                }
            }
        }
        return tableFilter.tool.uniqueObjArray(trsIndex);
    }

    //JSON æ•°æ®è½¬layuiFOMR å¯ç”¨çš„ å¤„理checkbox
    tableFilter.toLayuiFrom = function (elemId, filterName, filterType) {
        var form_val = JSON.stringify(tableFilter.cache[elemId]);
        form_val = JSON.parse(form_val);
        if (filterType == "checkbox") {
            layui.each(form_val[filterName], function (i, value) {
                form_val[filterName + "[" + value + "]"] = true;
            })
            delete form_val[filterName];
        }
        return form_val;
    }

    //更新合计行数据
    tableFilter.updataTotal = function (elem) {
        var elemId = elem.attr("id");
        table.eachCols(elemId, function (i, item) {
            if (item.totalRow) {
                var tdAllnum = 0;
                var tds = elem.next().find('.layui-table-body td[data-field="' + item.field + '"]')
                tds.each(function (i, td) {
                    if (!$(td).parent().hasClass('layui-hide')) {
                        //FIX JS计算精度
                        tdAllnum = (tdAllnum * 10 + Number($.trim(td.innerText)) * 10) / 10
                    }
                })
                var totalTds = elem.next().find('.layui-table-total td[data-field="' + item.field + '"]')
                totalTds.each(function (i, td) {
                    $(td).find(".layui-table-cell").html(tdAllnum || "0")
                })
            }
        })
    }

    //更新序号列
    tableFilter.upNumbers = function (elem) {
        //当前第几页
        var cur = elem.next().find('.layui-laypage-curr').text();
        cur = Number(cur || '1')
        var limit = elem.next().find('.layui-laypage-limits select').val();
        limit = Number(limit)

        var trs = elem.next().find('.layui-table-main tr');
        var n = cur == 1 ? 0 : limit * (cur - 1);

        trs.each(function (i, tr) {
            if (!$(tr).hasClass('layui-hide')) {
                n += 1;
                $(tr).find('.laytable-cell-numbers').html(n)
            }
        })

        if (elem.next().find('.layui-table-fixed').length >= 1) {
            var trs_f = elem.next().find('.layui-table-fixed .layui-table-body tr');
            var n_f = cur == 1 ? 0 : limit * (cur - 1);

            trs_f.each(function (i, tr_f) {
                if (!$(tr_f).hasClass('layui-hide')) {
                    n_f += 1;
                    $(tr_f).find('.laytable-cell-numbers').html(n_f)
                }
            })
        }
    }

    //表格取消选中
    tableFilter.uncheck = function (elem) {
        var elemId = elem.attr("id");
        var tableName = elem.attr("lay-filter");

        var trs = elem.next().find('.layui-table-fixed-l tr');
        trs.each(function (i, tr) {
            var c = $(tr).find("[name='layTableCheckbox']");
            if (c.prop("checked")) {
                $(tr).find('.layui-form-checked i').click()
            }
        })
    }

    //FIX è¡¨æ ¼å…¨é€‰é€‰ä¸­éšè—é¡¹
    tableFilter.fixAll = function (elem) {
        var elemId = elem.attr("id");
        var tableName = elem.attr("lay-filter");
        var trs = elem.next().find('.layui-table-main tr');

        table.on('checkbox(' + tableName + ')', function (obj) {
            if (obj.type == "all") {
                var data = table.cache[elemId];
                trs.each(function (i, tr) {
                    if ($(tr).hasClass('layui-hide')) {
                        data[i].LAY_CHECKED = false;
                    }
                })

            }
        })

    }

    //隐藏选择器
    tableFilter.hide = function () {
        $('.layui-table-filter-view').remove();
    }

    //工具
    tableFilter.tool = {
        //数组&对象数组去重
        'uniqueObjArray': function (arr, type) {
            var newArr = [];
            var tArr = [];
            if (arr.length == 0) {
                return arr;
            } else {
                if (type) {
                    for (var i = 0; i < arr.length; i++) {
                        if (!tArr[arr[i][type]]) {
                            newArr.push(arr[i]);
                            tArr[arr[i][type]] = true;
                        }
                    }
                    return newArr;
                } else {
                    for (var i = 0; i < arr.length; i++) {
                        if (!tArr[arr[i]]) {
                            newArr.push(arr[i]);
                            tArr[arr[i]] = true;
                        }
                    }
                    return newArr;
                }
            }
        },
        //合并数组取相同项
        'getSameArray': function (arry1, arry2) {
            var newArr = [];
            for (var i = 0; i < arry1.length; i++) {
                for (var j = 0; j < arry2.length; j++) {
                    if (arry2[j] === arry1[i]) {
                        newArr.push(arry2[j]);
                    }
                }
            }
            return newArr;
        },
        'isDuringDate': function (dateStr, beginDateStr, endDateStr) {
            var curDate = new Date(dateStr),
                beginDate = new Date(beginDateStr),
                endDate = new Date(endDateStr);
            if (curDate >= beginDate && curDate <= endDate) {
                return true;
            }
            return false;
        }
    }

    //输出接口
    exports(MOD_NAME, tableFilter);
});

 WebTM/layuiadmin/style/tableFilter.css

New file
@@ -0,0 +1,106 @@
/*table è¿‡æ»¤*/
.layui-table-filter {
    height: 100%;
    cursor: pointer;
    position: absolute;
    right: 15px;
    padding: 0 5px;
}

    .layui-table-filter i {
        font-size: 12px;
        color: #ccc;
    }

    .layui-table-filter:hover i {
        color: #666;
    }

    .layui-table-filter.tableFilter-has i {
        color: #1E9FFF;
    }

.layui-table-filter-view {
    min-width: 90px;
    background: #FFFFFF;
    border: 1px solid #d2d2d2;
    box-shadow: 0 2px 4px rgba(0,0,0,.12);
    position: absolute;
    top: 0px;
    left: 0px;
    z-index: 90000000;
}

.layui-table-filter-box {
    padding: 10px;
}

    .layui-table-filter-box .loading {
        width: 100%;
        height: 100%;
        text-align: center;
        line-height: 150px;
    }

        .layui-table-filter-box .loading i {
            font-size: 18px;
        }

    .layui-table-filter-box input.layui-input {
        margin-bottom: 10px;
    }

    .layui-table-filter-box ul {
        border: 1px solid #eee;
        height: 150px;
        overflow: auto;
        margin-bottom: 10px;
        padding: 5px 10px 5px 10px;
    }

        .layui-table-filter-box ul li {
            padding: 3px 0;
        }

        .layui-table-filter-box ul.radio {
            padding: 0px;
        }

            .layui-table-filter-box ul.radio li {
                padding: 0px;
            }

        .layui-table-filter-box ul li .layui-form-radio {
            display: block;
            color: #666;
            margin: 0px;
            padding: 0px;
            transition: .1s linear;
        }

            .layui-table-filter-box ul li .layui-form-radio div {
                display: block;
                padding: 0 10px;
            }

            .layui-table-filter-box ul li .layui-form-radio i {
                display: none;
            }

            .layui-table-filter-box ul li .layui-form-radio:hover {
                background: #f9f9f9;
            }

            .layui-table-filter-box ul li .layui-form-radio.layui-form-radioed {
                background: #5FB878;
                color: #fff;
            }

.layui-table-filter-date {
    margin-bottom: 10px;
}

    .layui-table-filter-date .layui-laydate {
        box-shadow: none;
        border: 0;
    }

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html

@@ -1135,29 +1135,8 @@

                            columns = col;
                            option.cols = [col];
                            //option.data = data1.data;
                            //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                            //获取子表列数据
                            var colList = [];
                            for (var i = 0; i < option.cols[0].length; i++) {
                                colList.push(option.cols[0][i].field);
                            }
                            //设置数据
                            var result = data1.data;
                            var temp = "";
                            for (var i = 0; i < result.length; i++) {
                                if (temp != result[i]["单据号"]) {
                                    temp = result[i]["单据号"];
                                } else {
                                    var initIndex = $.inArray("单据号", colList);
                                    var lastIndex = $.inArray("hsubid", colList);
                                    for (var j = initIndex; j < lastIndex; j++) {
                                        var fieldName = colList[j];
                                        result[i][fieldName] = "";
                                    }
                                }
                            }
                            option.data = result;
                            option.data = data1.data;
                            
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -1150,29 +1150,8 @@

                            columns = col;
                            option.cols = [col];
                            //option.data = data1.data;
                            //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                            //获取子表列数据
                            var colList = [];
                            for (var i = 0; i < option.cols[0].length; i++) {
                                colList.push(option.cols[0][i].field);
                            }
                            //设置数据
                            var result = data1.data;
                            var temp = "";
                            for (var i = 0; i < result.length; i++) {
                                if (temp != result[i]["单据号"]) {
                                    temp = result[i]["单据号"];
                                } else {
                                    var initIndex = $.inArray("单据号", colList);
                                    var lastIndex = $.inArray("hsubid", colList);
                                    for (var j = initIndex; j < lastIndex; j++) {
                                        var fieldName = colList[j];
                                        result[i][fieldName] = "";
                                    }
                                }
                            }
                            option.data = result;
                            option.data = data1.data;
                            
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -88,7 +88,7 @@
                                        <div class="layui-inline">

                                            <label class="layui-form-label">登记人<label style="color:red"> * </label></label>

                                            <div class="layui-input-inline">

                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>

                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>

                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">

                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">

                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>

@@ -1112,7 +1112,7 @@
                                        "工序": result.data[i]["工序"],

                                        "HUnitID": result.data[i]["HUnitID"],

                                        "计量单位": result.data[i]["计量单位"],

                                        "HQty": result.data[i]["出站数量"],

                                        "HQty": 1,

                                        "HSourceID": result.data[i]["HSourceID"],

                                        "生产资源": result.data[i]["生产资源"],

                                        "HNowProcID": "0",
                                        "当前工序": "",

@@ -1314,7 +1314,7 @@
                //    return false;

                //}



                if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null) {

                if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null || $("#HEmpName").val() == "") {

                    layer.msg("登记人未选择!");

                    return false;

                }


 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html

@@ -883,13 +883,14 @@
            function set_CheckBill_Flow(num, tableName) {
                var checkStatus = table.checkStatus(tableName)
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length != 0) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//将对象数组id提取去重
                    var queryString = uniqueIds.join(",");//将ids变成数组
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //方法所在页面和方法名
                        data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -916,7 +917,7 @@
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                    layer.msg('请选择至少一行数据审核！');
                }
            }
            //#endregion

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillToInvalidatedList.html

@@ -46,21 +46,20 @@
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 107px;">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </div>
                                <!--其他条件-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                    <div class="layui-input-block" style="margin-left: 107px;">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                    </div>
                                </div>
                                
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
@@ -168,13 +167,13 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>启用默认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_closeOtherRoute" id="set_closeOtherRoute"><i class="layui-icon layui-icon-form"></i>禁用其它</button>
@@ -185,14 +184,14 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>-->
                            </div>
                        </script>
                    </form>
@@ -223,7 +222,7 @@
            var option = [];
            var HBillType = 3301;
            var ins;                        //用于导出excel
            var HModName = "Gy_RoutingBillList";
            var HModName = "Gy_RoutingBillToInvalidatedList";
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
            //获取参数
            function getUrlVars() {
@@ -395,66 +394,18 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-150'
                    , page: false
                    , cols: [[]]
                    , data: [[]]
                    , height: 800
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '工艺名称', title: '工艺名称', width: 170, sort: true }
                        , { field: '物料代码', title: '物料代码', width: 160, sort: true }
                        , { field: '物料名称', title: '物料名称', width: 160, sort: true }
                        , { field: '规格型号', title: '规格型号', width: 160, sort: true }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115, sort: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '表头备注', title: '表头备注', sort: true }
                        , { field: '工序号', title: '工序号', sort: true }
                        , { field: '工序代码', title: '工序代码', sort: true }
                        , { field: '工序', title: '工序', sort: true }
                        , { field: '工作中心代码', title: '工作中心代码', width: 115, sort: true }
                        , { field: '工作中心名称', title: '工作中心名称', width: 115, sort: true }
                        , { field: '制单人', title: '制单人', sort: true }
                        , { field: '制单日期', title: '制单日期', width: 195, sort: true }
                        , { field: '审核人', title: '审核人', sort: true }
                        , { field: '审核日期', title: '审核日期', width: 180, sort: true }
                        , { field: '修改人', title: '修改人', sort: true }
                        , { field: '修改日期', title: '修改日期', width: 180, sort: true }
                        , { field: '默认工艺', title: '默认工艺', sort: true }
                        //, { field: '单据类型', title: '单据类型' }
                        ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                        //, { field: '组织', title: '组织' }
                        ////, { field: 'hsubid', title: 'hsubid', width: 80 }
                        //, { field: '委外标记', title: '委外标记' }
                        ////, { field: 'hprocid', title: 'hprocid', width: 105 }
                        ////, { field: 'HSupID', title: 'HSupID', width: 105 }
                        //, { field: '供应商代码', title: '供应商代码' }
                        //, { field: '供应商', title: '供应商' }
                        ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                        //, { field: '时间单位', title: '时间单位' }
                        //, { field: '运行时间', title: '运行时间' }
                        //, { field: '加工数量', title: '加工数量' }
                        //, { field: '准备时间', title: '准备时间' }
                        //, { field: '排队时间', title: '排队时间' }
                        //, { field: '转移时间', title: '转移时间' }
                        //, { field: '良率', title: '良率' }
                        //, { field: '累计良率', title: '累计良率' }
                        //, { field: '表体备注', title: '表体备注' }
                        //, { field: '作废人', title: '作废人' }
                        //, { field: '作废日期', title: '作废日期' }
                        ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                        ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                        ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                        ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                        //, { field: '加工单价', title: '加工单价' }
                        ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                        //, { field: '下道流转工序', title: '下道流转工序', width: 150 }
                        //, { field: '流转工序', title: '流转工序' }
                    ]]
                };
                }
                
            }
            //#region æŽ’序后选择
@@ -611,23 +562,8 @@
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 800
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }

                            option.cols=[col];
                            option.data = data1.data;
                            //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                            //获取子表列数据
                            var colList = [];
@@ -970,7 +906,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_DisplayPage(sWhere);
                get_FastQuery();
            }

            //启用默认

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackaging.html

@@ -102,6 +102,12 @@
                                        <input type="text" style="border-radius: 50px;width: 140%;" name="子件条码" id="SubBarcode" autocomplete="off" placeholder="请输入子件条码" class="layui-input">
                                    </div>
                                </div>
                                <div class="">
                                    <label class="layui-inline" style="width:60px;">是否混箱</label>
                                    <div class="layui-inline">
                                        <input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <div class="">
@@ -441,6 +447,7 @@
                            return util.toDateString(time, "yyyy-MM-dd");
                        }
                    }
                    //, { field: 'HBarCode_Pack', title: '条形码', width: 145 }
                    , { field: 'HSourceBillNo', title: '条形码', width: 145 }
                    , { field: 'HBillNo', title: '源单单号', width: 125 }
                    , { field: 'HBarCode', title: '唯一码', width: 125 }
@@ -526,7 +533,7 @@
                        return;
                    }
                    //判断装箱数量不能大于剩余数量
                    if (zxQty > icmoQtyNow) {
                    if (zxQty > icmoQtyNow && $("#HMixedBox").val()=="") {
                        playSound();
                        layer.msg("装箱数量不允许大于流转卡剩余数量！剩余数量为" + icmoQtyNow, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
@@ -584,6 +591,24 @@
                    }
                }
            });


            form.on('checkbox(HMixedBox)', function (obj) {
                if (icmoQtyNow == 0) {
                    playSound();
                    layer.msg("剩余数量为" + icmoQtyNow + ",不允许混箱！", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                    $("input[name='HMixedBox']").prop("checked", false);
                    form.render('checkbox');
                    return;
                }
                if (obj.value == "") {
                    $("#HMixedBox").val("1");
                } else {
                    $("#HMixedBox").val("");
                }

            });
           

            //子件条码回车方法
            $('#SubBarcode').on('keydown', function (event) {   //扫条形码
@@ -688,7 +713,7 @@
                        url: GetWEBURL() + "/LEMS/SNBarcodeProcCtrl",
                        type: "GET",
                        async: false,
                        data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo },
                        data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HMixedBox": $("#HMixedBox").val(), "HBillNo": HBillNo2 },
                        success: function (result) {
                            if (result.count == 0) {
                                a = 1;
@@ -730,86 +755,93 @@
                                            layer.alert("包装数量已等于流转卡数量！不允许扫码！", { icon: 1 });
                                            return;
                                        } else {
                                            $.ajax({//表体存temp表
                                                url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
                                                type: "GET",
                                                async: false,
                                                data: {
                                                    "HBillNo": HBillNo
                                                    , "SubBarcode": SubBarcode
                                                    , "HInterID": HInterID
                                                    , "HBillNo2": HBillNo2
                                                    , "HBillType": HBillType
                                                    , "sMaker": sMaker
                                                    , "HBarCode": $("#HBarCode_wym").val()
                                                    , "HNumber": $("#HNumber").val()
                                                    , "HName": $("#HMaterName").val()
                                                    , "HModel": $("#HModel").val()
                                                },
                                                success: function (result) {
                                                    var data = result.data;
                                                    if (result.Message == "该子件条码已存在") {
                                                        playSound();
                                                        layer.alert("该子件条码已存在", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                                    } else {
                                                        if (data[0].Column1 == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                                            $('#SubBarcode').val("");
                                                            $("#SubBarcode").focus();
                                                            table.reload('smjl-table', {
                                                                url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
                                                                , where: {
                                                                    HBillNo: HBillNo2
                                                                    , HBarCode: HBillNo
                                                                }
                                                            });
                                                            zxQtyFlag++;
                                                            pcmQtyFlag++
                                                            $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
                                                            $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
                                                            layer.msg("扫描成功", { time: 5000, icon: 6 });
                                                            $.ajax({//查询条码档案表里的镭雕条码的合计数量方法
                                                                url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
                                                                type: "GET",
                                                                async: false,
                                                                data: {
                                                                    "HBarCode": $("#HBarCode_wym").val()
                                                                },
                                                                success: function (result) {
                                                                    var HQty = result.data[0].HQty;
                                                                    HQty++;
                                                                    $.ajax({//更新条码档案表里的镭雕条码的合计数量方法
                                                                        url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
                                                                        type: "GET",
                                                                        async: false,
                                                                        data: {
                                                                            "HBarCode": $("#HBarCode_wym").val(),
                                                                            "HQty": HQty
                                                                        },
                                                                        success: function (result) {
                                                                            var HQty = result.data;
                                                                            ZJTMFlag = true;
                                                                        }, error: function () {
                                                                            playSound();
                                                                            layer.alert("更新条码档案表里的镭雕条码的合计数量方法发生错误!", { icon: 5 });
                                                                        }
                                                                    });
                                                                }, error: function () {
                                                                    playSound();
                                                                    layer.alert("查询条码档案表里的镭雕条码的合计数量方法发生错误!", { icon: 5 });
                                                                }
                                                            });
                                                        } else {
                                            //判断装箱数量不能大于剩余数量
                                            if (AllHqty > icmoQtyNow && $("#HMixedBox").val() == "") {
                                                playSound();
                                                layer.msg("装箱数量不允许大于流转卡剩余数量！剩余数量为" + icmoQtyNow, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                                return;
                                            } else {
                                                $.ajax({//表体存temp表
                                                    url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
                                                    type: "GET",
                                                    async: false,
                                                    data: {
                                                        "HBillNo": HBillNo
                                                        , "SubBarcode": SubBarcode
                                                        , "HInterID": HInterID
                                                        , "HBillNo2": HBillNo2
                                                        , "HBillType": HBillType
                                                        , "sMaker": sMaker
                                                        , "HBarCode": $("#HBarCode_wym").val()
                                                        , "HNumber": $("#HNumber").val()
                                                        , "HName": $("#HMaterName").val()
                                                        , "HModel": $("#HModel").val()
                                                    },
                                                    success: function (result) {
                                                        var data = result.data;
                                                        if (result.Message == "该子件条码已存在") {
                                                            playSound();
                                                            // $("#verifycode").click();
                                                            //layer.msg(result.Message, { icon: 5 });
                                                            layer.alert("插入缓存表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                                            layer.alert("该子件条码已存在", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                                        } else {
                                                            if (data[0].Column1 == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                                                $('#SubBarcode').val("");
                                                                $("#SubBarcode").focus();
                                                                table.reload('smjl-table', {
                                                                    url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
                                                                    , where: {
                                                                        HBillNo: HBillNo2
                                                                        , HBarCode: HBillNo
                                                                    }
                                                                });
                                                                zxQtyFlag++;
                                                                pcmQtyFlag++
                                                                $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
                                                                $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
                                                                layer.msg("扫描成功", { time: 5000, icon: 6 });
                                                                $.ajax({//查询条码档案表里的镭雕条码的合计数量方法
                                                                    url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
                                                                    type: "GET",
                                                                    async: false,
                                                                    data: {
                                                                        "HBarCode": $("#HBarCode_wym").val()
                                                                    },
                                                                    success: function (result) {
                                                                        var HQty = result.data[0].HQty;
                                                                        HQty++;
                                                                        $.ajax({//更新条码档案表里的镭雕条码的合计数量方法
                                                                            url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
                                                                            type: "GET",
                                                                            async: false,
                                                                            data: {
                                                                                "HBarCode": $("#HBarCode_wym").val(),
                                                                                "HQty": HQty
                                                                            },
                                                                            success: function (result) {
                                                                                var HQty = result.data;
                                                                                ZJTMFlag = true;
                                                                            }, error: function () {
                                                                                playSound();
                                                                                layer.alert("更新条码档案表里的镭雕条码的合计数量方法发生错误!", { icon: 5 });
                                                                            }
                                                                        });
                                                                    }, error: function () {
                                                                        playSound();
                                                                        layer.alert("查询条码档案表里的镭雕条码的合计数量方法发生错误!", { icon: 5 });
                                                                    }
                                                                });
                                                            } else {
                                                                playSound();
                                                                // $("#verifycode").click();
                                                                //layer.msg(result.Message, { icon: 5 });
                                                                layer.alert("插入缓存表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                                            }
                                                        }
                                                    }, error: function () {
                                                        playSound();
                                                        layer.alert("子件条码方法发生错误!", { icon: 5 });
                                                    }
                                                }, error: function () {
                                                    playSound();
                                                    layer.alert("子件条码方法发生错误!", { icon: 5 });
                                                }
                                            });
                                                });
                                            }
                                        }
                                    }, error: function () {
                                        playSound();
@@ -994,6 +1026,9 @@
                    //清空扫描记录的装箱数量
                    zxQtyFlag = 0;
                    pcmQtyFlag = 0;
                    $("#HMixedBox").val("");
                    $("input[name='HMixedBox']").prop("checked", false);
                    form.render('checkbox');
                    //获取单据号
                    getBillno();
                    //扫描条码

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -8,6 +8,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/tableFilter.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -17,6 +18,7 @@
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -269,7 +271,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable','tableFilter'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
@@ -280,6 +282,7 @@
                , laydate = layui.laydate
                , util = layui.util
                , soulTable = layui.soulTable
                , tableFilter = layui.tableFilter

            var Organization = sessionStorage["Organization"];
            //公用变量
@@ -323,6 +326,16 @@
            var lookDownBar = 0;              //(0:下查操作；1：直接查看)
            var params = get_UrlVars();       //获取参数

            //var tableFilterIns = tableFilter.render({
            //    'elem': '#mainTable',//table的选择器
            //    'mode': 'local',//过滤模式
            //    'filters': [
            //        { field: '车间', type: 'checkbox' },
            //    ],//过滤项配置
            //    'done': function (filters) {
            //        //结果回调
            //    }
            //})

            //初始化表格
            set_InitGrid();
@@ -2070,6 +2083,34 @@
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 700
                                //, page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                //, limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);

                                    tableFilter.render({
                                        'elem': '#mainTable',
                                        'mode': 'local',
                                        'filters': [
                                            { field: '车间', type: 'input' },
                                            { field: '日期', type: 'date' },
                                            { field: '审核人', type: 'checkbox' },
                                            { field: '任务单', type: 'radio' },
                                        ],
                                        'done': function (filters) { }
                                    }).reload();
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data
                            //判断是否有查看工价权限
@@ -2096,6 +2137,10 @@
                            ins = table.render(option);

                            laypage.render(optionPage);

                            tableFilterIns = table.render(optionPage);
                            tableFilter.render(tableFilterIns);

                            //刷新表格数据
                            DisPlay_HideColumn();