测试上载多年保内容

denny chen

2023-03-29 db8e77d60465f32b033d7a67fb3a008263fd9e9e

测试上载多年保内容

 force-app/main/default/classes/SelectAssetEstimateVMController.cls

@@ -137,7 +137,7 @@
    public Decimal Denominator {get; set; }
    public Decimal Accrued {get; set; }
    public String ProductModel{get;set;}
    public String Category{get;set;}
    // public String Category{get;set;}
    public Decimal Consumption_rate_Gurante{get;set;}


@@ -397,9 +397,9 @@
                      //URF限次合同2期 LY 20220811 end

                      //多年保设备续签计算逻辑调整 2022/12/14 start 消费率
                      // +'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,Product2.Category4__c,Product2.Asset_Model_No__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
                      // +'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
                      // +'CurrentContract_F__r.endDateGurantee__c,'
                      +'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,Product2.Category4__c,Product2.Asset_Model_No__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
                      +'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
                      +'CurrentContract_F__r.endDateGurantee__c,'
                      //多年保设备续签计算逻辑调整 2022/12/14 end

                      + 'CurrentContract_End_Date__c, Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c,AssetMark__c,NoPartRiskDate_F__c,NoPartRiskDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' ';
@@ -1042,14 +1042,14 @@
                            // ,IS_StandardPricing__c
                            // 报价规则改善 20230315 end
                            //多年保设备续签计算逻辑调整 2023/1/17 start
                            // ,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
                            // ,CurrentContract_F_asset__r.Maintenance_Price_Year__c
                            // ,CurrentContract_F_asset__r.IS_VMContract_Asset__c
                            // ,Product2.Asset_Model_No__c
                            // ,Product2.Category4__c
                            // ,CurrentContract_F__r.endDateGurantee__c
                            ,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
                            ,CurrentContract_F_asset__r.Maintenance_Price_Year__c
                            ,CurrentContract_F_asset__r.IS_VMContract_Asset__c
                            ,Product2.Asset_Model_No__c
                            ,Product2.Category4__c
                            ,CurrentContract_F__r.endDateGurantee__c
                            //添加是否服务多年保修，多年保维修期至
                            // ,IS_Extend_Gurantee__c,Extend_Gurantee_DateTo__c
                            ,IS_Extend_Gurantee__c,Extend_Gurantee_DateTo__c
                             //多年保设备续签计算逻辑调整 2023/1/17 end
                            FROM Asset WHERE Hospital__c = :this.targetHospitalId AND ( AssetMark__c != '耗材' OR Product2.Family != 'ET' ) ORDER BY ID, IF_Warranty_Service__c asc];
            //JZHG-BSDUT4 ---20200825---update By rentongxiao---Start
@@ -1099,12 +1099,12 @@
                Asset__r.CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,
                Asset__r.CurrentContract_F_asset__r.endDateGurantee_Text__c,
                //多年保设备续签计算逻辑调整 2023/1/18 start 设备消费率
                // Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c,
                // Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c,
                // Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c,
                // Asset__r.Product2.Asset_Model_No__c,
                // Asset__r.Product2.Category4__c,
                // Asset__r.CurrentContract_F__r.endDateGurantee__c,
                Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c,
                Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c,
                Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c,
                Asset__r.Product2.Asset_Model_No__c,
                Asset__r.Product2.Category4__c,
                Asset__r.CurrentContract_F__r.endDateGurantee__c,
                //多年保设备续签计算逻辑调整 2022/1/18 end
                Asset__r.CurrentContract_F__r.First_Estimate_Date__c,
                Asset__r.CurrentContract_F__r.Contract_Consumption_rate__c,
@@ -1224,7 +1224,7 @@
                                                                Asset__r.EquipmentGuaranteeFlg__c,
                                                                //2021-11-30 fy add LJPH-C8W8FV 置顶 start
                                                                Asset__r.OwnershipMachine_No__c,
                                                                // Product_Manual__r.Category4__c,
                                                                Product_Manual__r.Category4__c,
                                                                //2021-11-30 fy add LJPH-C8W8FV 置顶 end
                                                                Asset_Consumption_rate__c,
                                                                Asset__r.CurrentContract_F__c,
@@ -1297,12 +1297,12 @@
                                                                // Gzw 20200807 五个去年合同相关，所以报价产品，获取上期合同 eng
                                                                // LJPH-C9GD34 gzw fix start
                                                                //市场多年保修价格开发 2023/01/28 start
                                                                // ,Asset__r.Product2.Asset_Model_No__c
                                                                // ,Asset__r.Product2.Category4__c
                                                                // ,Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c
                                                                // ,Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c
                                                                // ,Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c
                                                                // ,Asset__r.CurrentContract_F__r.endDateGurantee__c
                                                                ,Asset__r.Product2.Asset_Model_No__c
                                                                ,Asset__r.Product2.Category4__c
                                                                ,Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c
                                                                ,Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c
                                                                ,Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c
                                                                ,Asset__r.CurrentContract_F__r.endDateGurantee__c
                                                                //市场多年保修价格开发 2023/01/28 end

                                                                ,Estimate_List_Price_Page__c
@@ -1353,7 +1353,7 @@
        // Map<String,repair__c> assNewRepMap  = new Map<String,repair__c>();
        // assNewRepMap = getNewrep(this.assetRecords);
        datatemp = getChartData();
        // System.debug(LoggingLevel.INFO, '*** this.assetRecords: ' + this.assetRecords);
        System.debug(LoggingLevel.INFO, '*** this.assetRecords: ' + this.assetRecords);
        for (Asset ast : this.assetRecords) {
            Boolean isNew = false;
            Decimal listPrice = ast.Maintenance_Price_Month__c;
@@ -1410,7 +1410,7 @@
                //
                //
                //
                // ast.CurrentContract_End_Date__c = ast.CurrentContract_F_asset__r.IS_VMContract_Asset__c ? ast.Extend_Gurantee_DateTo__c : ast.CurrentContract_End_Date__c;
                ast.CurrentContract_End_Date__c = ast.CurrentContract_F_asset__r.IS_VMContract_Asset__c ? ast.Extend_Gurantee_DateTo__c : ast.CurrentContract_End_Date__c;
                checkedAssets.add(new AssetInfo(checkedAssets.size(), ast, isNew, listPrice, selectedLocal,estimate));

            } else {
@@ -1434,7 +1434,7 @@
             */
        }

            // System.debug(LoggingLevel.INFO, '*** checkedAssets: ' + checkedAssets);
            System.debug(LoggingLevel.INFO, '*** checkedAssets: ' + checkedAssets);
        totalPage = (totalRecords / selctRecordNum) + (Math.mod(totalRecords, selctRecordNum) > 0 ? 1 : 0);
    
        system.debug('顺序检测' + checkedAssets);
@@ -1461,7 +1461,7 @@
        //2021-11-30 fy add LJPH-C8W8FV 置顶 start
        List<AssetInfo> topAsset =new List<AssetInfo>();
        List<AssetInfo> otherAsset =new List<AssetInfo>();
        // System.debug(LoggingLevel.INFO, '*** 顺序: ' + checkedAssets);
        System.debug(LoggingLevel.INFO, '*** 顺序: ' + checkedAssets);
        for(AssetInfo ched : checkedAssets){
            system.debug('顺序检测2' + ched.ProductModelNoc);
            system.debug('顺序检测3' + ched.AssetModelNoc);
@@ -1486,7 +1486,7 @@
        }
        checkedAssets=NumberSort;
        //2021-11-30 fy add LJPH-C8W8FV 置顶 end
    // System.debug(LoggingLevel.INFO, '*** checkedAssetsEND: ' + checkedAssets);
    System.debug(LoggingLevel.INFO, '*** checkedAssetsEND: ' + checkedAssets);
    }
    
    //
@@ -1535,12 +1535,12 @@
                            + 'URF_Maintenance_Contract__c,URF_Maintenance_Contract__r.Management_Code__c,URF_Maintenance_Contract__r.Contract_End_Date__c,'
                            //URF限次合同2期 LY 20220811 end
                            //市场多年保价格开发 start DC 2023/01/17 设备消费率 产品型号 第四分类 是否为多年保设备
                            // + 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,'
                            // + 'CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
                            // + 'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
                            // + 'Product2.Asset_Model_No__c,'
                            // + 'Product2.Category4__c,'
                            // + 'CurrentContract_F__r.endDateGurantee__c,'
                            + 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,'
                            + 'CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
                            + 'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
                            + 'Product2.Asset_Model_No__c,'
                            + 'Product2.Category4__c,'
                            + 'CurrentContract_F__r.endDateGurantee__c,'
                            //市场多年保价格开发 end DC 2023/01/17
                            + 'Product2.ProductURF__c,CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' '
                            + 'AND Id NOT IN ' + notInId;
@@ -1600,7 +1600,7 @@
            //URF限次合同2期 LY 20220811 end
            
            //市场多年保价格开发 start DC 2023/01/17 设备消费率
            // sqlStr += 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,CurrentContract_F_asset__r.IS_VMContract_Asset__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,Product2.Asset_Model_No__c,Product2.Category4__c,CurrentContract_F__r.endDateGurantee__c,';
            sqlStr += 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,CurrentContract_F_asset__r.IS_VMContract_Asset__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,Product2.Asset_Model_No__c,Product2.Category4__c,CurrentContract_F__r.endDateGurantee__c,';
            //市场多年保价格开发 start DC 2023/01/17

            sqlStr += ' CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\'';
@@ -3956,23 +3956,23 @@
                //2.一年以上的合同，在结束前6个月开始可以开放续签报价。
                //3.管理员跳过，
                //WLIG-CDFBV3 开通续签报价为true的可以开放续签报价 thh 20220413
                if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && 
                        String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') {
                // if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && 
                //         String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') {

                    Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c);
                    Decimal monthCon = (Decimal)noOfDays / 365 * 12;
                    // 可开始报价的月数限制
                    if (input.rec.CurrentContract_F__r.Contract_Range__c >= 12 && monthCon > 6) {
                        input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 合同结束前6个月开始可以制作报价。');
                        rtn = false;
                    }
                    //ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '---' + monthCon  + ' +++ ' + Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c/2)));
                    //rtn = false;
                    if (input.rec.CurrentContract_F__r.Contract_Range__c < 12 && monthCon > Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c / 2)) {
                        input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 经历月数过半方可制作报价');
                        rtn = false;
                    }
                }
                //     Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c);
                //     Decimal monthCon = (Decimal)noOfDays / 365 * 12;
                //     // 可开始报价的月数限制
                //     if (input.rec.CurrentContract_F__r.Contract_Range__c >= 12 && monthCon > 6) {
                //         input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 合同结束前6个月开始可以制作报价。');
                //         rtn = false;
                //     }
                //     //ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '---' + monthCon  + ' +++ ' + Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c/2)));
                //     //rtn = false;
                //     if (input.rec.CurrentContract_F__r.Contract_Range__c < 12 && monthCon > Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c / 2)) {
                //         input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 经历月数过半方可制作报价');
                //         rtn = false;
                //     }
                // }
        // 多年保判断
        if ( String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') {
            //if (UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') {
@@ -3982,16 +3982,18 @@
            Decimal monthCon = (Decimal)noOfDays/365*12;


            //市场多年保修价格开发 DC 2023/02/02 Start  结束日空白期大于6个月 报错提示
            //市场多年保修价格开发 DC 2023/02/02 Start  结束日空白期大于6个月 报错提示 新的合同报价开始日期和上一期合同

            // Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
            // Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;


            // if(today>endDate6Month && cotractEndDay <today){
            //     input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 市场多年保结束已超过6个月，由于空白期过长，请先联系服务管理部评估。');

            // }
            Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
            Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;
            System.debug(LoggingLevel.INFO, '*** endDate6Month: ' + endDate6Month);
            System.debug(LoggingLevel.INFO, '*** cotractEndDay: ' + cotractEndDay);
            System.debug(LoggingLevel.INFO, '*** this.estimate.Contract_Esti_Start_Date__c: ' + this.estimate.Contract_Esti_Start_Date__c);
            if(this.estimate.Contract_Esti_Start_Date__c >endDate6Month && cotractEndDay < this.estimate.Contract_Esti_Start_Date__c){
                System.debug(LoggingLevel.INFO, '*** meet error: ' );
                input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 市场多年保结束已超过6个月，由于空白期过长，请先联系服务管理部评估。');
                rtn = false;
            }

            //市场多年保修价格开发 DC 2023/02/02 end

@@ -4001,18 +4003,18 @@
            // gzw 20220630 开通续签报价权限后，超过6个月也可以续签
            // 续签情况 ① 上期合同 Open_RenewalQuotation__c & 6个月以内  ② VM_Contract_Check__c Open_RenewalQuotation__c 2个都打钩
            // ① 2个开关都打开 ②VM_Contract_Check__c打开 小于6个月
            if (!((this.contract.Open_RenewalQuotation__c && input.rec.CurrentContract_F__r.VM_Contract_Check__c) || (input.rec.CurrentContract_F__r.VM_Contract_Check__c && monthCon < 6))) {
                if(monthCon < 6){
                    input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 可以加入服务合同，加入价格请联系服务管理部。');
                }else{
                    input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 没有续签报价权限，或者还没到续签时间。');
                }
                // System.debug(LoggingLevel.INFO, '*** this.contract.Open_RenewalQuotation__c: ' + this.contract.Open_RenewalQuotation__c);
                // System.debug(LoggingLevel.INFO, '*** : input.rec.CurrentContract_F__r.VM_Contract_Check__c' + input.rec.CurrentContract_F__r.VM_Contract_Check__c);
                // System.debug(LoggingLevel.INFO, '*** monthCon: ' + monthCon);
                //input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 没有续签报价权限，或者还没到续签时间。');
                rtn = false;
            }
            // if (!((this.contract.Open_RenewalQuotation__c && input.rec.CurrentContract_F__r.VM_Contract_Check__c) || (input.rec.CurrentContract_F__r.VM_Contract_Check__c && monthCon < 6))) {
            //     if(monthCon < 6){
            //         input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 可以加入服务合同，加入价格请联系服务管理部。');
            //     }else{
            //         input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 没有续签报价权限，或者还没到续签时间。');
            //     }
            //     System.debug(LoggingLevel.INFO, '*** this.contract.Open_RenewalQuotation__c: ' + this.contract.Open_RenewalQuotation__c);
            //     System.debug(LoggingLevel.INFO, '*** : input.rec.CurrentContract_F__r.VM_Contract_Check__c' + input.rec.CurrentContract_F__r.VM_Contract_Check__c);
            //     System.debug(LoggingLevel.INFO, '*** monthCon: ' + monthCon);
            //     //input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 没有续签报价权限，或者还没到续签时间。');
            //     rtn = false;
            // }
            /*if (input.rec.CurrentContract_F__r.Gurantee_Renew_startDate__c > Date.today()) {
                input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 第一个设备结束后可以制作报价。');
                rtn = false;
@@ -4169,7 +4171,7 @@
    public class AssetInfo {
    // 新合同备品确保提供 当前标记
    public Boolean etGFlg {get; set;}
    // public String ISStandardPricing{get; set;}
    public String ISStandardPricing{get; set;}
    public Integer lineNo {get; private set;}
    public Decimal Repair_Price_Auto {get; set;}
    public String Agreed_Date{get; set;}
@@ -4180,7 +4182,7 @@
    public Maintenance_Contract_Estimate__c estimate {get; set;}
    public Transient Decimal orgPrice {get; private set;}
    public Transient Decimal orgPrice12 {get; private set;}
    // public String Blank_period {get;  set;}
    public String Blank_period {get;  set;}
    // add by fxk 2021/9/9 控制点检对象是否可选 Star
    public Boolean CheckRows {get; private set;}
    // add by fxk 2021/9/9 控制点检对象是否可选 End
@@ -4202,7 +4204,7 @@
    public String MDMModelNoc;
    //2021-11-30 fy add LJPH-C8W8FV 置顶 end
    //市场多年保 价格开发 start 2023/01/17
    // public String Category;
    public String Category;
    //市场多年保 价格开发 end 2023/01/17
    public Id getRecId() {
        Id rtn = null;
@@ -4237,7 +4239,7 @@
    public AssetInfo(Integer lineNo, Asset record, Boolean isNew, Decimal listPrice, Maintenance_Contract_Asset_Estimate__c mcae,Maintenance_Contract_Estimate__c estimate) {
        this.lineNo = lineNo;
        this.rec = record;
        // this.rec.CurrentContract_End_Date__c = record.CurrentContract_End_Date__c;
        this.rec.CurrentContract_End_Date__c = record.CurrentContract_End_Date__c;
        // this.rec.CurrentContract_End_Date__c = record.IS_Extend_Gurantee__c ? record.Extend_Gurantee_DateTo__c : record.CurrentContract_End_Date__c;
        // this.ISStandardPricing = record.IS_StandardPricing__c;
        this.estimate = new Maintenance_Contract_Estimate__c();
@@ -4329,7 +4331,7 @@
        //add by rentx 2020-11-12 LJPH-BV93RZ end

        //市场多年保 价格开发 start 2023/01/17
        // this.Category = mcae.Product_Manual__r.Category4__c;
        this.Category = mcae.Product_Manual__r.Category4__c;
        //市场多年保 价格开发 end 2023/01/17

        //add by mzy 2021-02-07 start
@@ -4387,7 +4389,7 @@
        //2021-11-30 fy add LJPH-C8W8FV 置顶 end

        //市场多年保 价格开发 start 2023/01/17
        // this.Category = mcae.Product_Manual__r.Category4__c;
        this.Category = mcae.Product_Manual__r.Category4__c;
        //市场多年保 价格开发 end 2023/01/17
    }
    

 force-app/main/default/pages/SelectAssetEstimateVM.page

@@ -41,9 +41,11 @@
window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });

var RCbottonChanged = 0;
// 故障品


var hasSendEmail = {!hasSendEmail};
console.log('***hasSendEmail',hasSendEmail)// 故障品;
// if(hasSendEmail == true){
//     j$(escapeVfId('allPage:allForm:emailSend')).attr("disabled", true);
//     j$(escapeVfId('allPage:allForm:emailSend')).attr("class", 'btnDisabled');
@@ -362,7 +364,7 @@
    }
    
    if ('{!DecideBtnDisabled}' == 'false') {
        // console.log('oldMainteReal修改完成');
        console.log('oldMainteReal修改完成');
        j$(escapeVfId('allPage:allForm:allBlock:contractInfo:oldMainteReal')).val(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:mainteReal')).text());
    }
}
@@ -393,7 +395,7 @@
}

function checkDiscount(val) {
    // var alerts = 0;
    var alerts = 0;
    if (val == null || val == "") {
        j$(escapeVfId('allPage:allForm:allBlock:contractInfo:quotation_Amount')).val("");
        j$(escapeVfId('allPage:allForm:allBlock:contractInfo:discount_Rate')).text("");
@@ -751,7 +753,7 @@
        var assetListmonth = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();

        //市场多年保修价格开发 DC 2023/02/09 start 
        // var VMassetListmonth = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Maintenance_Price_Year__c')).val();
        var VMassetListmonth = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Maintenance_Price_Year__c')).val();
        // console.log('***合同定价:'+VMassetListmonth);
        //市场多年保修价格开发 DC 2023/02/09 end 

@@ -781,7 +783,7 @@
                }
                var b = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contract_No')).value();
                var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();
                // console.log('***维修合同记录类型1'+LastMContractRecord);
                console.log('***维修合同记录类型1'+LastMContractRecord);
                if(b != ''){
                    conCCount ++;
                    // 1.合同期不满一年时，合同期超过一半才可开始续签报价。(eg:11个月的合同从6个月后才可报价。)
@@ -834,106 +836,106 @@

                            //市场多年保修价格开发 DC 2023/1/30 start 

                        //     var Maxcoefficient =0;
                        //     var Mincoefficient =0;
                            var Maxcoefficient =0;
                            var Mincoefficient =0;

                        //     var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());
                            var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());

                        //     var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                        //     // console.log('***消费率:'+AssetRate);
                            var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                            // console.log('***消费率:'+AssetRate);

                        //      j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');
                             j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');

                        //     if(AssetRate>0 &&AssetRate<=0.5){
                        //         Maxcoefficient = (1-0.3);
                        //         Mincoefficient = (1-0.4);
                        //     }else if(AssetRate>0.5 &&AssetRate<=0.6){
                        //         Maxcoefficient = (1-0.2);
                        //         Mincoefficient = (1-0.3);
                            if(AssetRate>0 &&AssetRate<=0.5){
                                Maxcoefficient = (1-0.3);
                                Mincoefficient = (1-0.4);
                            }else if(AssetRate>0.5 &&AssetRate<=0.6){
                                Maxcoefficient = (1-0.2);
                                Mincoefficient = (1-0.3);
                                
                        //     }else if(AssetRate>0.6 &&AssetRate<=0.7){
                        //         Maxcoefficient = (1-0.15);
                        //         Mincoefficient = (1-0.25);
                            }else if(AssetRate>0.6 &&AssetRate<=0.7){
                                Maxcoefficient = (1-0.15);
                                Mincoefficient = (1-0.25);
                                
                        //     }else if(AssetRate>0.7 &&AssetRate<=0.8){
                        //         Maxcoefficient = (1-0.1);
                        //         Mincoefficient = (1-0.2);
                            }else if(AssetRate>0.7 &&AssetRate<=0.8){
                                Maxcoefficient = (1-0.1);
                                Mincoefficient = (1-0.2);
                                
                        //     }else if(AssetRate>0.8 &&AssetRate<=0.9){
                        //         Maxcoefficient = (1-0.05);
                        //         Mincoefficient = (1-0.15);
                            }else if(AssetRate>0.8 &&AssetRate<=0.9){
                                Maxcoefficient = (1-0.05);
                                Mincoefficient = (1-0.15);
                                
                        //     }else if(AssetRate>0.9 &&AssetRate<=1.0){
                        //         Maxcoefficient = 1;
                        //         Mincoefficient = (1-0.05);
                            }else if(AssetRate>0.9 &&AssetRate<=1.0){
                                Maxcoefficient = 1;
                                Mincoefficient = (1-0.05);
                                
                        //     }else if(AssetRate>1.0 &&AssetRate<=1.1){
                        //         Maxcoefficient = (1+0.05);
                        //         Mincoefficient = 1;
                            }else if(AssetRate>1.0 &&AssetRate<=1.1){
                                Maxcoefficient = (1+0.05);
                                Mincoefficient = 1;
                                
                        //     }else if(AssetRate>1.1 &&AssetRate<=1.2){
                        //         Maxcoefficient = (1+0.1);
                        //         Mincoefficient = 1;
                            }else if(AssetRate>1.1 &&AssetRate<=1.2){
                                Maxcoefficient = (1+0.1);
                                Mincoefficient = 1;
                                
                        //     }else if(AssetRate>1.2 &&AssetRate<=1.3){
                        //         Maxcoefficient = (1+0.2);
                        //         Mincoefficient = (1+0.1);
                            }else if(AssetRate>1.2 &&AssetRate<=1.3){
                                Maxcoefficient = (1+0.2);
                                Mincoefficient = (1+0.1);
                                
                        //     }else if(AssetRate>1.3 &&AssetRate<=1.4){
                        //         Maxcoefficient = (1+0.25);
                        //         Mincoefficient = (1+0.15);
                            }else if(AssetRate>1.3 &&AssetRate<=1.4){
                                Maxcoefficient = (1+0.25);
                                Mincoefficient = (1+0.15);
                                
                        //     }else if(AssetRate>1.4){
                        //         Maxcoefficient = (1+0.3);
                        //         Mincoefficient = (1+0.2);
                            }else if(AssetRate>1.4){
                                Maxcoefficient = (1+0.3);
                                Mincoefficient = (1+0.2);
                                
                        //     }
                        //     //市场多年保修价格开发 DC 2023/1/30 end 
                        //     // console.log('***最高系数'+Maxcoefficient);
                        //     // console.log('***最低系数'+Mincoefficient);
                            }
                            //市场多年保修价格开发 DC 2023/1/30 end 
                            // console.log('***最高系数'+Maxcoefficient);
                            // console.log('***最低系数'+Mincoefficient);

                        // if(nowdate < Date.parse(lastendDate)){
                        //     //设备小于两年半
                        //     // upPrice = strMoney;
                        //     // downPrice = strMoney * 0.8;
                        // // console.log('***小于2年半')
                        // // 市场多年保修价格开发 start DC 2023/01/19  
                        //     //市场多年保设备小于2年半
                        //     var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                        //     var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                        //     // console.log('***设备型号'+AssetModelNo);
                        //     // console.log('***产品类型'+Category4);
                        if(nowdate < Date.parse(lastendDate)){
                            //设备小于两年半
                            // upPrice = strMoney;
                            // downPrice = strMoney * 0.8;
                        // console.log('***小于2年半')
                        // 市场多年保修价格开发 start DC 2023/01/19  
                            //市场多年保设备小于2年半
                            var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                            var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                            // console.log('***设备型号'+AssetModelNo);
                            // console.log('***产品类型'+Category4);

                        //     //设备设备消费率小于1.4
                        //     if(AssetRate<1.4){
                        //         upPrice = VMassetListmonth * ContractMonth /12;
                        //         // console.log('消费率小于1.4 upPrice = 定价 *经历月数 /12'+ upPrice);
                            //设备设备消费率小于1.4
                            if(AssetRate<1.4){
                                upPrice = VMassetListmonth * ContractMonth /12;
                                // console.log('消费率小于1.4 upPrice = 定价 *经历月数 /12'+ upPrice);

                        //         if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                        //             downPrice = upPrice;
                        //             // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);
                                if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                                    downPrice = upPrice;
                                    // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);

                        //         }else{
                        //             downPrice = upPrice * 0.8;
                        //             // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);
                                }else{
                                    downPrice = upPrice * 0.8;
                                    // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);

                        //         }
                        //     }else{
                        //         upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                        //         downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                        //         // console.log('消费率大于1.4 upPrice'+ upPrice);
                        //         // console.log('消费率大于1.4 downPrice'+ downPrice);
                        //     }
                        //     // 市场多年保修价格开发 end DC 2023/01/19  
                        //     }else{
                        //         // upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
                        //         // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
                                }
                            }else{
                                upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                                // console.log('消费率大于1.4 upPrice'+ upPrice);
                                // console.log('消费率大于1.4 downPrice'+ downPrice);
                            }
                            // 市场多年保修价格开发 end DC 2023/01/19  
                            }else{
                                // upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
                                // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);


                        //         //市场多年保修价格开发 DC 2023/1/30 start  设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数
                                //市场多年保修价格开发 DC 2023/1/30 start  设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数
                               
                        //         upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                        //         downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
                                upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;

                                // console.log('设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数 upPrice'+ upPrice);
                                // console.log('设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数 downPrice'+ downPrice);
@@ -945,18 +947,18 @@
                        }else{
                            upPrice = strMoney;
                            downPrice = strMoney * 0.8;
                            // console.log('选择1');
                            console.log('选择1');
                        }
                    }else{
                        upPrice = (LastMContract_Price * Punish) * (1 + Adjustment_ratio_Upper/100);
                        downPrice = (LastMContract_Price * Punish) * (1 + Adjustment_ratio_Lower/100);
                        // console.log('选择2');
                        console.log('选择2');
                    }
                }else{
                    //firstCCount ++;
                    upPrice = strMoney;
                    downPrice = strMoney * 0.8;
                    // console.log('选择3');
                    console.log('选择3');
                }
                // 上下限四舍五入
                upPrice = upPrice.toFixed(2);
@@ -1064,60 +1066,60 @@
                        // console.log('**结束日',lastendDate);
                        //市场多年保修价格开发 DC 2023/1/30 start 

                            // var Maxcoefficient =0;
                            // var Mincoefficient =0;
                            var Maxcoefficient =0;
                            var Mincoefficient =0;

                            // var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());
                            // // console.log('***经历月数'+ContractMonth);
                            // var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                            // // console.log('***消费率:'+AssetRate);
                            var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());
                            // console.log('***经历月数'+ContractMonth);
                            var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                            // console.log('***消费率:'+AssetRate);

                            //  j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');
                             j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');

                            // if(AssetRate>0 &&AssetRate<=0.5){
                            //     Maxcoefficient = (1-0.3);
                            //     Mincoefficient = (1-0.4);
                            // }else if(AssetRate>0.5 &&AssetRate<=0.6){
                            //     Maxcoefficient = (1-0.2);
                            //     Mincoefficient = (1-0.3);
                            if(AssetRate>0 &&AssetRate<=0.5){
                                Maxcoefficient = (1-0.3);
                                Mincoefficient = (1-0.4);
                            }else if(AssetRate>0.5 &&AssetRate<=0.6){
                                Maxcoefficient = (1-0.2);
                                Mincoefficient = (1-0.3);
                                
                            // }else if(AssetRate>0.6 &&AssetRate<=0.7){
                            //     Maxcoefficient = (1-0.15);
                            //     Mincoefficient = (1-0.25);
                            }else if(AssetRate>0.6 &&AssetRate<=0.7){
                                Maxcoefficient = (1-0.15);
                                Mincoefficient = (1-0.25);
                                
                            // }else if(AssetRate>0.7 &&AssetRate<=0.8){
                            //     Maxcoefficient = (1-0.1);
                            //     Mincoefficient = (1-0.2);
                            }else if(AssetRate>0.7 &&AssetRate<=0.8){
                                Maxcoefficient = (1-0.1);
                                Mincoefficient = (1-0.2);
                                
                            // }else if(AssetRate>0.8 &&AssetRate<=0.9){
                            //     Maxcoefficient = (1-0.05);
                            //     Mincoefficient = (1-0.15);
                            }else if(AssetRate>0.8 &&AssetRate<=0.9){
                                Maxcoefficient = (1-0.05);
                                Mincoefficient = (1-0.15);
                                
                            // }else if(AssetRate>0.9 &&AssetRate<=1.0){
                            //     Maxcoefficient = 1;
                            //     Mincoefficient = (1-0.05);
                            }else if(AssetRate>0.9 &&AssetRate<=1.0){
                                Maxcoefficient = 1;
                                Mincoefficient = (1-0.05);
                                
                            // }else if(AssetRate>1.0 &&AssetRate<=1.1){
                            //     Maxcoefficient = (1+0.05);
                            //     Mincoefficient = 1;
                            }else if(AssetRate>1.0 &&AssetRate<=1.1){
                                Maxcoefficient = (1+0.05);
                                Mincoefficient = 1;
                                
                            // }else if(AssetRate>1.1 &&AssetRate<=1.2){
                            //     Maxcoefficient = (1+0.1);
                            //     Mincoefficient = 1;
                            }else if(AssetRate>1.1 &&AssetRate<=1.2){
                                Maxcoefficient = (1+0.1);
                                Mincoefficient = 1;
                                
                            // }else if(AssetRate>1.2 &&AssetRate<=1.3){
                            //     Maxcoefficient = (1+0.2);
                            //     Mincoefficient = (1+0.1);
                            }else if(AssetRate>1.2 &&AssetRate<=1.3){
                                Maxcoefficient = (1+0.2);
                                Mincoefficient = (1+0.1);
                                
                            // }else if(AssetRate>1.3 &&AssetRate<=1.4){
                            //     Maxcoefficient = (1+0.25);
                            //     Mincoefficient = (1+0.15);
                            }else if(AssetRate>1.3 &&AssetRate<=1.4){
                                Maxcoefficient = (1+0.25);
                                Mincoefficient = (1+0.15);
                                
                            // }else if(AssetRate>1.4){
                            //     Maxcoefficient = (1+0.3);
                            //     Mincoefficient = (1+0.2);
                            }else if(AssetRate>1.4){
                                Maxcoefficient = (1+0.3);
                                Mincoefficient = (1+0.2);
                                
                            // }
                            }
                            //市场多年保修价格开发 DC 2023/1/30 end 
                            // console.log('***最高系数'+Maxcoefficient);
                            // console.log('***最低系数'+Mincoefficient);
@@ -1132,43 +1134,43 @@
                        //     // upPrice = strMoney;
                        //     // downPrice = strMoney * 0.8;
                            
                        // // 市场多年保修价格开发 start DC 2023/01/19  
                        //     //市场多年保设备小于2年半
                        //     var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                        //     var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                        //     // console.log('***设备型号'+AssetModelNo);
                        //     // console.log('***产品类型'+Category4);
                        // 市场多年保修价格开发 start DC 2023/01/19  
                            //市场多年保设备小于2年半
                            var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                            var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                            // console.log('***设备型号'+AssetModelNo);
                            // console.log('***产品类型'+Category4);

                        //     //设备设备消费率小于1.4
                        //     if(AssetRate<1.4){
                        //         upPrice = VMassetListmonth *ContractMonth / 12;
                        //         // console.log('消费率小于1.4 upPrice = VMassetListmonth *month /12'+ upPrice);
                            //设备设备消费率小于1.4
                            if(AssetRate<1.4){
                                upPrice = VMassetListmonth *ContractMonth / 12;
                                // console.log('消费率小于1.4 upPrice = VMassetListmonth *month /12'+ upPrice);

                        //         if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                        //             downPrice = upPrice;
                        //             // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);
                                if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                                    downPrice = upPrice;
                                    // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);

                        //         }else{
                        //             downPrice = upPrice * 0.8;
                        //             // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);
                                }else{
                                    downPrice = upPrice * 0.8;
                                    // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);

                        //         }
                        //     }else{
                        //         upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                        //         downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                        //         // console.log('消费率大于1.4 upPrice'+ upPrice);
                        //         // console.log('消费率大于1.4 downPrice'+ downPrice);
                        //     }
                        // // 市场多年保修价格开发 end DC 2023/01/19      
                                }
                            }else{
                                upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                                // console.log('消费率大于1.4 upPrice'+ upPrice);
                                // console.log('消费率大于1.4 downPrice'+ downPrice);
                            }
                        // 市场多年保修价格开发 end DC 2023/01/19      

                        // }else{
                        //     //设备大于两年半
                        //     // upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
                        //     // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
                        }else{
                            //设备大于两年半
                            // upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
                            // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);

                        //     //市场多年保修价格开发 DC 2023/1/30 start  设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数
                        //     upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                        //     downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
                            //市场多年保修价格开发 DC 2023/1/30 start  设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数
                            upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                            downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;

                            // console.log('设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数 upPrice'+ upPrice);
                            // console.log('设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数 downPrice'+ downPrice);
@@ -1178,12 +1180,12 @@
                    }else{
                        upPrice = strMoney;
                        downPrice = strMoney * 0.8;
                        // console.log('选择4');
                        console.log('选择4');
                    }
                }else{
                    upPrice = (LastMContract_Price * Punish) * (1 + Adjustment_ratio_Upper/100);
                    downPrice = (LastMContract_Price * Punish) * (1 + Adjustment_ratio_Lower/100);
                    // console.log('选择5');
                    console.log('选择5');
                }
            }else{
                if (isnew == 'true') {
@@ -1416,7 +1418,7 @@
        var isnew = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetNewHidden')).val();
        var assetListmonth = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();
        //市场多年保修价格开发 DC 2023/02/09 start 
        // var VMassetListmonth = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Maintenance_Price_Year__c')).val();
        var VMassetListmonth = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Maintenance_Price_Year__c')).val();
        //市场多年保修价格开发 DC 2023/02/09 end 

        if (isManual == 'true') {
@@ -1432,8 +1434,8 @@
                strMoney = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();

                var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();
                // // alert(strMoney);
                // console.log('***维修合同记录类型3'+LastMContractRecord);
                // alert(strMoney);
                console.log('***维修合同记录类型3'+LastMContractRecord);

                Price_YearTXT = strMoney * 12;
                if (isnew == 'true') {
@@ -1489,100 +1491,98 @@
                            var nowdate = new Date();
                            lastendDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':endDateGurantee_Text')).value());
                            nowdate = nowdate.setMonth(nowdate.getMonth() + 6);
                            if(nowdate < Date.parse(lastendDate)){
                                upPrice = strMoney;
                                downPrice = strMoney * 0.8;

                            //市场多年保修价格开发 DC 2023/1/30 start 
                        //     var Maxcoefficient =0;
                        //     var Mincoefficient =0;
                            var Maxcoefficient =0;
                            var Mincoefficient =0;

                        //     var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                        //     console.log('***消费率:'+AssetRate);
                            var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                            console.log('***消费率:'+AssetRate);

                        //     var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());
                            var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());

                        //      j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');
                             j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');

                        //     if(AssetRate>0 &&AssetRate<=0.5){
                        //         Maxcoefficient = (1-0.3);
                        //         Mincoefficient = (1-0.4);
                        //     }else if(AssetRate>0.5 &&AssetRate<=0.6){
                        //         Maxcoefficient = (1-0.2);
                        //         Mincoefficient = (1-0.3);
                            if(AssetRate>0 &&AssetRate<=0.5){
                                Maxcoefficient = (1-0.3);
                                Mincoefficient = (1-0.4);
                            }else if(AssetRate>0.5 &&AssetRate<=0.6){
                                Maxcoefficient = (1-0.2);
                                Mincoefficient = (1-0.3);
                                
                        //     }else if(AssetRate>0.6 &&AssetRate<=0.7){
                        //         Maxcoefficient = (1-0.15);
                        //         Mincoefficient = (1-0.25);
                            }else if(AssetRate>0.6 &&AssetRate<=0.7){
                                Maxcoefficient = (1-0.15);
                                Mincoefficient = (1-0.25);
                                
                        //     }else if(AssetRate>0.7 &&AssetRate<=0.8){
                        //         Maxcoefficient = (1-0.1);
                        //         Mincoefficient = (1-0.2);
                            }else if(AssetRate>0.7 &&AssetRate<=0.8){
                                Maxcoefficient = (1-0.1);
                                Mincoefficient = (1-0.2);
                                
                        //     }else if(AssetRate>0.8 &&AssetRate<=0.9){
                        //         Maxcoefficient = (1-0.05);
                        //         Mincoefficient = (1-0.15);
                            }else if(AssetRate>0.8 &&AssetRate<=0.9){
                                Maxcoefficient = (1-0.05);
                                Mincoefficient = (1-0.15);
                                
                        //     }else if(AssetRate>0.9 &&AssetRate<=1.0){
                        //         Maxcoefficient = 1;
                        //         Mincoefficient = (1-0.05);
                            }else if(AssetRate>0.9 &&AssetRate<=1.0){
                                Maxcoefficient = 1;
                                Mincoefficient = (1-0.05);
                                
                        //     }else if(AssetRate>1.0 &&AssetRate<=1.1){
                        //         Maxcoefficient = (1+0.05);
                        //         Mincoefficient = 1;
                            }else if(AssetRate>1.0 &&AssetRate<=1.1){
                                Maxcoefficient = (1+0.05);
                                Mincoefficient = 1;
                                
                        //     }else if(AssetRate>1.1 &&AssetRate<=1.2){
                        //         Maxcoefficient = (1+0.1);
                        //         Mincoefficient = 1;
                            }else if(AssetRate>1.1 &&AssetRate<=1.2){
                                Maxcoefficient = (1+0.1);
                                Mincoefficient = 1;
                                
                        //     }else if(AssetRate>1.2 &&AssetRate<=1.3){
                        //         Maxcoefficient = (1+0.2);
                        //         Mincoefficient = (1+0.1);
                            }else if(AssetRate>1.2 &&AssetRate<=1.3){
                                Maxcoefficient = (1+0.2);
                                Mincoefficient = (1+0.1);
                                
                        //     }else if(AssetRate>1.3 &&AssetRate<=1.4){
                        //         Maxcoefficient = (1+0.25);
                        //         Mincoefficient = (1+0.15);
                            }else if(AssetRate>1.3 &&AssetRate<=1.4){
                                Maxcoefficient = (1+0.25);
                                Mincoefficient = (1+0.15);
                                
                        //     }else if(AssetRate>1.4){
                        //         Maxcoefficient = (1+0.3);
                        //         Mincoefficient = (1+0.2);
                            }else if(AssetRate>1.4){
                                Maxcoefficient = (1+0.3);
                                Mincoefficient = (1+0.2);
                                
                        //     }
                        //     //市场多年保修价格开发 DC 2023/1/30 end 
                        //     // console.log('***最高系数'+Maxcoefficient);
                        //     // console.log('***最低系数'+Mincoefficient);
                            }
                            //市场多年保修价格开发 DC 2023/1/30 end 
                            // console.log('***最高系数'+Maxcoefficient);
                            // console.log('***最低系数'+Mincoefficient);

                        // if(nowdate < Date.parse(lastendDate)){
                        //     //设备小于两年半
                        //     // upPrice = strMoney;
                        //     // downPrice = strMoney * 0.8;
                        // // console.log('***小于2年半')
                        // // 市场多年保修价格开发 start DC 2023/01/19  
                        //     //市场多年保设备小于2年半
                        //     var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                        //     var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                        //     // console.log('***设备型号'+AssetModelNo);
                        //     // console.log('***产品类型'+Category4);
                        if(nowdate < Date.parse(lastendDate)){
                            //设备小于两年半
                            // upPrice = strMoney;
                            // downPrice = strMoney * 0.8;
                        // console.log('***小于2年半')
                        // 市场多年保修价格开发 start DC 2023/01/19  
                            //市场多年保设备小于2年半
                            var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                            var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                            // console.log('***设备型号'+AssetModelNo);
                            // console.log('***产品类型'+Category4);

                        //     //设备设备消费率小于1.4
                        //     if(AssetRate<1.4){
                        //         upPrice = VMassetListmonth * ContractMonth / 12 ;
                        //         // console.log('消费率小于1.4 upPrice = VMassetListmonth *ContractMonth / 12'+ upPrice);
                            //设备设备消费率小于1.4
                            if(AssetRate<1.4){
                                upPrice = VMassetListmonth * ContractMonth / 12 ;
                                // console.log('消费率小于1.4 upPrice = VMassetListmonth *ContractMonth / 12'+ upPrice);

                        //         if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                        //             downPrice = upPrice;
                        //             // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);
                                if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                                    downPrice = upPrice;
                                    // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);

                        //         }else{
                        //             downPrice = upPrice * 0.8;
                        //             // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);
                                }else{
                                    downPrice = upPrice * 0.8;
                                    // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);

                        //         }
                        //     }else{
                        //         upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                        //         downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                        //             // console.log('消费率大于1.4 upPrice'+ upPrice);
                        //             // console.log('消费率大于1.4 downPrice'+ downPrice);
                        //     }
                                }
                            }else{
                                upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                                    // console.log('消费率大于1.4 upPrice'+ upPrice);
                                    // console.log('消费率大于1.4 downPrice'+ downPrice);
                            }
                            // 市场多年保修价格开发 end DC 2023/01/19  

                            }else{
@@ -1592,8 +1592,8 @@
                                // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);

                                //市场多年保修价格开发 DC 2023/1/30 start  设备大于2年半 续签价格 =定价*消费率对应系数 / 12 *合同月数
                                // upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                // downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
                                upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
                                //市场多年保修价格开发 DC 2023/1/30 end 
                            }
                            // gzw 20220630  实际联动6个月价格区分
@@ -1713,60 +1713,60 @@
                        nowdate = nowdate.setMonth(nowdate.getMonth() + 6);

                         //市场多年保修价格开发 DC 2023/1/30 start 
                            // var Maxcoefficient =0;
                            // var Mincoefficient =0;
                            var Maxcoefficient =0;
                            var Mincoefficient =0;

                            // var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                            // console.log('***消费率:'+AssetRate);
                            var AssetRate = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).val());
                            console.log('***消费率:'+AssetRate);

                            // var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());
                            var ContractMonth = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());

                            //  j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');
                             j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');

                            // if(AssetRate>0 &&AssetRate<=0.5){
                            //     Maxcoefficient = (1-0.3);
                            //     Mincoefficient = (1-0.4);
                            // }else if(AssetRate>0.5 &&AssetRate<=0.6){
                            //     Maxcoefficient = (1-0.2);
                            //     Mincoefficient = (1-0.3);
                            if(AssetRate>0 &&AssetRate<=0.5){
                                Maxcoefficient = (1-0.3);
                                Mincoefficient = (1-0.4);
                            }else if(AssetRate>0.5 &&AssetRate<=0.6){
                                Maxcoefficient = (1-0.2);
                                Mincoefficient = (1-0.3);
                                
                            // }else if(AssetRate>0.6 &&AssetRate<=0.7){
                            //     Maxcoefficient = (1-0.15);
                            //     Mincoefficient = (1-0.25);
                            }else if(AssetRate>0.6 &&AssetRate<=0.7){
                                Maxcoefficient = (1-0.15);
                                Mincoefficient = (1-0.25);
                                
                            // }else if(AssetRate>0.7 &&AssetRate<=0.8){
                            //     Maxcoefficient = (1-0.1);
                            //     Mincoefficient = (1-0.2);
                            }else if(AssetRate>0.7 &&AssetRate<=0.8){
                                Maxcoefficient = (1-0.1);
                                Mincoefficient = (1-0.2);
                                
                            // }else if(AssetRate>0.8 &&AssetRate<=0.9){
                            //     Maxcoefficient = (1-0.05);
                            //     Mincoefficient = (1-0.15);
                            }else if(AssetRate>0.8 &&AssetRate<=0.9){
                                Maxcoefficient = (1-0.05);
                                Mincoefficient = (1-0.15);
                                
                            // }else if(AssetRate>0.9 &&AssetRate<=1.0){
                            //     Maxcoefficient = 1;
                            //     Mincoefficient = (1-0.05);
                            }else if(AssetRate>0.9 &&AssetRate<=1.0){
                                Maxcoefficient = 1;
                                Mincoefficient = (1-0.05);
                                
                            // }else if(AssetRate>1.0 &&AssetRate<=1.1){
                            //     Maxcoefficient = (1+0.05);
                            //     Mincoefficient = 1;
                            }else if(AssetRate>1.0 &&AssetRate<=1.1){
                                Maxcoefficient = (1+0.05);
                                Mincoefficient = 1;
                                
                            // }else if(AssetRate>1.1 &&AssetRate<=1.2){
                            //     Maxcoefficient = (1+0.1);
                            //     Mincoefficient = 1;
                            }else if(AssetRate>1.1 &&AssetRate<=1.2){
                                Maxcoefficient = (1+0.1);
                                Mincoefficient = 1;
                                
                            // }else if(AssetRate>1.2 &&AssetRate<=1.3){
                            //     Maxcoefficient = (1+0.2);
                            //     Mincoefficient = (1+0.1);
                            }else if(AssetRate>1.2 &&AssetRate<=1.3){
                                Maxcoefficient = (1+0.2);
                                Mincoefficient = (1+0.1);
                                
                            // }else if(AssetRate>1.3 &&AssetRate<=1.4){
                            //     Maxcoefficient = (1+0.25);
                            //     Mincoefficient = (1+0.15);
                            }else if(AssetRate>1.3 &&AssetRate<=1.4){
                                Maxcoefficient = (1+0.25);
                                Mincoefficient = (1+0.15);
                                
                            // }else if(AssetRate>1.4){
                            //     Maxcoefficient = (1+0.3);
                            //     Mincoefficient = (1+0.2);
                            }else if(AssetRate>1.4){
                                Maxcoefficient = (1+0.3);
                                Mincoefficient = (1+0.2);
                                
                            // }
                            }
                            //市场多年保修价格开发 DC 2023/1/30 end 
                            // console.log('***最高系数'+Maxcoefficient);
                            // console.log('***最低系数'+Mincoefficient);
@@ -1780,31 +1780,31 @@
                        // console.log('***小于2年半')
                        // 市场多年保修价格开发 start DC 2023/01/19  
                            //市场多年保设备小于2年半
                            // var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                            // var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                            // // console.log('***设备型号'+AssetModelNo);
                            // // console.log('***产品类型'+Category4);
                            var AssetModelNo = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_Model_No__c')).value();
                            var Category4 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Category4__c')).value();
                            // console.log('***设备型号'+AssetModelNo);
                            // console.log('***产品类型'+Category4);

                            // //设备设备消费率小于1.4
                            // if(AssetRate<1.4){
                            //     upPrice = VMassetListmonth * ContractMonth /12;
                            //     // console.log('消费率小于1.4 upPrice = VMassetListmonth *ContractMonth /12'+ upPrice);
                            //设备设备消费率小于1.4
                            if(AssetRate<1.4){
                                upPrice = VMassetListmonth * ContractMonth /12;
                                // console.log('消费率小于1.4 upPrice = VMassetListmonth *ContractMonth /12'+ upPrice);

                            //     if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                            //         downPrice = upPrice;
                            //         // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);
                                if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF扇扫'||Category4=='CF')){
                                    downPrice = upPrice;
                                    // console.log('消费率小于1.4 产品无最低价 downPrice '+ downPrice);

                            //     }else{
                            //         downPrice = upPrice * 0.8;
                            //         // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);
                                }else{
                                    downPrice = upPrice * 0.8;
                                    // console.log('消费率小于1.4 产品最低价 downPrice = upPrice* 0.8：'+ downPrice);

                            //     }
                            // }else{
                            //     upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                            //     downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                            //     // console.log('消费率大于1.4 upPrice'+ upPrice);
                            //     // console.log('消费率大于1.4 downPrice'+ downPrice);
                            // }
                                }
                            }else{
                                upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                                downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;   
                                // console.log('消费率大于1.4 upPrice'+ upPrice);
                                // console.log('消费率大于1.4 downPrice'+ downPrice);
                            }
                            // 市场多年保修价格开发 end DC 2023/01/19  
                        }else{
                             upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
@@ -1813,8 +1813,8 @@
                            // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);

                            //市场多年保修价格开发 DC 2023/1/30 start  设备大于2年半 续签价格 = 定价 *消费率对应系数 / 12 *合同月数
                            // upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                            // downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
                            upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
                            downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
                            //市场多年保修价格开发 DC 2023/1/30 end 

                        }
@@ -2539,8 +2539,8 @@
            } else {
                var oldp = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:oldMainteReal')).value());
                var newp = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:mainteReal')).text());
                // console.log('oldp='+oldp);
                //  console.log('newp='+newp);
                console.log('oldp='+oldp);
                 console.log('newp='+newp);
                if (oldp != newp) {
                    // 20201106 高章伟 提醒消息修改 start
                    j$(escapeVfId('allPage:allForm:changedAfterPrint')).val('true');
@@ -2960,19 +2960,19 @@
                        <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset_Estimate__c.fields.Asset_Consumption_rate__c.label}</th>
                        <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Asset.fields.CurrentContract_End_Date__c.label}</th>
                        <!-- 市场多年保修价格开发 DC 2023/02/20  start-->
                       <!--  <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset__c.fields.IS_VMContract_Asset__c.label}</th> -->
                        <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset__c.fields.IS_VMContract_Asset__c.label}</th>

                        <!-- 市场多年保修价格开发 DC 2023/02/20  end-->
                       <!--  <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset_Estimate__c.fields.Asset_Consumption_rate__c.label}</th> -->
                        <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset_Estimate__c.fields.Asset_Consumption_rate__c.label}</th>

                        <!-- 市场多年保修价格开发 DC 2023/1/30 start -->
                        <!-- <th style="width:70px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset_Estimate__c.fields.Asset_Consumption_rate__c.label}</th>
 -->
                        <!-- 市场多年保修价格开发 DC 2023/1/30 end -->
                        <!-- <th style="width:70px" class="headerRow  booleanColumn"> -->
                        <th style="width:70px" class="headerRow  booleanColumn">
                            <!-- 最近一期维修合同结束 -->
                            <!-- {!$ObjectType.Asset.fields.CurrentContract_End_Date__c.label} -->
                        <!-- </th> -->
                            {!$ObjectType.Asset.fields.CurrentContract_End_Date__c.label}
                        </th>
                        <!-- 实绩联动价格计算 start -->
                        <th style="width:35px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset_Estimate__c.fields.Adjustment_Upper_price__c.label}</th>
                        <th style="width:35px" class="headerRow  booleanColumn">{!$ObjectType.Maintenance_Contract_Asset_Estimate__c.fields.Adjustment_Lower_price__c.label}</th>
@@ -3069,23 +3069,23 @@

                                    <!-- <apex:outputField value="{!ar.rec.CurrentContract_F_asset__r.IS_VMContract_Asset__c}" rendered="{!Not(ar.IsManual)}" id="IS_VMContract_Asset"/> -->

                                  <!--   <apex:inputHidden value="{!ar.rec.CurrentContract_F_asset__r.Asset_Consumption_Rate__c}" id="AssetConsumptionRateNew"/>
                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F_asset__r.Asset_Consumption_Rate__c}" id="AssetConsumptionRateNew"/>

                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F_asset__r.Maintenance_Price_Year__c}" id="Maintenance_Price_Year__c"/> -->
                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F_asset__r.Maintenance_Price_Year__c}" id="Maintenance_Price_Year__c"/>

                                 <!--    <apex:inputField value="{!ar.rec.CurrentContract_F_asset__r.Asset_Consumption_Rate__c}" id="AssetConsumptionRateNew2" style="display: none" showDatePicker="false" />

                                    <apex:outputText value="{!ar.rec.CurrentContract_F_asset__r.Asset_Consumption_Rate__c}" id="AssetConsumptionRateNew3" rendered="{!Not(ar.IsManual)}" style="display: none"/> -->

                                  <!--   <apex:inputField value="{!ar.rec.Product2.Asset_Model_No__c}" id="Asset_Model_No__c" style="display: none" showDatePicker="false"/>
                                    <apex:inputField value="{!ar.rec.Product2.Asset_Model_No__c}" id="Asset_Model_No__c" style="display: none" showDatePicker="false"/>

                                    <apex:inputField value="{!ar.rec.Product2.Category4__c}" id="Category4__c" style="display: none" showDatePicker="false"/> -->
                                    <apex:inputField value="{!ar.rec.Product2.Category4__c}" id="Category4__c" style="display: none" showDatePicker="false"/>
                                    <!-- 市场多年保价格开发 end 20223/01/17 设备消费率 -->

                                <!-- </td> -->
                                </td>
                                 <!-- 市场多年保价格开发 end 20223/02/20 是否多年保设备 start -->
                              <!--   <td class="dataCell" width="90px" style="text-align:center">
                                    <apex:outputField value="{!ar.rec.CurrentContract_F_asset__r.IS_VMContract_Asset__c}" rendered="{!Not(ar.IsManual)}" id="IS_VMContract_Asset"/> -->
                                <td class="dataCell" width="90px" style="text-align:center">
                                    <apex:outputField value="{!ar.rec.CurrentContract_F_asset__r.IS_VMContract_Asset__c}" rendered="{!Not(ar.IsManual)}" id="IS_VMContract_Asset"/>
                                </td>
                                 <!-- 市场多年保价格开发 end 20223/02/20 是否多年保设备 end -->