111

沙世明

2022-11-22 928399eceec50e3d37ea08669a12789a9410a9d2

 force-app/main/default/staticresources/NewQuoteEntryJS.bin

@@ -161,12 +161,14 @@
}

// 跳转至选择产品页面
function searchProduct(i, str) {
function searchProduct(i, str, celon) {
    // CNY USDを取得
    j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Assert')).attr('readonly', true);
    //    var trade = j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).value();
    //    openPopup('/apex/SearchProduct?trade=' + trade + '&lineno=' + i + '&val=' + str, 'setsearch', 950, 450, 'width=950,height=450,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
    openPopup('/apex/SearchProduct?lineno=' + i + '&val=' + str, 'setsearch', 950, 450, 'width=950,height=450,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
    // Celon询价修改 2022-04-24 ssm start
    openPopup('/apex/SearchProduct?lineno=' + i + '&val=' + str + '&celon=' + celon, 'setsearch', 950, 450, 'width=950,height=450,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
    // Celon询价修改 2022-04-24 ssm end
    //var w = openPopup('/apex/SearchProduct?trade=' + trade + '&lineno=' + i + '&val=' + str, 'search','width=950,height=450');
    //w.focus();
}
@@ -193,12 +195,18 @@
// 页面初始化方法
function calonLoad() {
    var productStatusUpdated = j$(escapeVfId('Page:mainForm:productStatusUpdated')).val();

    //obsap 经销商1合同金额计算 fy start
    var flg=true;
    //obsap 经销商1合同金额计算 fy end
    debugger
    var pathname = window.location.pathname;
    if (pathname.indexOf('SI') != -1) {
        EstimationListPrice.call();
        calUnitPriceTotal.call();
        quoteTotalPrice.call();
        //obsap 经销商1合同金额计算 fy start
        flg=false;
        //obsap 经销商1合同金额计算 fy end
        setOCMAmount.call();
        checkProductStatusValidPeriod();
        ProSFDC_Status_Update();
@@ -227,7 +235,30 @@
        // j$(escapeVfId('Page:mainForm:block:Dealer_Final_Price')).attr('disabled',false);
    }
    // 报价 精琢技术 fy 2021-09-06 end

    //obsap 经销商1合同金额计算 fy start
    if(flg){
        var z = j$(escapeVfId('Page:mainForm:block:quoTotalPrice')).value();
        var s=j$(escapeVfId('Page:mainForm:block:SalesAmount1')).value();
        var id = document.getElementById('Page:mainForm:hiddenQuoid').innerHTML;
        debugger
        if(!id){
            if(!s){
                var IsQuoteTrial =j$(escapeVfId('Page:mainForm:block:IsQuoteTrial')).value();
                if(!IsQuoteTrial){
                    z=localParseFloat(z);
                    j$(escapeVfId('Page:mainForm:block:SalesAmount1')).val(z*0.5);
                    setOCMAmount();
                }
            }
        }
        
    }
    //obsap 经销商1合同金额计算 fy end
    // debugger
    // var SkipQuotefilg = j$(escapeVfId('Page:mainForm:SkipQuotefilg')).value();
    // if(SkipQuotefilg == 'true'){
    //     alert('画面配置变更，已生成新的报价单，请重新做报价计算');
    // }
}
// 格式化数字
function number_format() {
@@ -853,7 +884,19 @@
        y = y + localParseFloat(x);
    }
    j$(escapeVfId('Page:mainForm:block:quoTotalPrice')).val(toNumComma(y));

    //obsap 经销商1合同金额计算 fy start
    var z = j$(escapeVfId('Page:mainForm:block:quoTotalPrice')).value();
    var id = document.getElementById('Page:mainForm:hiddenQuoid').innerHTML;
    debugger
    if(!id){
        var IsQuoteTrial =j$(escapeVfId('Page:mainForm:block:IsQuoteTrial')).value();
        if(!IsQuoteTrial){
            z=localParseFloat(z);
            j$(escapeVfId('Page:mainForm:block:SalesAmount1')).val(z*0.5);
            setOCMAmount();
        }
    }
    //obsap 经销商1合同金额计算 fy end
    //DisCalculation.call();
    DisAmount.call();

@@ -1134,6 +1177,19 @@
        j$(escapeVfId('Page:mainForm:block:hidden_MultiYearWarrantyTotalPrice')).value();
    noDiscountPriceTotal = localParseFloat(noDiscountPriceTotal);
    j$(escapeVfId('Page:mainForm:block:quoTotalPrice')).val(toNumComma(y + x + noDiscountPriceTotal));
    //obsap 经销商1合同金额计算 fy start
    var z = j$(escapeVfId('Page:mainForm:block:quoTotalPrice')).value();
    debugger
    var id = document.getElementById('Page:mainForm:hiddenQuoid').innerHTML;
    if(!id){
        var IsQuoteTrial =j$(escapeVfId('Page:mainForm:block:IsQuoteTrial')).value();
        if(!IsQuoteTrial){
            z=localParseFloat(z);
            j$(escapeVfId('Page:mainForm:block:SalesAmount1')).val(z*0.5);
            setOCMAmount();
        }
    }
    //obsap 经销商1合同金额计算 fy end
    // 多年保修 end
    if (y == 0) {
        j$(escapeVfId('Page:mainForm:block:QuoCalculation')).val(0);
@@ -2036,6 +2092,8 @@
        //            }
        //        }else{
        QuoteDecision.call();
        // var SkipQuotefilg = j$(escapeVfId('Page:mainForm:SkipQuotefilg')).value();
        // console.log('SkipQuotefilg:' + SkipQuotefilg);
        blockme();
        return true; // by katsu なぜ return false？ return true に変更した！