OlyMEBG.git - Gitblit

			@@ -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 -->