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

yusijie

2025-11-12 126a107aa140a19a6c217de50382cee6fec4ef29

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_KeyElement.html

@@ -252,7 +252,8 @@
                    </script>-->
                    <script type="text/html" id="toolbarDemo2">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>删除</button>
                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>删除</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>刷新</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                        </div>
                    </script>
@@ -323,6 +324,9 @@
                //列设置
                case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
                    break;
                //刷新
                case 'refresh': get_Display();
                    break;
            };
        });
        //镭雕码回车方法
@@ -342,11 +346,6 @@
            var HBarCode_Key = $('#HBarCode_Key').val();
            if (event.keyCode == 13) {
                
                if ($("#HBarCode_SN").val() == "" || $("#HBarCode_SN").val() == null) {
                    layer.msg("未扫SN码请先扫码");
                    $("#HBarCode_SN").focus();
                    return
                }
                if (HBarCode_Key) {
                    txtHBarCodeKey_KeyDown(HBarCode_Key);
                }
@@ -646,7 +645,13 @@
                        //光标跳转到配件码文本框上
                        $("#HBarCode_Key").focus();
                        $("#HBarCode_Key").val("");

                        //如果配件配完自带提交
                        if (areQuantitiesEqual(option.data)) {
                            //保存关键件
                            if (AllowLoadData(data)) {
                                set_SaveBill(data);
                            }
                        }
                        layer.close(indexs);
                    }
                    else {
@@ -1062,7 +1067,23 @@
            //}
            return true;
        }
        //判断是否绑定完
        function areQuantitiesEqual(arr) {
            if (arr.length === 0) {
                return false; // ç©ºæ•°ç»„默认视为满足条件
            }

            const firstHPartsQty = arr[0].HPartsQty;
            const firstHBindingQty = arr[0].HBindingQty;

            for (let i = 1; i < arr.length; i++) {
                if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
                    return false;
                }
            }

            return true;
        }
        //#endregion

    });