From c51e03fbf2f6633d8e88aeec9dcb8df13524df8f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期四, 13 七月 2023 12:00:06 +0800
Subject: [PATCH] backup0713
---
force-app/main/default/pages/SelectAssetEstimateVM.page | 630 ++++++++++++++++++++++++++++----------------------------
1 files changed, 315 insertions(+), 315 deletions(-)
diff --git a/force-app/main/default/pages/SelectAssetEstimateVM.page b/force-app/main/default/pages/SelectAssetEstimateVM.page
index fd2c49b..285ea79 100644
--- a/force-app/main/default/pages/SelectAssetEstimateVM.page
+++ b/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 -->
--
Gitblit v1.9.1