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

wtt

2024-06-11 4475a6d2d7dc245176bcfb704a3275b95a5057fd

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -498,14 +498,7 @@
                set_InitGrid();
                //加载表体和表体数据
                RoadBillMain(linterid);
                //根据销售订单类型设置子表是否取库存选项
                setHisStockGoodsByHBillSubType_For_RoadBillMain();

                //根据是否取库存获取定金比例
                setHEarnestRateByHisStockGoods();

                //设置表头所需金额
                set_HBillMoney($("#HEarnestRate").val() * 1);
                

                //生成并设置主表的内码和单据号
                createBillNo();
@@ -523,14 +516,6 @@
                set_InitGrid();
                //加载表体和表体数据
                RoadBillMain(linterid);
                //根据销售订单类型设置子表是否取库存选项
                setHisStockGoodsByHBillSubType_For_RoadBillMain();

                //根据是否取库存获取定金比例
                setHEarnestRateByHisStockGoods();

                //设置表头所需金额
                set_HBillMoney($("#HEarnestRate").val() * 1);
            }
            //#endregion

@@ -1484,20 +1469,18 @@
                            }
                            option.data = rowdata;

                            //出库数量、开票数量不可编辑
                            //option.cols[0][22].edit = null;
                            //option.cols[0][23].edit = null;

                            table.render(option);

                            //获取临时定金比例
                            HEarnestRateTemp = data.定金比例 + "" == "0" ? "50" : data.定金比例 + "";
                            HEarnestRateTemp = data.定金比例;

                            //刷新表格同时根据option中HisStockGoods值设置下拉列表
                            setSelectHisStockGoodsByTableRender();
                            //根据销售订单类型设置子表是否取库存选项
                            setHisStockGoodsByHBillSubType_For_RoadBillMain();

                            //根据是否取库存获取定金比例
                            setHEarnestRateByHisStockGoods();

                            $("#HEarnestRate").val(data.定金比例);

                            //设置表头所需金额
                            set_HBillMoney($("#HEarnestRate").val() * 1);
@@ -1549,6 +1532,7 @@
            //#endregion

            //#region å®¢æˆ·é€‰æ‹©é¡µé¢
            //#region å®¢æˆ·é€‰æ‹©é¡µé¢
            function get_checkCus() {
                var HEmpID = $("#HEmpID").val();
                layer.open({
@@ -1557,7 +1541,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '客户列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/销售基础资料/Gy_Customer.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_CustomerList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1574,6 +1558,35 @@
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region å®¢æˆ·é€‰æ‹©é¡µé¢-基础资料
            //function get_checkCus() {
            //    var HEmpID = $("#HEmpID").val();
            //    layer.open({
            //        type: 2//弹窗类型
            //        , skin: 'layui-layer-rim' //加上边框
            //        , area: ['90%', '90%']//大小
            //        , title: '客户列表'//标题
            //        , shift: 2//弹出动画
            //        , content: ['../../基础资料/销售基础资料/Gy_Customer.html', 'yes']
            //        , btn: ['确定', '取消']
            //        , btn1: function (index, layero) {//按钮【按钮一】的回调
            //            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
            //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
            //            if (checkStatus.data.length === 0) {
            //                return layer.msg('请选择数据');
            //            }
            //            getCustomerByCusID(checkStatus.data[0].HItemID);
            //            //根据客户获取客户余额
            //            getCustomerBalance(checkStatus.data[0].HItemID);

            //            layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
            //        }
            //        , btn2: function (index, layero) { }
            //    })
            //}
            //#endregion
            //#endregion

            //#region ç»“算方选择页面
@@ -3470,6 +3483,16 @@
            getCustomerBalance(obj[0].HItemID);
        }

        function GetHSupValue(obj)  //返回客户
        {
            //$("#HCusName").val(obj[0].HName);
            //$("#HCusID").val(obj[0].HItemID);
            //根据客户获取相关信息
            getCustomerByCusID(obj[0].HItemID);
            //根据客户获取客户余额
            getCustomerBalance(obj[0].HItemID);
        }

        function GetHManagerValue(obj)  //返回主管
        {
            $("#HManagerName").val(obj[0].职员名称);