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

yusijie

2025-01-21 3f992de7c62461ab2ebef30878d867bcea8c7759

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -381,12 +381,12 @@
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            var allVal;

            var topScroll = 0;//记录滚动条的位置
            


            //#endregion

             
            //记录组织的值
            var HOrgIDBar = 0;      //声明了一个名为 HOrgIDBar çš„变量，并将其初始化为 0
            var HModName = "Cg_POOrderBillEdit"
@@ -653,7 +653,7 @@
                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //单价精度
                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //金额精度

                topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//获取滚动条位置
                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();                         //获取当前的值赋值给oldtext           èŽ·å–当前元素（可能是一个表格单元格）的前一个同级元素的文本内容，并将这个文本内容存储在变量oldText中
                var value = obj.value                   //得到修改后的值
@@ -707,7 +707,7 @@
                            , HlineTotal: HlineTotal                         //更新HlineTotal字段，其值来自变量HlineTotal
                            , HlineTotalBB: HlineTotalBB                     //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                        });
                        //table.render(option)
                        table.render(option)
                        break;
                    case "HPrice":                                         //单价
                        //数据格式校验  
@@ -755,7 +755,7 @@
                            , HRelTaxPrice: HRelTaxPrice            //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                        });
                        //table.render(option)
                        table.render(option)
                        break;
                    case "HTaxRate":                                                       //税率
                        //数据格式校验
@@ -805,7 +805,7 @@
                            , HRelTaxPrice: HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB
                        });
                        //table.render(option)
                        table.render(option)
                        break;
                    case "HDiscountRate":                                                       //数量
                        //数据格式校验
@@ -849,6 +849,7 @@
                            , HDiscountRate: HDiscountRate                  //更新HDiscountRate字段，其值来自变量HDiscountRate
                            , HRelTaxPrice: HRelTaxPrice                  //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                        });
                        table.render(option)
                        break;
                    case "HTaxPrice":                                         //含税单价
                        //数据格式校验  
@@ -896,7 +897,7 @@
                            , HRelTaxPrice: HRelTaxPrice            //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                        });
                        //table.render(option)
                        table.render(option)
                        break;
                        
                    default:
@@ -1014,14 +1015,31 @@
                //供应商输入框
                tableSelect.render({
                    elem: '#HSupName',//输入框dom选择
                    checkedKey: 'HItemID',//查询列表主键用于获取历史
                    searchKey: '供应商名称',//查询的列名
                    searchKey: '供应商名称,HItemID',//查询的列名
                    sWhere: '',//table搜索sWhere条件 //默认筛选项
                    ajaxSelect: function (sWhere) {
                        var data = '';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Supplier/list',
                            type: "GET",
                            data: { "sWhere": sWhere, "user": '翁涛涛', "Organization": '浙江智云迈思' },
                            async: false,
                            success: function (data1) {
                                if (data1.count == 1) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        url: GetWEBURL() + 'Gy_Supplier/page',
                        where: { user: '翁涛涛', Organization: '浙江智云迈思' },
                        //url: GetWEBURL() + 'Gy_Supplier/page',
                        //where: { user: '翁涛涛', Organization: '浙江智云迈思' },
                        cols: [[
                            { type: 'radio' },
                            { type: 'checkbox', fixed: 'left' },//需要加这个fixed属性不然点击checkbox会触发行点击导致无法正确点击
                            { field: 'HItemID', title: 'HItemID' },
                            { field: '供应商名称', title: '供应商名称' },
                        ]],
@@ -1069,6 +1087,9 @@
                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                    ]]
                    , done: function (res, curr, count) {
                        $(".layui-table-main").scrollTop(topScroll);
                    }
                }

                option.data = rowdata;   //子表的值赋值给option.data   å‘option对象添加一个data属性，并将其设置为rowdata