From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/pages/SelectAssetEstimateVM.page | 355 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 249 insertions(+), 106 deletions(-)
diff --git a/force-app/main/default/pages/SelectAssetEstimateVM.page b/force-app/main/default/pages/SelectAssetEstimateVM.page
index 41b5dc3..82fa4f0 100644
--- a/force-app/main/default/pages/SelectAssetEstimateVM.page
+++ b/force-app/main/default/pages/SelectAssetEstimateVM.page
@@ -41,11 +41,11 @@
window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
var RCbottonChanged = 0;
-
+// 鏁呴殰鍝�
var hasSendEmail = {!hasSendEmail};
-console.log('***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');
@@ -158,6 +158,7 @@
// if(!ResonCannotWarranty.contains("寮冧慨")){
// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Repair_Price_Auto')).attr("display", none);
// }
+
if (isDisabled) {
j$(escapeVfId('allPage:allForm:allBlock:contract:depart')).attr("disabled", true);
@@ -246,15 +247,34 @@
// disable1();
// 2021銆�8銆�26 鍚堝悓鎶ヤ环椤甸潰鐨勪紭鍖栵紝鏃犱繚鏈夎澶囩偣妫�瀵硅薄閫夋嫨妗嗗彉榛� fxk end
console.log('ApprovalBtnDisabled=='+{!ApprovalBtnDisabled});
- //涓婇檺鍚堝悓 20230103 LY start
- var mainteReal = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:mainteReal')).text();
- Limit_Price_Amount = localParseFloat(mainteReal)*1.3;
+ refreshAsset({!productCount});
+ //涓婇檺鍚堝悓 20230103 hql start
+ // console.log('Limit_PriceHidden2=='+Limit_PriceHidden2);
+ var RequestquotationAmount = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:quotation_Amount')).val();
+ console.log('鐢宠鎶ヤ环閲戦='+RequestquotationAmount);
+ var AssetRepairSumPrice = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:assetRepairSumPrice')).text();
+ console.log('鍚堝悓璁惧淇悊鎬婚='+AssetRepairSumPrice);
+ Limit_Price_Amount = (localParseFloat(AssetRepairSumPrice)+localParseFloat(RequestquotationAmount))*1.3;
+ Limit_Price_Amount = Math.round(Limit_Price_Amount);
// console.log('Limit_Price_Amount'+Limit_Price_Amount);
Limit_Price_AmountOne = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).value();
- if (Limit_Price_AmountOne*1==0) {
+ Limit_PriceHidden = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_PriceHidden')).value();
+
+ if (Limit_PriceHidden*1==0) {
j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val(Limit_Price_Amount);
}
- //涓婇檺鍚堝悓 20230103 LY end
+ Limit_PriceHidden2 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price2Hidden')).value();
+ if (Limit_PriceHidden2 == 'false') {
+ // lpa = document.getElementById('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount');
+ // lpa.style.display = "none";
+ // console.log('闅愯棌瀹屾瘯');
+ j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val('');
+ }
+ Price111 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val();
+ console.log('涓婇檺閲戦涓�'+Limit_Price_Amount);
+ console.log('鍘熸湁涓婇檺閲戦涓�'+Limit_PriceHidden);
+ console.log('涓嶆槸涓婇檺鍚堝悓鐨勯噾棰濅负'+Price111);
+ //涓婇檺鍚堝悓 20230103 hql end
pageSetDisabled();
var createdDate = new Date('{!estimate.CreatedDate}');
// 鎶ヤ环涓澶囩殑鏈鸿韩缂栫爜涓虹┖鏃剁殑鏂板搧鍚堝悓鏈夋晥鏈熷欢闀� 20200710 gzw
@@ -344,6 +364,7 @@
}
if ('{!DecideBtnDisabled}' == 'false') {
+ console.log('oldMainteReal淇敼瀹屾垚');
j$(escapeVfId('allPage:allForm:allBlock:contractInfo:oldMainteReal')).val(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:mainteReal')).text());
}
}
@@ -390,8 +411,26 @@
val = Math.round(val);
j$(escapeVfId('allPage:allForm:allBlock:contractInfo:quotation_Amount')).val(toNumComma(val));
//涓婇檺鍚堝悓 20230117 HQL start
- console.log('涓婇檺閲戦濉叆锛�'+val*1.3);
- j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val(val*1.3);
+ var RequestquotationAmount = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:quotation_Amount')).val();
+ console.log('鐢宠鎶ヤ环閲戦='+RequestquotationAmount);
+ var AssetRepairSumPrice = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:assetRepairSumPrice')).text();
+ console.log('鍚堝悓璁惧淇悊鎬婚='+AssetRepairSumPrice);
+ Limit_Price_Amount = (localParseFloat(AssetRepairSumPrice)+localParseFloat(RequestquotationAmount))*1.3;
+ Limit_Price_Amount = Math.round(Limit_Price_Amount);
+ Limit_Price_AmountOne = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).value();
+ Limit_PriceHidden = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_PriceHidden')).value();
+ // if (Limit_PriceHidden*1==0) {
+ j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val(Limit_Price_Amount);
+ // }
+ Limit_PriceHidden2 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price2Hidden')).value();
+ if (Limit_PriceHidden2 == 'false') {
+ // lpa = document.getElementById('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount');
+ // lpa.style.display = "none";
+ // console.log('闅愯棌瀹屾瘯');
+ j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val('');
+ }
+ amount = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).value();
+ console.log('涓婇檺閲戦濉叆锛�'+amount);
//涓婇檺鍚堝悓 20230117 HQL end
makeRealPrice(1);
}
@@ -426,7 +465,10 @@
ISReducedpriceapproval = j$(escapeVfId('allPage:allForm:allBlock:ISReducedpriceapproval')).val();
console.log('鏂规硶2鏄惁瀹℃壒閫氳繃=='+ISReducedpriceapproval+'==============');
}
+var number1 = 0;
function refreshAsset(cnt) {
+ console.log('鎵цrefreshAsset');
+ console.log('decide==='+{!DecideBtnDisabled});
// alert(cnt);
// 鎻愪氦鍚庡氨椤甸潰涓嶈绠椾簡
var isDisabled = {!PageDisabled};
@@ -442,16 +484,6 @@
// 鏂板搧鍚堝悓 鍒ゆ柇
var newCon = true;
var contractStartDate = new Date(j$(escapeVfId('allPage:allForm:contractstartdate')).value());
- //涓婇檺鍚堝悓 20230103 LY start
- var mainteReal = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:mainteReal')).text();
- Limit_Price_Amount = localParseFloat(mainteReal)*1.3;
-
- Limit_Price_AmountOne = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).value();
- console.log('Limit_Price_AmountOne'+Limit_Price_AmountOne);
- if (Limit_Price_AmountOne*1==0) {
- j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val(Limit_Price_Amount);
- }
- //涓婇檺鍚堝悓 20230103 LY end
//澶氬勾淇濈画绛惧悎鍚屾暟閲� thh 20220316 start
var GuranteeCount = 0;
//澶氬勾淇濈画绛惧悎鍚屾暟閲� thh 20220316 end
@@ -461,7 +493,14 @@
// var isFSE = true;
console.log('***isFSE',isFSE);
//2022鏁呴殰鍝佸姞璐� 鑾峰彇userInfo绠�妗ｅ悕绉� end
-
+ //20230208 涓婇檺鍚堝悓寮�鍙� hql start
+ if (isFSE) {
+ // lpa = document.getElementById('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount');
+ // lpa.style.display = "none";
+ j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).attr("disabled", true);
+ console.log('涓婇檺閲戦闅愯棌');
+ }
+ //20230208 涓婇檺鍚堝悓寮�鍙� hql end
// 棰勫畾寮�濮嬫棩
var startdate = new Date(j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).value());
// 棰勫畾寮�濮嬫棩-6涓湀
@@ -501,10 +540,17 @@
// 12涓湀鍚堝悓閲戦
var Price_YearTXT = 0;
-
+
var isManual = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':IsManual')).text();
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();
+ // console.log('***鍚堝悓瀹氫环:'+VMassetListmonth);
+ //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/09 end
+
+ // console.log('***isManual=:'+isManual);
if (isManual == 'true') {
var a = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Assert')).value();
if (a != '') {
@@ -516,14 +562,17 @@
//}
strMoney = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();
+
// alert(strMoney);
Price_YearTXT = strMoney * 12;
if (isnew == 'true') {
newCount ++;
strMoney = month * strMoney + month2 * strMoney / {!isNewPriceAdj};
+
} else {
newCon = false;
strMoney = month * strMoney + month2 * strMoney;
+
}
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();
@@ -574,13 +623,10 @@
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start
- //娑堣垂鐜� 灞曠ず淇敼涓哄競鍦哄骞翠繚璁惧娑堣垂鐜�
- // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew')).attr("style", "display:block");
-
- // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).attr("style", "display:none");
-
var Maxcoefficient =0;
var Mincoefficient =0;
+
+ 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);
@@ -649,10 +695,10 @@
//璁惧璁惧娑堣垂鐜囧皬浜�1.4
if(AssetRate<1.4){
- upPrice = strMoney;
- console.log('娑堣垂鐜囧皬浜�1.4 upPrice = strmonye'+ upPrice);
+ upPrice = VMassetListmonth * ContractMonth /12;
+ console.log('娑堣垂鐜囧皬浜�1.4 upPrice = 瀹氫环 *缁忓巻鏈堟暟 /12'+ upPrice);
- if(AssetModelNo.includes('290')|| Category4 =='BF'|| Category4=='BF鎵囨壂'|| Category4=='GIF'||Category4=='CF' || Category4.includes('GF')){
+ if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF鎵囨壂'||Category4=='CF')){
downPrice = upPrice;
console.log('娑堣垂鐜囧皬浜�1.4 浜у搧鏃犳渶浣庝环 downPrice '+ downPrice);
@@ -662,8 +708,8 @@
}
}else{
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
console.log('娑堣垂鐜囧ぇ浜�1.4 upPrice'+ upPrice);
console.log('娑堣垂鐜囧ぇ浜�1.4 downPrice'+ downPrice);
}
@@ -674,8 +720,12 @@
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start 璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
+
+ console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 upPrice'+ upPrice);
+ console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 downPrice'+ downPrice);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
@@ -684,15 +734,18 @@
}else{
upPrice = strMoney;
downPrice = strMoney * 0.8;
+ 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');
}
}else{
//firstCCount ++;
upPrice = strMoney;
downPrice = strMoney * 0.8;
+ console.log('閫夋嫨3');
}
// 涓婁笅闄愬洓鑸嶄簲鍏�
upPrice = upPrice.toFixed(2);
@@ -701,12 +754,24 @@
//j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceTXT')).text(toNumComma(Price_YearTXT));
//j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceTXTHidden')).val(Price_YearTXT);
if (!isDisabled) {
+ // // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 start
+ // var LastMContractID = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractID')).value();
+ // var ISStandardPricing = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':ISStandardPricing')).value();
+ // if (LastMContractID == '' && ISStandardPricing == '鏄�') {
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(upPrice));
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_priceHidden')).val(upPrice);
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice));
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_priceHidden')).val(upPrice);
+ // }
+ // // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 end
+ // else{
// 瀹為檯鑱斿姩浠锋牸 start
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(downPrice));
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_priceHidden')).val(downPrice);
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice));
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_priceHidden')).val(upPrice);
// 瀹為檯鑱斿姩浠锋牸 end
+ // }
}
//j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPrice')).text(toNumComma(strMoney));
@@ -739,12 +804,15 @@
newCon = false;
}
strMoney = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();
+
Price_YearTXT = strMoney * 12;
if (isnew == 'true') {
strMoney = month * strMoney + month2 * strMoney / {!isNewPriceAdj};
+
} else {
strMoney = month * strMoney + month2 * strMoney;
}
+
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('***缁翠慨鍚堝悓璁板綍绫诲瀷2'+LastMContractRecord);
@@ -794,23 +862,14 @@
var nowdate = new Date();
lastendDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':endDateGurantee_Text')).value());
nowdate = nowdate.setMonth(nowdate.getMonth() + 6);
-
+ console.log('**缁撴潫鏃�',lastendDate);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start
-
- //娑堣垂鐜� 灞曠ず淇敼涓哄競鍦哄骞翠繚璁惧娑堣垂鐜�
- // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew3')).attr("style", "display:block");
-
-
-
- // var AssetRate2 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew2')).value();
-
- // console.log('***娑堣垂鐜�2:'+AssetRate2);
- // var AssetRate3 = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':AssetConsumptionRateNew3')).value());
- // console.log('***娑堣垂鐜�3:'+AssetRate3);
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);
@@ -868,7 +927,7 @@
//璁惧灏忎簬涓ゅ勾鍗�
// 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();
@@ -878,10 +937,10 @@
//璁惧璁惧娑堣垂鐜囧皬浜�1.4
if(AssetRate<1.4){
- upPrice = strMoney;
- console.log('娑堣垂鐜囧皬浜�1.4 upPrice = strmonye'+ upPrice);
+ upPrice = VMassetListmonth *ContractMonth / 12;
+ console.log('娑堣垂鐜囧皬浜�1.4 upPrice = VMassetListmonth *month /12'+ upPrice);
- if(AssetModelNo.includes('290')|| Category4 =='BF'|| Category4=='BF鎵囨壂'|| Category4=='GIF'||Category4=='CF' || Category4.includes('GF')){
+ if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF鎵囨壂'||Category4=='CF')){
downPrice = upPrice;
console.log('娑堣垂鐜囧皬浜�1.4 浜у搧鏃犳渶浣庝环 downPrice '+ downPrice);
@@ -891,8 +950,8 @@
}
}else{
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
console.log('娑堣垂鐜囧ぇ浜�1.4 upPrice'+ upPrice);
console.log('娑堣垂鐜囧ぇ浜�1.4 downPrice'+ downPrice);
}
@@ -904,18 +963,23 @@
// downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start 璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
+
+ console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 upPrice'+ upPrice);
+ console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 downPrice'+ downPrice);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
}
// gzw 20220630 瀹為檯鑱斿姩6涓湀浠锋牸鍖哄垎
}else{
upPrice = strMoney;
downPrice = strMoney * 0.8;
+ 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');
}
}else{
if (isnew == 'true') {
@@ -934,35 +998,50 @@
//j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceTXT')).text(toNumComma(Price_YearTXT));
//j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceTXTHidden')).val(Price_YearTXT);
if (!isDisabled) {
+ // // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 start
+ // var LastMContractID = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractID')).value();
+ // var ISStandardPricing = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':ISStandardPricing')).value();
+ // console.log('ISStandardPricing=='+ISStandardPricing);
+ // if (LastMContractID == '' && ISStandardPricing == '鏄�') {
+ // console.log('寮�濮嬫墽琛�');
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(upPrice));
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_priceHidden')).val(upPrice);
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice));
+ // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_priceHidden')).val(upPrice);
+ // }
+ // // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 end
+ // else{
// 瀹為檯鑱斿姩浠锋牸 start
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(downPrice));
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_priceHidden')).val(downPrice);
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice));
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_priceHidden')).val(upPrice);
// 瀹為檯鑱斿姩浠锋牸 end
+ // }
}
//j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPrice')).text(toNumComma(strMoney));
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPricePageHidden')).val(strMoney);
//<!-- (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� start -->
-
+
Repair_Price_AutoPrice = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Repair_Price_Auto'));
Repair_Price_Auto = Repair_Price_AutoPrice.value();
repairMoney = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).value();
Repair_Price_pass = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Repair_Price_pass')).val();
console.log((i+1)+'鍙穜epairMoney='+repairMoney);
- console.log((i+1)+'鍙稲epair_Price_Auto='+Repair_Price_Auto);
+ // console.log((i+1)+'鍙稲epair_Price_Auto='+Repair_Price_Auto);
if ((repairMoney+1)==1) {
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).val(Repair_Price_Auto);
- console.log('repairMoney淇敼鎴愬姛');
+ // console.log('repairMoney淇敼鎴愬姛');
}
if ((Repair_Price_pass+1)==1) {
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Repair_Price_pass')).val(Repair_Price_Auto);
- console.log('Repair_Price_pass淇敼鎴愬姛');
+ // console.log('Repair_Price_pass淇敼鎴愬姛');
}
repairMoney1 = localParseFloat(repairMoney);
ISReducedpriceapproval = j$(escapeVfId('allPage:allForm:allBlock:ISReducedpriceapproval')).val();
console.log('ISReducedpriceapproval=='+ISReducedpriceapproval);
- if (ISReducedpriceapproval =='鏈夊叓鎶樹互涓嬪緟瀹℃壒' || ISReducedpriceapproval =='鏄�') {
+ var isDisabled = {!PageDisabled};
+ if (ISReducedpriceapproval =='鏈夊叓鎶樹互涓嬪緟瀹℃壒' || ISReducedpriceapproval =='鏄�'|| isDisabled) {
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).attr("disabled", true);
}else{
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).attr("disabled", false);
@@ -974,21 +1053,26 @@
isresduce = isresduce+1;
}
- console.log('鍒濆鍖杋sresduce='+isresduce);
-
- ResonCannotWarranty = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':ResonCannotWarranty')).value();
+ // console.log('鍒濆鍖杋sresduce='+isresduce);
rppa = document.getElementById('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Repair_Price_Auto');
+ ResonCannotWarranty = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':ResonCannotWarranty')).value();
+ // console.log('涓嶅彲鍙備繚鍘熷洜涓猴細'+ResonCannotWarranty);
+ // console.log('repairMoney鎵ц娆℃暟涓�'+repairMoney);
+ if(!(ResonCannotWarranty.indexOf("寮冧慨") != -1)&&(repairMoney+1)==1){
+ // if (!(situation.indexOf("淇悊涓�")!=-1)&& !(Agreed_Date.indexOf("涓虹┖")!=-1)) {
+ rppa.style.display = "none";
+ j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).val('');
+ // console.log('###淇敼鎴愬姛');
+ // }
+ }
+
+
situation = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_situation')).value();
// Agreed_Date = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Agreed_Date')).value();
- console.log('situation='+situation);
+ // console.log('situation='+situation);
// console.log('Agreed_Date1='+Agreed_Date);
- if(ResonCannotWarranty!=null&&!(ResonCannotWarranty.indexOf("寮冧慨") != -1)){
- // if (!(situation.indexOf("淇悊涓�")!=-1)&& !(Agreed_Date.indexOf("涓虹┖")!=-1)) {
- rppa.style.display = "none";
- // }
- }
- console.log('鍒ゆ柇1'+(situation.indexOf("淇悊涓�")!=-1));
+
// console.log('鍒ゆ柇'+(Agreed_Date.indexOf("涓嶄负绌�")!=-1));
// if ((situation.indexOf("淇悊涓�")!=-1)&& (Agreed_Date.indexOf("涓嶄负绌�")!=-1)) {
// console.log('寮�濮嬫搷浣�2');
@@ -1044,13 +1128,14 @@
console.log(result);
document.getElementById("allPage:allForm:allBlock:contractInfo:Contract_TypeTXT").innerHTML = result;
document.getElementById("allPage:allForm:allBlock:contractInfo:Contract_TypeTXTHidden").value = result;
-
// 鍙栨秷閰稿寲姘�
//NotUseOxygenatedWaterAmount(1);
examinationPriceCal(cnt);
getLastContractRate();
+ number1++;
}
function changeAsset(cnt) {
+ console.log('鎵ц浜哻hangeAsset');
// alert(cnt);
// 鎻愪氦鍚庡氨椤甸潰涓嶈绠椾簡
var isDisabled = {!PageDisabled};
@@ -1130,6 +1215,10 @@
var isManual = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':IsManual')).text();
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();
+ //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/09 end
+
if (isManual == 'true') {
var a = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Assert')).value();
if (a != '') {
@@ -1141,7 +1230,7 @@
//}
strMoney = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();
- //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start
+
var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();
// alert(strMoney);
console.log('***缁翠慨鍚堝悓璁板綍绫诲瀷3'+LastMContractRecord);
@@ -1150,6 +1239,7 @@
if (isnew == 'true') {
newCount ++;
strMoney = month * strMoney + month2 * strMoney / {!isNewPriceAdj};
+
} else {
newCon = false;
strMoney = month * strMoney + month2 * strMoney;
@@ -1206,6 +1296,8 @@
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());
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');
@@ -1271,10 +1363,10 @@
//璁惧璁惧娑堣垂鐜囧皬浜�1.4
if(AssetRate<1.4){
- upPrice = strMoney;
- console.log('娑堣垂鐜囧皬浜�1.4 upPrice = strmonye'+ upPrice);
+ upPrice = VMassetListmonth * ContractMonth / 12 ;
+ console.log('娑堣垂鐜囧皬浜�1.4 upPrice = VMassetListmonth *ContractMonth / 12'+ upPrice);
- if(AssetModelNo.includes('290')|| Category4 =='BF'|| Category4=='BF鎵囨壂'|| Category4=='GIF'||Category4=='CF' || Category4.includes('GF')){
+ if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF鎵囨壂'||Category4=='CF')){
downPrice = upPrice;
console.log('娑堣垂鐜囧皬浜�1.4 浜у搧鏃犳渶浣庝环 downPrice '+ downPrice);
@@ -1284,8 +1376,8 @@
}
}else{
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
console.log('娑堣垂鐜囧ぇ浜�1.4 upPrice'+ upPrice);
console.log('娑堣垂鐜囧ぇ浜�1.4 downPrice'+ downPrice);
}
@@ -1296,8 +1388,8 @@
// downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start 璁惧澶т簬2骞村崐 缁浠锋牸 =瀹氫环*娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
}
// gzw 20220630 瀹為檯鑱斿姩6涓湀浠锋牸鍖哄垎
@@ -1359,11 +1451,13 @@
newCon = false;
}
strMoney = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetListPriceHidden')).val();
+
Price_YearTXT = strMoney * 12;
if (isnew == 'true') {
strMoney = month * strMoney + month2 * strMoney / {!isNewPriceAdj};
} else {
strMoney = month * strMoney + month2 * strMoney;
+
}
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();
@@ -1420,6 +1514,8 @@
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());
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contractrate')).text(AssetRate +'%');
@@ -1485,10 +1581,10 @@
//璁惧璁惧娑堣垂鐜囧皬浜�1.4
if(AssetRate<1.4){
- upPrice = strMoney;
- console.log('娑堣垂鐜囧皬浜�1.4 upPrice = strmonye'+ upPrice);
+ upPrice = VMassetListmonth * ContractMonth /12;
+ console.log('娑堣垂鐜囧皬浜�1.4 upPrice = VMassetListmonth *ContractMonth /12'+ upPrice);
- if(AssetModelNo.includes('290')|| Category4 =='BF'|| Category4=='BF鎵囨壂'|| Category4=='GIF'||Category4=='CF' || Category4.includes('GF')){
+ if(AssetModelNo.includes('290')&&( Category4 =='BF'|| Category4=='BF鎵囨壂'||Category4=='CF')){
downPrice = upPrice;
console.log('娑堣垂鐜囧皬浜�1.4 浜у搧鏃犳渶浣庝环 downPrice '+ downPrice);
@@ -1498,8 +1594,8 @@
}
}else{
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
console.log('娑堣垂鐜囧ぇ浜�1.4 upPrice'+ upPrice);
console.log('娑堣垂鐜囧ぇ浜�1.4 downPrice'+ downPrice);
}
@@ -1509,8 +1605,8 @@
// downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start 璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟
- upPrice = assetListmonth * month *Maxcoefficient / 12;
- downPrice = assetListmonth * month * Mincoefficient / 12;
+ upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
}
@@ -1558,16 +1654,16 @@
repairMoney1 = localParseFloat(repairMoney);
ISReducedpriceapproval1 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':ISReducedpriceapproval1')).val();
ISReduced = j$(escapeVfId('allPage:allForm:allBlock:ISReducedpriceapproval')).val();
- console.log('ISReduced='+ISReduced);
+ // console.log('ISReduced='+ISReduced);
- console.log('Repair_Price_Auto='+Repair_Price_Auto);
- console.log('绗�'+(i+1)+'涓澶嘔SReducedpriceapproval1='+ISReducedpriceapproval1);
- console.log('repairMoney1='+repairMoney1);
+ // console.log('Repair_Price_Auto='+Repair_Price_Auto);
+ // console.log('绗�'+(i+1)+'涓澶嘔SReducedpriceapproval1='+ISReducedpriceapproval1);
+ // console.log('repairMoney1='+repairMoney1);
Repair_Price_pass1 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Repair_Price_pass')).val();
Repair_Price_pass2 = localParseFloat(Repair_Price_pass1);
- console.log('缁撴灉='+(repairMoney1<Repair_Price_pass2));
- console.log('Repair_Price_pass2='+Repair_Price_pass2);
+ // console.log('缁撴灉='+(repairMoney1<Repair_Price_pass2));
+ // console.log('Repair_Price_pass2='+Repair_Price_pass2);
if (repairMoney1> 0 && repairMoney1<(Repair_Price_Auto*0.80) && Repair_Price_Auto != null && isFSE == true) {
if (Repair_Price_pass1!=null && repairMoney1<Repair_Price_pass2) {
alert('鐢变簬瀛樺湪鎶樻墸鐜囪秴杩�20%浠ヤ笂鐨勪慨鐞嗗姞璐瑰噺浠风敵璇凤紝璇峰厛鐐瑰嚮鈥滄彁浜C璇勪及鈥濇寜閽紝寰匯C璇勪及鍚庢湇鍔＄鐞嗛儴浼氭帹杩涘鎵�');
@@ -1596,13 +1692,13 @@
situation = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Asset_situation')).value();
// Agreed_Date = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Agreed_Date')).value();
- console.log('situation='+situation);
+ // console.log('situation='+situation);
// console.log('Agreed_Date1='+Agreed_Date);
- if(ResonCannotWarranty!=null&&!(ResonCannotWarranty.indexOf("寮冧慨") != -1)){
- // if (!(situation.indexOf("淇悊涓�")!=-1)&& !(Agreed_Date.indexOf("涓虹┖")!=-1)) {
- rppa.style.display = "none";
- // }
- }
+ // if(!(ResonCannotWarranty.indexOf("寮冧慨") != -1)){
+ // rppa.style.display = "none";
+ // // j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).val('');
+ // // console.log('###淇敼鎴愬姛');
+ // }
// if ((situation.indexOf("淇悊涓�")!=-1)&& (Agreed_Date.indexOf("涓虹┖")!=-1)) {
// console.log('寮�濮嬫搷浣�1');
// rppa.style.display = "none";
@@ -1620,7 +1716,7 @@
downPriceSum = downPriceSum + localParseFloat(toNum(downPrice));
upPriceSum = upPriceSum + localParseFloat(toNum(upPrice));
}
- console.log('鏀瑰彉閲戦isresduce='+isresduce);
+ // console.log('鏀瑰彉閲戦isresduce='+isresduce);
if (isresduce!=0) {
toChange1();
}else{
@@ -1665,6 +1761,30 @@
examinationPriceCal(cnt);
getLastContractRate();
+ //涓婇檺鍚堝悓 20230214 hql start
+ var RequestquotationAmount = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:quotation_Amount')).val();
+ console.log('鐢宠鎶ヤ环閲戦='+RequestquotationAmount);
+ var AssetRepairSumPrice = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:assetRepairSumPrice')).text();
+ console.log('鍚堝悓璁惧淇悊鎬婚='+AssetRepairSumPrice);
+ Limit_Price_Amount = (localParseFloat(AssetRepairSumPrice)+localParseFloat(RequestquotationAmount))*1.3;
+ Limit_Price_Amount = Math.round(Limit_Price_Amount);
+ // console.log('鍙栨暣1='+Math.round(124.5));
+ // console.log('鍙栨暣2='+Math.round(124.4));
+ // console.log('鍙栨暣3='+Math.round(124.6));
+ Limit_Price_AmountOne = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).value();
+ Limit_PriceHidden = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_PriceHidden')).value();
+ // if (Limit_PriceHidden*1==0) {
+ j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val(Limit_Price_Amount);
+ // }
+ Limit_PriceHidden2 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price2Hidden')).value();
+ if (Limit_PriceHidden2 == 'false') {
+ // lpa = document.getElementById('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount');
+ // lpa.style.display = "none";
+ // console.log('闅愯棌瀹屾瘯');
+ j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Limit_Price_Amount')).val('');
+ }
+ console.log('涓婇檺閲戦涓�'+Limit_Price_Amount);
+ //涓婇檺鍚堝悓 20230214 hql end
}
@@ -2080,7 +2200,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);
if (oldp != newp) {
// 20201106 楂樼珷浼� 鎻愰啋娑堟伅淇敼 start
j$(escapeVfId('allPage:allForm:changedAfterPrint')).val('true');
@@ -2497,11 +2618,15 @@
<th style="width:70px" class="headerRow booleanColumn">{!$ObjectType.Asset.fields.Department_Name__c.label}</th>
<th style="width:70px" class="headerRow booleanColumn">{!$ObjectType.Asset.fields.Management_Code__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>
+
+ <!-- 甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 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>
<!-- 甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 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>
-
+ <!-- <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">{!$ObjectType.Asset.fields.CurrentContract_End_Date__c.label}</th>
<!-- 瀹炵哗鑱斿姩浠锋牸璁＄畻 start -->
@@ -2591,12 +2716,18 @@
<td class="dataCell" width="70px">
<apex:outputField value="{!ar.rec.CurrentContract_F__r.Maintenance_Contract_No_F__c}" rendered="{!Not(ar.IsManual)}" id="Contract_No"/>
+
<apex:inputHidden value="{!ar.rec.CurrentContract_F__r.RecordType_DeveloperName__c}" id="LastMContractRecord"/>
<apex:inputField value="{!ar.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c}" id="endDateGurantee_Text" style="display: none" showDatePicker="false"/>
<apex:inputHidden value="{!ar.rec.CurrentContract_F__c}" id="LastMContractID"/>
<!-- 甯傚満澶氬勾淇濅环鏍煎紑鍙� start 20223/01/17 缁翠慨鍚堝悓/淇濇湁璁惧 璁惧娑堣垂鐜� -->
+
+ <!-- <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.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" />
@@ -2608,6 +2739,12 @@
<!-- 甯傚満澶氬勾淇濅环鏍煎紑鍙� end 20223/01/17 璁惧娑堣垂鐜� -->
</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>
+ <!-- 甯傚満澶氬勾淇濅环鏍煎紑鍙� end 20223/02/20 鏄惁澶氬勾淇濊澶� end -->
+
<td class="dataCell" width="90px" style="text-align:right" >
<apex:outputField value="{!ar.mcae.Asset_Consumption_rate__c}" rendered="{!Not(ar.IsManual)}" id="Contractrate"/>
<apex:inputHidden value="{!ar.rec.CurrentContract_F__r.Contract_Range__c}" id="lastContRange"/>
@@ -2623,6 +2760,10 @@
</td>
<td class="dataCell" width="35px" >
<apex:outputText value="{!ar.mcae.Adjustment_Lower_price__c}" id="Adjustment_Lower_price"/>
+ <!-- // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 start -->
+ <!-- <apex:inputHidden value="{!ar.ISStandardPricing}" id="ISStandardPricing" /> -->
+
+ <!-- // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 end -->
<apex:inputHidden value="{!ar.mcae.LastMContract_Price__c}" id="LastMContract_Price"/>
<apex:inputHidden value="{!ar.mcae.Adjustment_ratio_Lower__c}" id="Adjustment_ratio_Lower"/>
<apex:inputHidden value="{!ar.mcae.Adjustment_Lower_price__c}" id="Adjustment_Lower_priceHidden"/>
@@ -2643,11 +2784,11 @@
</td>
<td class="dataCell" width="35px" style="text-align:right" >
- <apex:inputField value="{!ar.mcae.Repair_Price__c}" id="repairPrice" style="ime-mode: disabled; width:95%; text-align:right;" onchange="refreshAsset({!productCount});changeAsset({!productCount})"/>
+ <apex:inputField value="{!ar.mcae.Repair_Price__c}" id="repairPrice" style="ime-mode: disabled; width:95%; text-align:right;" onchange="changeAsset({!productCount})"/>
</td>
<!-- (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� start -->
<td class="dataCell" width="35px" style="text-align:right" >
- <apex:outputText value="{!ar.Repair_Price_Auto}" id="Repair_Price_Auto" style="width:95%; disabled:disabled;"/>
+ <apex:outputText value="{!ar.Repair_Price_Auto}" id="Repair_Price_Auto" style="width:95%; "/>
<!-- <apex:inputHiddenalue="{!ar.rec.Reson_Can_not_Warranty__c}" id="ResonCannotWarranty"/> -->
<!-- <apex:outputText value="{!ar.Agreed_Date}" id="Agreed_Date" style="width:95%;display: none;"/> -->
<apex:inputField value="{!ar.mcae.Repair_Price_pass__c}" id="Repair_Price_pass" style="width:95%;display: none;"/>
@@ -2865,9 +3006,9 @@
<th style="text-align: center">鐢宠鎶ヤ环閲戦</th>
<th style="text-align: center">鍚堝悓璁惧淇悊鎬婚</th>
<th style="text-align: center">鍚堝悓鎬婚噾棰�</th>
- <!-- 涓婇檺鍚堝悓 20230103 LY start -->
+ <!-- 涓婇檺鍚堝悓 20230103 hql start -->
<th style="text-align: center">涓婇檺閲戦</th>
- <!-- 涓婇檺鍚堝悓 20230103 LY end -->
+ <!-- 涓婇檺鍚堝悓 20230103 hql end -->
</tr>
<tr>
<td style="text-align: center">
@@ -2892,11 +3033,13 @@
<apex:inputHidden value="{!estimate.Maintenance_Price__c}" id="mainteRealHidden"/>
<apex:inputHidden value="{!OldMaintenancePrice}" id="oldMainteReal"/>
</td>
- <!-- 涓婇檺鍚堝悓 20230103 LY start -->
+ <!-- 涓婇檺鍚堝悓 20230103 hql start -->
<td style="text-align: center">
<apex:inputField value="{!estimate.Limit_Price_Amount__c}" style="ime-mode: disabled; text-align: right; width:100px" id="Limit_Price_Amount" />
+ <apex:inputHidden value="{!isLimitPrice}" id="Limit_Price2Hidden" />
+ <apex:inputHidden value="{!OldLimitPrice}" id="Limit_PriceHidden" />
</td>
- <!-- 涓婇檺鍚堝悓 20230103 LY end -->
+ <!-- 涓婇檺鍚堝悓 20230103 hql end -->
</tr>
<tr>
<th style="text-align: center">{!$ObjectType.Maintenance_Contract_Estimate__c.fields.Service_discount_Rate__c.label}</th>
--
Gitblit v1.9.1