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

zrg

2024-08-16 3a375fddf701faeae14c9edab442973ed7878767

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -605,13 +605,24 @@
                                                        <input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag" lay-skin="primary" lay-filter="checkbox" value="true" title="是否常用材料">
                                                    </div>
                                                </div>

                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> åŠ æƒå¹³å‡ä»·ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HAvgStockPrice" lay-verify="HAvgStockPrice" id="HAvgStockPrice" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">默认税率</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HTaxRate" lay-verify="HTaxRate" id="HTaxRate" autocomplete="off" value="13">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">默认利润率</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HProfitRate" lay-verify="HProfitRate" id="HProfitRate" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
@@ -620,7 +631,6 @@
                                                        <input class="layui-input" name="HFootPrice" lay-verify="HFootPrice" id="HFootPrice" autocomplete="off" value="0">
                                                    </div>
                                                </div>

                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> å«ç¨Žæˆæœ¬ä»·</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
@@ -876,6 +886,39 @@
                }
            });

            //监听不含税成本价
            $("#HNoTaxCost").blur(function (data) {
                // èŽ·å–输入框的值
                var value = $("#HNoTaxCost").val();
                if (!ref.test(value)) {
                    layer.msg("不含税成本价正确数值", { time: 3000, });
                    $("#HNoTaxCost").val("0");
                } else {
                    var TaxRate = $("#HTaxRate").val();
                    var HProfitRate = $("#HProfitRate").val();
                    var HTaxCost = Number((value * (100 + TaxRate*1) / 100).toFixed(4))   //含税成本价 = ä¸å«ç¨Žæˆæœ¬ * ï¼ˆ100 + ç¨ŽçŽ‡ï¼‰/100 
                    var HFootPrice = Number((HTaxCost * (100 + HProfitRate*1) / 100).toFixed(4))// ç»“ç®—ä»· = å«ç¨Žæˆæœ¬ä»· * ï¼ˆ100+ åˆ©æ¶¦çŽ‡ï¼‰/100
                    $("#HTaxCost").val(HTaxCost);
                    $("#HFootPrice").val(HFootPrice);
                }
            });
            //监听含税成本价
            $("#HTaxCost").blur(function (data) {
                // èŽ·å–输入框的值
                var value = $("#HTaxCost").val();
                if (!ref.test(value)) {
                    layer.msg("不含税成本价正确数值", { time: 3000, });
                    $("#HTaxCost").val("0");
                } else {
                    var TaxRate = $("#HTaxRate").val();
                    var HProfitRate = $("#HProfitRate").val();
                    var HNoTaxCost = Number((value / (100 + TaxRate*1) * 100).toFixed(4))//不含税成本价 = å«ç¨Žæˆæœ¬/ ï¼ˆ100 + ç¨ŽçŽ‡ï¼‰/100 ç»“ç®—ä»· 
                    var HFootPrice = Number((value * (100 + HProfitRate*1) / 100).toFixed(4))
                    $("#HNoTaxCost").val(HNoTaxCost);
                    $("#HFootPrice").val(HFootPrice);
                }
            });

            //选择颜色
            colorpicker.render({
                elem: '#HColorNoName'
@@ -1008,9 +1051,11 @@
                                , "HTaxCost": data.含税成本价
                                , "HNoTaxCost": data.不含税成本价
                                , "HOnceRightRate": data.一次合格率标准值
                                , "HQtyDec": data.数量精度 == null ? "0" : data.数量精度
                                , "HPriceDec": data.单价精度 == null ? "0" : data.单价精度
                                , "HMoneyDec": data.金额精度 == null ? "0" : data.金额精度
                                , "HQtyDec": data.数量精度 == null ? "4" : data.数量精度
                                , "HPriceDec": data.单价精度 == null ? "4" : data.单价精度
                                , "HMoneyDec": data.金额精度 == null ? "2" : data.金额精度
                                , "HTaxRate": data.默认税率 == null ? "13" : data.默认税率
                                , "HProfitRate": data.默认利润率 == null ? "0" : data.默认利润率

                                , "HHeight_M": data.毛高
                                , "HInches_M": data.寸数组织