wtt
2024-05-28 deef6f184c6db0af46d397419de3883d8cc74ff1
测试bug修复
8个文件已修改
97 ■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Gy_Currency.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Unit.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Currency.html
@@ -382,9 +382,21 @@
                $("#HCurName", window.parent.document).val(data.货币名称);
                $("#HExRate", window.parent.document).val(data.汇率);
                var index = parent.layer.getFrameIndex(window.name);
                parent.GetGyCur(obj.data);
                parent.layer.close(index);
            });
            //#endregion
            table.on('sort(mainTable)', function (obj) { //注:sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序,如果不设的话,将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式)
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });
            //代码回车方法
            $('#HNumber').on('keydown', function (event) {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Unit.html
@@ -389,7 +389,17 @@
                parent.layer.close(index);
            });
            //#endregion
            table.on('sort(mainTable)', function (obj) { //注:sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序,如果不设的话,将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式)
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });
        
         function btnrowDouble(obj) {
WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html
@@ -1030,7 +1030,20 @@
                    layer.msg("请选择主管!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //子表数据检验简单表单验证
                //后续可用多个数组存储列名扩展
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组)
                    }
                    var rowData = option.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行:" + col + "不能为0!");
                            return;
                        }
                    }
                }
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
WebTM/views/²É¹º¹ÜÀí/²É¹ººÏͬ/Add_Edit_Cg_ContractBillList.html
@@ -902,7 +902,7 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                //表单数据检验
                if ($("#HCurID").val() == 0) {
                    layer.msg("请选择币别!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -927,6 +927,28 @@
                    layer.msg("请选择结算方式!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //子表数据简单检验
                //后续可用多个数组存储列名来扩展
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组)
                    }
                    var rowData = option.data[i];
                    var rowData2 = option2.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col !="LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行:" + col + "不能为0!");
                            return;
                        }
                    }
                    for (var col of Object.keys(rowData2)) {
                        if (rowData2[col] == "0" && col != "LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行:" + col + "不能为0!");
                            return;
                        }
                    }
                }
                //物料明细
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -1071,21 +1093,20 @@
                                    OptionData = checkStatus.data[0];
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HUnitID": checkStatus.data[0].HItemID
                                        , "计量单位": checkStatus.data[0].计量单位名称
                                        "HUnitID": OptionData.HItemID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HUnitID": OptionData.HItemID
                                        , "计量单位": OptionData.计量单位名称
                                        "HUnitID": OptionData[0].HItemID
                                        , "计量单位": OptionData[0].计量单位名称
                                    })
                                }
                            })
                        }
                        //货币(TODO æœ‰bug在弹出框排序以后确定,选中元素还是原来位置的(需要在货币资料与计量单位资料中设置排序代码如物料页面))
                        //TODO ä¸Žè´§å¸å’Œè®¡é‡å•位原页面需要设置双击事件
                        //货币
                        if (obj.event == "HCurID") {
                            layer.open({
                                type: 2//弹窗类型
@@ -1356,7 +1377,8 @@
        //双击返回计量单位
        function GetUnitValue(data) {
            OptionData = data
            OptionData = data;
        }
        //双击返回物料
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html
@@ -992,7 +992,20 @@
                    layer.msg("请选择结算方式!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //子表数据检验简单表单验证
                //后续可用多个数组存储列名扩展
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组)
                    }
                    var rowData = option.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行:" + col + "不能为0!");
                            return;
                        }
                    }
                }
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -425,7 +425,6 @@
            table.on('tool(mainTable)' , function (obj) {
                var data = obj.data;
                console.log(data);
                if (obj.event == '单据号') {
                    var linterid = data.hmainid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html
@@ -1744,6 +1744,8 @@
                            }
                            })
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBill_Add_Up.html
@@ -1474,6 +1474,8 @@
                            }
                            })
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }