From 083202a12647b4f1f8545b8e7bc423bc035786a2 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 28 三月 2023 10:19:06 +0800
Subject: [PATCH] 上限合同VM
---
force-app/main/default/classes/SelectAssetEstimateVMController.cls | 227 ++++++---
force-app/main/default/pages/SelectAssetEstimateVM.page | 1153 ++++++++++++++++++++++++++++++++++---------------
2 files changed, 941 insertions(+), 439 deletions(-)
diff --git a/force-app/main/default/classes/SelectAssetEstimateVMController.cls b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
index bff4d41..a471cb2 100644
--- a/force-app/main/default/classes/SelectAssetEstimateVMController.cls
+++ b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
@@ -18,6 +18,11 @@
public Boolean printAgent { get; private set; }
public boolean inDicideFlag {get; set;} //浣滀负琛ュ厖锛屽搴旀姤浠峰喅瀹氫箣鍚庯紝鍗存湭鑳借鍚堝悓璧锋鏃ユ湡浼犻�掔粰鍚堝悓鐨勯棶棰�
public String isPaymentSet {get; set;}
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+ // public Boolean Is_Blank_period {get; set;}
+ // public String Cost_rate_ForecastF{get;set;}
+ // public String PastContractendday{get;set;}
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
//public String PaymentSet {get;set;}
// 寮曟暟銇偟銉笺儞銈瑰绱勩伄鎯呭牨銈掓牸绱嶃仚銈嬨��
public Maintenance_Contract__c contract { get; private set; }
@@ -132,7 +137,7 @@
public Decimal Denominator {get; set; }
public Decimal Accrued {get; set; }
public String ProductModel{get;set;}
- // public String Category{get;set;}
+ public String Category{get;set;}
public Decimal Consumption_rate_Gurante{get;set;}
@@ -392,9 +397,9 @@
//URF闄愭鍚堝悓2鏈� LY 20220811 end
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2022/12/14 start 娑堣垂鐜�
- +'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,Product2.Category4__c,Product2.Asset_Model_No__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
- +'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
- +'CurrentContract_F__r.endDateGurantee__c,'
+ // +'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,Product2.Category4__c,Product2.Asset_Model_No__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
+ // +'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
+ // +'CurrentContract_F__r.endDateGurantee__c,'
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2022/12/14 end
+ 'CurrentContract_End_Date__c, Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c,AssetMark__c,NoPartRiskDate_F__c,NoPartRiskDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' ';
@@ -827,7 +832,10 @@
, Maintenance_Contract__r.Open_RenewalQuotation__c,Maintenance_Contract__r.VM_Contract_Check__c
//WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220419 end'
//LJPH-C9SCX7 銆愬鎵樸�戝悎鍚屾棤绌虹櫧鏈熺殑鎻愰啋 lt 20211221 start
- //, Maintenance_Contract__r.Past_Contract_end_day__c //杩囧幓鍚堝悓缁撴潫鏃�
+ // 鎶ヤ环瑙勫垯鏀瑰杽20230314 start
+ // , Maintenance_Contract__r.Past_Contract_end_day__c //杩囧幓鍚堝悓缁撴潫鏃�
+ // ,renewTen_OFF__c
+ // 鎶ヤ环瑙勫垯鏀瑰杽20230314 end
//LJPH-C9SCX7 銆愬鎵樸�戝悎鍚屾棤绌虹櫧鏈熺殑鎻愰啋 lt 20211221 end
// URF闄愭鍚堝悓2鏈� LY 20220811 start
,URF_P_MaxRepairCount__c,URF_V_MaxRepairCount__c
@@ -1030,14 +1038,18 @@
, URF_Maintenance_Contract__r.Management_Code__c
, URF_Maintenance_Contract__r.Contract_End_Date__c
//URF闄愭鍚堝悓2鏈� LY 20220811 end
-
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 start
+ // ,IS_StandardPricing__c
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 end
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/17 start
- ,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
- ,CurrentContract_F_asset__r.Maintenance_Price_Year__c
- ,CurrentContract_F_asset__r.IS_VMContract_Asset__c
- ,Product2.Asset_Model_No__c
- ,Product2.Category4__c
- ,CurrentContract_F__r.endDateGurantee__c
+ // ,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
+ // ,CurrentContract_F_asset__r.Maintenance_Price_Year__c
+ // ,CurrentContract_F_asset__r.IS_VMContract_Asset__c
+ // ,Product2.Asset_Model_No__c
+ // ,Product2.Category4__c
+ // ,CurrentContract_F__r.endDateGurantee__c
+ //娣诲姞鏄惁鏈嶅姟澶氬勾淇濅慨锛屽骞翠繚缁翠慨鏈熻嚦
+ // ,IS_Extend_Gurantee__c,Extend_Gurantee_DateTo__c
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/17 end
FROM Asset WHERE Hospital__c = :this.targetHospitalId AND ( AssetMark__c != '鑰楁潗' OR Product2.Family != 'ET' ) ORDER BY ID, IF_Warranty_Service__c asc];
//JZHG-BSDUT4 ---20200825---update By rentongxiao---Start
@@ -1063,7 +1075,17 @@
}else{
this.isLimitPrice = false;
}
- // 涓婇檺鍚堝悓 hql 20230216 start
+ // 涓婇檺鍚堝悓 hql 20230216 end
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+ // Maintenance_Contract__c mc1 = [SELECT id,Is_Blank_period__c,Cost_rate_ForecastF__c FROM Maintenance_Contract__c WHERE Id =: this.targetMaintenanceContractId];
+ // Boolean IsBlankperiod = mc1.Is_Blank_period__c;
+ // this.Cost_rate_ForecastF = mc1.Cost_rate_ForecastF__c;
+ // if(IsBlankperiod){
+ // this.Is_Blank_period = true;
+ // }else{
+ // this.Is_Blank_period = false;
+ // }
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
// 閬告姙娓堛伩銇磵鍏ユ鍣ㄦ儏鍫便倰鍙栧緱
Map<Id, Integer> selectedAssetIds = new Map<Id, Integer>();
List<Maintenance_Contract_Asset_Estimate__c> selectedMcaes = new List<Maintenance_Contract_Asset_Estimate__c>();
@@ -1077,12 +1099,12 @@
Asset__r.CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,
Asset__r.CurrentContract_F_asset__r.endDateGurantee_Text__c,
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/18 start 璁惧娑堣垂鐜�
- Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c,
- Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c,
- Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c,
- Asset__r.Product2.Asset_Model_No__c,
- Asset__r.Product2.Category4__c,
- Asset__r.CurrentContract_F__r.endDateGurantee__c,
+ // Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c,
+ // Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c,
+ // Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c,
+ // Asset__r.Product2.Asset_Model_No__c,
+ // Asset__r.Product2.Category4__c,
+ // Asset__r.CurrentContract_F__r.endDateGurantee__c,
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2022/1/18 end
Asset__r.CurrentContract_F__r.First_Estimate_Date__c,
Asset__r.CurrentContract_F__r.Contract_Consumption_rate__c,
@@ -1202,7 +1224,7 @@
Asset__r.EquipmentGuaranteeFlg__c,
//2021-11-30 fy add LJPH-C8W8FV 缃《 start
Asset__r.OwnershipMachine_No__c,
- Product_Manual__r.Category4__c,
+ // Product_Manual__r.Category4__c,
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
Asset_Consumption_rate__c,
Asset__r.CurrentContract_F__c,
@@ -1252,7 +1274,7 @@
Adjustment_Lower_price__c,
Adjustment_Upper_price__c,
// 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 start
- IS_StandardPricing__c,
+ // IS_StandardPricing__c,
// 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 end
Last_inspection_day__c,
Check_Result__c,
@@ -1262,6 +1284,9 @@
Repair_Price_Auto__c,
Third_Party_Return__c,
// (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� end
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // Blank_period__c,
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
Comment__c,
Asset__r.Posting_Date__c,
EquipmentGuaranteeFlgTxt__c,
@@ -1272,12 +1297,12 @@
// Gzw 20200807 浜斾釜鍘诲勾鍚堝悓鐩稿叧锛屾墍浠ユ姤浠蜂骇鍝侊紝鑾峰彇涓婃湡鍚堝悓 eng
// LJPH-C9GD34 gzw fix start
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 2023/01/28 start
- ,Asset__r.Product2.Asset_Model_No__c
- ,Asset__r.Product2.Category4__c
- ,Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c
- ,Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c
- ,Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c
- ,Asset__r.CurrentContract_F__r.endDateGurantee__c
+ // ,Asset__r.Product2.Asset_Model_No__c
+ // ,Asset__r.Product2.Category4__c
+ // ,Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c
+ // ,Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c
+ // ,Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c
+ // ,Asset__r.CurrentContract_F__r.endDateGurantee__c
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 2023/01/28 end
,Estimate_List_Price_Page__c
@@ -1328,6 +1353,7 @@
// Map<String,repair__c> assNewRepMap = new Map<String,repair__c>();
// assNewRepMap = getNewrep(this.assetRecords);
datatemp = getChartData();
+ // System.debug(LoggingLevel.INFO, '*** this.assetRecords: ' + this.assetRecords);
for (Asset ast : this.assetRecords) {
Boolean isNew = false;
Decimal listPrice = ast.Maintenance_Price_Month__c;
@@ -1384,7 +1410,9 @@
//
//
//
+ // ast.CurrentContract_End_Date__c = ast.CurrentContract_F_asset__r.IS_VMContract_Asset__c ? ast.Extend_Gurantee_DateTo__c : ast.CurrentContract_End_Date__c;
checkedAssets.add(new AssetInfo(checkedAssets.size(), ast, isNew, listPrice, selectedLocal,estimate));
+
} else {
//update by rentongxiao 2020-09-23 start
if (ast.AssetMark__c == '涓绘満') {
@@ -1405,6 +1433,8 @@
}
*/
}
+
+ // System.debug(LoggingLevel.INFO, '*** checkedAssets: ' + checkedAssets);
totalPage = (totalRecords / selctRecordNum) + (Math.mod(totalRecords, selctRecordNum) > 0 ? 1 : 0);
system.debug('椤哄簭妫�娴�' + checkedAssets);
@@ -1431,7 +1461,7 @@
//2021-11-30 fy add LJPH-C8W8FV 缃《 start
List<AssetInfo> topAsset =new List<AssetInfo>();
List<AssetInfo> otherAsset =new List<AssetInfo>();
-
+ // System.debug(LoggingLevel.INFO, '*** 椤哄簭: ' + checkedAssets);
for(AssetInfo ched : checkedAssets){
system.debug('椤哄簭妫�娴�2' + ched.ProductModelNoc);
system.debug('椤哄簭妫�娴�3' + ched.AssetModelNoc);
@@ -1456,6 +1486,7 @@
}
checkedAssets=NumberSort;
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
+ // System.debug(LoggingLevel.INFO, '*** checkedAssetsEND: ' + checkedAssets);
}
//
@@ -1504,12 +1535,12 @@
+ 'URF_Maintenance_Contract__c,URF_Maintenance_Contract__r.Management_Code__c,URF_Maintenance_Contract__r.Contract_End_Date__c,'
//URF闄愭鍚堝悓2鏈� LY 20220811 end
//甯傚満澶氬勾淇濅环鏍煎紑鍙� start DC 2023/01/17 璁惧娑堣垂鐜� 浜у搧鍨嬪彿 绗洓鍒嗙被 鏄惁涓哄骞翠繚璁惧
- + 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,'
- + 'CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
- + 'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
- + 'Product2.Asset_Model_No__c,'
- + 'Product2.Category4__c,'
- + 'CurrentContract_F__r.endDateGurantee__c,'
+ // + 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,'
+ // + 'CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
+ // + 'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
+ // + 'Product2.Asset_Model_No__c,'
+ // + 'Product2.Category4__c,'
+ // + 'CurrentContract_F__r.endDateGurantee__c,'
//甯傚満澶氬勾淇濅环鏍煎紑鍙� end DC 2023/01/17
+ 'Product2.ProductURF__c,CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' '
+ 'AND Id NOT IN ' + notInId;
@@ -1569,7 +1600,7 @@
//URF闄愭鍚堝悓2鏈� LY 20220811 end
//甯傚満澶氬勾淇濅环鏍煎紑鍙� start DC 2023/01/17 璁惧娑堣垂鐜�
- sqlStr += 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,CurrentContract_F_asset__r.IS_VMContract_Asset__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,Product2.Asset_Model_No__c,Product2.Category4__c,CurrentContract_F__r.endDateGurantee__c,';
+ // sqlStr += 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,CurrentContract_F_asset__r.IS_VMContract_Asset__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,Product2.Asset_Model_No__c,Product2.Category4__c,CurrentContract_F__r.endDateGurantee__c,';
//甯傚満澶氬勾淇濅环鏍煎紑鍙� start DC 2023/01/17
sqlStr += ' CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\'';
@@ -1777,6 +1808,9 @@
and Agreed_Date__c != null
and Agreed_Date__c > :LastYearDate
and Agreed_Date__c <= :today
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
List<AggregateResult> SecRepairList = [
@@ -1801,6 +1835,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastYearDate
and Agreed_Date__c > :LastSecondYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞撮棿淇悊瀹炵哗
@@ -1826,6 +1863,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastSecondYearDate
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞翠慨鐞嗗疄缁�
@@ -1851,6 +1891,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :today
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
@@ -1992,6 +2035,9 @@
and Agreed_Date__c != null
and Agreed_Date__c > :LastYearDate
and Agreed_Date__c <= :today
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
List<AggregateResult> SecRepairList = [
@@ -2016,6 +2062,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastYearDate
and Agreed_Date__c > :LastSecondYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞撮棿淇悊瀹炵哗
@@ -2041,6 +2090,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastSecondYearDate
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞翠慨鐞嗗疄缁�
@@ -2066,6 +2118,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :today
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓1骞撮棿
@@ -3523,6 +3578,9 @@
if (newValue.size() > 0) insert newValue;
}
// 鈶� start
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+ // this.contract.Is_Blank_period__c = this.Is_Blank_period;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
this.contract.Estimation_Id__c = this.targetEstimateId;
this.contract.Contract_Esti_Start_Date__c = this.estimate.Contract_Esti_Start_Date__c;
this.contract.Contract_Range__c = this.estimate.Contract_Range__c;
@@ -3898,23 +3956,23 @@
//2.涓�骞翠互涓婄殑鍚堝悓锛屽湪缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ紑鏀剧画绛炬姤浠枫��
//3.绠＄悊鍛樿烦杩囷紝
//WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220413
- // if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin &&
- // String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') {
+ if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin &&
+ String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') {
- // Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c);
- // Decimal monthCon = (Decimal)noOfDays / 365 * 12;
- // // 鍙紑濮嬫姤浠风殑鏈堟暟闄愬埗
- // if (input.rec.CurrentContract_F__r.Contract_Range__c >= 12 && monthCon > 6) {
- // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍚堝悓缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ埗浣滄姤浠枫��');
- // rtn = false;
- // }
- // //ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '---' + monthCon + ' +++ ' + Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c/2)));
- // //rtn = false;
- // if (input.rec.CurrentContract_F__r.Contract_Range__c < 12 && monthCon > Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c / 2)) {
- // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 缁忓巻鏈堟暟杩囧崐鏂瑰彲鍒朵綔鎶ヤ环');
- // rtn = false;
- // }
- // }
+ Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c);
+ Decimal monthCon = (Decimal)noOfDays / 365 * 12;
+ // 鍙紑濮嬫姤浠风殑鏈堟暟闄愬埗
+ if (input.rec.CurrentContract_F__r.Contract_Range__c >= 12 && monthCon > 6) {
+ input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍚堝悓缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ埗浣滄姤浠枫��');
+ rtn = false;
+ }
+ //ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '---' + monthCon + ' +++ ' + Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c/2)));
+ //rtn = false;
+ if (input.rec.CurrentContract_F__r.Contract_Range__c < 12 && monthCon > Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c / 2)) {
+ input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 缁忓巻鏈堟暟杩囧崐鏂瑰彲鍒朵綔鎶ヤ环');
+ rtn = false;
+ }
+ }
// 澶氬勾淇濆垽鏂�
if ( String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') {
//if (UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') {
@@ -3926,14 +3984,14 @@
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 Start 缁撴潫鏃ョ┖鐧芥湡澶т簬6涓湀 鎶ラ敊鎻愮ず
- Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
- Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;
+ // Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
+ // Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;
- if(today>endDate6Month && cotractEndDay <today){
- input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 寤鸿绌虹櫧鏈熸帶鍒跺湪1涓湀浠ュ唴锛屽涓嶅緱宸辩┖鐧芥湡鍦�6涓湀浠ヤ笂锛岃鍏堣仈缁滄湇鍔＄鐞嗛儴璇勪及銆�');
+ // if(today>endDate6Month && cotractEndDay <today){
+ // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 甯傚満澶氬勾淇濈粨鏉熷凡瓒呰繃6涓湀锛岀敱浜庣┖鐧芥湡杩囬暱锛岃鍏堣仈绯绘湇鍔＄鐞嗛儴璇勪及銆�');
- }
+ // }
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 end
@@ -3943,18 +4001,18 @@
// gzw 20220630 寮�閫氱画绛炬姤浠锋潈闄愬悗锛岃秴杩�6涓湀涔熷彲浠ョ画绛�
// 缁鎯呭喌 鈶� 涓婃湡鍚堝悓 Open_RenewalQuotation__c & 6涓湀浠ュ唴 鈶� VM_Contract_Check__c Open_RenewalQuotation__c 2涓兘鎵撻挬
// 鈶� 2涓紑鍏抽兘鎵撳紑 鈶M_Contract_Check__c鎵撳紑 灏忎簬6涓湀
- // if (!((this.contract.Open_RenewalQuotation__c && input.rec.CurrentContract_F__r.VM_Contract_Check__c) || (input.rec.CurrentContract_F__r.VM_Contract_Check__c && monthCon < 6))) {
- // if(monthCon < 6){
- // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍙互鍔犲叆鏈嶅姟鍚堝悓锛屽姞鍏ヤ环鏍艰鑱旂郴鏈嶅姟绠＄悊閮ㄣ��');
- // }else{
- // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
- // }
- // System.debug(LoggingLevel.INFO, '*** this.contract.Open_RenewalQuotation__c: ' + this.contract.Open_RenewalQuotation__c);
- // System.debug(LoggingLevel.INFO, '*** : input.rec.CurrentContract_F__r.VM_Contract_Check__c' + input.rec.CurrentContract_F__r.VM_Contract_Check__c);
- // System.debug(LoggingLevel.INFO, '*** monthCon: ' + monthCon);
- // //input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
- // rtn = false;
- // }
+ if (!((this.contract.Open_RenewalQuotation__c && input.rec.CurrentContract_F__r.VM_Contract_Check__c) || (input.rec.CurrentContract_F__r.VM_Contract_Check__c && monthCon < 6))) {
+ if(monthCon < 6){
+ input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍙互鍔犲叆鏈嶅姟鍚堝悓锛屽姞鍏ヤ环鏍艰鑱旂郴鏈嶅姟绠＄悊閮ㄣ��');
+ }else{
+ input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
+ }
+ // System.debug(LoggingLevel.INFO, '*** this.contract.Open_RenewalQuotation__c: ' + this.contract.Open_RenewalQuotation__c);
+ // System.debug(LoggingLevel.INFO, '*** : input.rec.CurrentContract_F__r.VM_Contract_Check__c' + input.rec.CurrentContract_F__r.VM_Contract_Check__c);
+ // System.debug(LoggingLevel.INFO, '*** monthCon: ' + monthCon);
+ //input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
+ rtn = false;
+ }
/*if (input.rec.CurrentContract_F__r.Gurantee_Renew_startDate__c > Date.today()) {
input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 绗竴涓澶囩粨鏉熷悗鍙互鍒朵綔鎶ヤ环銆�');
rtn = false;
@@ -4111,7 +4169,7 @@
public class AssetInfo {
// 鏂板悎鍚屽鍝佺‘淇濇彁渚� 褰撳墠鏍囪
public Boolean etGFlg {get; set;}
- public String ISStandardPricing{get; set;}
+ // public String ISStandardPricing{get; set;}
public Integer lineNo {get; private set;}
public Decimal Repair_Price_Auto {get; set;}
public String Agreed_Date{get; set;}
@@ -4122,6 +4180,7 @@
public Maintenance_Contract_Estimate__c estimate {get; set;}
public Transient Decimal orgPrice {get; private set;}
public Transient Decimal orgPrice12 {get; private set;}
+ // public String Blank_period {get; set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� Star
public Boolean CheckRows {get; private set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� End
@@ -4143,7 +4202,7 @@
public String MDMModelNoc;
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� start 2023/01/17
- public String Category;
+ // public String Category;
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� end 2023/01/17
public Id getRecId() {
Id rtn = null;
@@ -4178,9 +4237,16 @@
public AssetInfo(Integer lineNo, Asset record, Boolean isNew, Decimal listPrice, Maintenance_Contract_Asset_Estimate__c mcae,Maintenance_Contract_Estimate__c estimate) {
this.lineNo = lineNo;
this.rec = record;
- this.ISStandardPricing = mcae.IS_StandardPricing__c;
+ // this.rec.CurrentContract_End_Date__c = record.CurrentContract_End_Date__c;
+ // this.rec.CurrentContract_End_Date__c = record.IS_Extend_Gurantee__c ? record.Extend_Gurantee_DateTo__c : record.CurrentContract_End_Date__c;
+ // this.ISStandardPricing = record.IS_StandardPricing__c;
this.estimate = new Maintenance_Contract_Estimate__c();
this.estimate.IS_Reduced_price_approval__c = estimate.IS_Reduced_price_approval__c;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // this.estimate.Contract_Esti_Start_Date__c = estimate.Contract_Esti_Start_Date__c;
+ // this.estimate.renewTen_OFF__c = estimate.renewTen_OFF__c;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
+
// (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� start
// if (record.Asset_situation__c == '淇悊涓�' && record.Return_Without_Repair__r.Agreed_Date__c!=null) {
// this.Agreed_Date = '涓嶄负绌�';
@@ -4209,6 +4275,9 @@
Check_Result__c = mcae.Check_Result__c,
Repair_Price__c = mcae.Repair_Price__c,
Repair_Price_pass__c = mcae.Repair_Price_pass__c,
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // Blank_period__c = mcae.Blank_period__c,
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
Comment__c = mcae.Comment__c,
EquipmentGuaranteeFlgTxt__c = mcae.EquipmentGuaranteeFlgTxt__c,
Estimate_Cost__c = mcae.Estimate_Cost__c,
@@ -4232,6 +4301,17 @@
this.mcae.Repair_Price_pass__c = this.mcae.Repair_Price__c;
}
}
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // if (this.estimate.Contract_Esti_Start_Date__c!=null && this.rec.CurrentContract_End_Date__c != null) {
+ // this.mcae.Blank_period__c = String.valueof(this.rec.CurrentContract_End_Date__c.daysbetween(this.estimate.Contract_Esti_Start_Date__c));
+ // }
+ // if (this.estimate.Contract_Esti_Start_Date__c==null && this.rec.CurrentContract_End_Date__c != null) {
+ // this.mcae.Blank_period__c = String.valueof(this.rec.CurrentContract_End_Date__c.daysbetween(system.today()));
+ // }
+ // if (this.mcae.Blank_period__c!=null&&integer.valueOf(this.mcae.Blank_period__c)<15 ) {
+ // this.mcae.Blank_period__c = '鏃犵紳缁';
+ // }
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
this.isManual = false;
this.rec_checkBox_c = true;
this.orgPrice = record.Maintenance_Price_Month__c;
@@ -4249,7 +4329,7 @@
//add by rentx 2020-11-12 LJPH-BV93RZ end
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� start 2023/01/17
- this.Category = mcae.Product_Manual__r.Category4__c;
+ // this.Category = mcae.Product_Manual__r.Category4__c;
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� end 2023/01/17
//add by mzy 2021-02-07 start
@@ -4262,7 +4342,6 @@
public AssetInfo(Integer lineNo, Maintenance_Contract_Asset_Estimate__c mcae) {
this.lineNo = lineNo;
this.rec = null;
- this.ISStandardPricing = mcae.IS_StandardPricing__c;
this.mcae = new Maintenance_Contract_Asset_Estimate__c(
// id = mcae.Id, // 鏈綋銇亜銈夈仾銇勩伄锛� 銈汇儍銉堛仐銇熴倝銆佹柊瑕忔ī闄愩亴銇亸銇с倐銆佹洿鏂般仹銇嶃伨銇欍�傚緦钘ゃ仌銈撱伀纰鸿獚銇椼仧銆併仾銇忋仹銈傘亜銇勩仹銇欍��
isNew__c = mcae.IsNew__c,
@@ -4308,7 +4387,7 @@
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� start 2023/01/17
- this.Category = mcae.Product_Manual__r.Category4__c;
+ // this.Category = mcae.Product_Manual__r.Category4__c;
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� end 2023/01/17
}
diff --git a/force-app/main/default/pages/SelectAssetEstimateVM.page b/force-app/main/default/pages/SelectAssetEstimateVM.page
index 82fa4f0..fd2c49b 100644
--- a/force-app/main/default/pages/SelectAssetEstimateVM.page
+++ b/force-app/main/default/pages/SelectAssetEstimateVM.page
@@ -41,11 +41,9 @@
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');
@@ -271,9 +269,9 @@
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);
+ // console.log('涓婇檺閲戦涓�'+Limit_Price_Amount);
+ // console.log('鍘熸湁涓婇檺閲戦涓�'+Limit_PriceHidden);
+ // console.log('涓嶆槸涓婇檺鍚堝悓鐨勯噾棰濅负'+Price111);
//涓婇檺鍚堝悓 20230103 hql end
pageSetDisabled();
var createdDate = new Date('{!estimate.CreatedDate}');
@@ -364,7 +362,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());
}
}
@@ -395,6 +393,7 @@
}
function checkDiscount(val) {
+ // 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("");
@@ -406,6 +405,27 @@
j$(escapeVfId('allPage:allForm:allBlock:contractInfo:quotation_Amount')).val(0.00);
return;
}
+ // 鎶ヤ环閲戦鏀瑰杽 20230314 start
+ // var startime1 = new Date(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:PastContractendday')).value());
+ // var startime2 = new Date(j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).value());
+ // var result = (startime2-startime1)/(3600*24*1000);
+ // Is_Blank_period1 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Is_Blank_period')).value();
+ // Cost_rate_ForecastF = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Cost_rate_ForecastF')).value();
+ // downprice = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceDown')).value();
+ // var renewTenOFF = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:renewTenOFF')).value();
+ // if (Is_Blank_period1 == 'true' && ((parseFloat(Cost_rate_ForecastF)<100)||Cost_rate_ForecastF.length == 0) && result <=1 && downprice > val ) {
+ // alerts = 1;
+ // }
+ // if (alerts == 1 && renewTenOFF == 'false') {
+ // if (confirm("鏈崟鍙互缁х画鐢宠10%鎶樻墸锛岃纭鏄惁鐢宠锛岀敵璇峰悗鍚堝悓寮�濮嬫棩鑷姩閿佸畾涓哄悎鍚岄瀹氬紑濮嬫棩锛屽悗缁棤娉曟洿鏀瑰悎鍚屽紑濮嬫棩")) {
+ // j$(escapeVfId('allPage:allForm:allBlock:contractInfo:renewTenOFF')).val(true);
+ // val = val*0.9;
+ // j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).attr("disabled", true);
+ // } else {
+
+ // }
+ // }
+ // 鎶ヤ环閲戦鏀瑰杽 20230314 end
val = localParseFloat(val);
//val = Math.round(val * 100) / 100;
val = Math.round(val);
@@ -466,9 +486,188 @@
console.log('鏂规硶2鏄惁瀹℃壒閫氳繃=='+ISReducedpriceapproval+'==============');
}
var number1 = 0;
+// function seamlessRenew(cnt){
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+// var isSeamlessRenew = 0;
+// var isSeamlessRenew1 = 0;
+// var isSeamlessRenew3 = 0;
+// var isSeamlessRenew4 = 0;
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 start
+// var downPriceSum = 0;
+// var upPriceSum = 0;
+// var downPriceSum1 = 0;
+// var upPriceSum1 = 0;
+// var downPriceSum3 = 0;
+// var upPriceSum3 = 0;
+// var downPriceSum4 = 0;
+// var upPriceSum4 = 0;
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 end
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 start
+// var renewTenOFF = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:renewTenOFF')).value();
+// if (renewTenOFF == 'true') {
+// j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).attr("disabled", true);
+// }
+// document.getElementById("startdateaddsix1").value = addMonths(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:PastContractendday')).value(),6);
+// document.getElementById("startdateaddsix2").value = addMonths(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:PastContractendday')).value(),6);
+// document.getElementById("startdateaddsix3").value = addMonths(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:PastContractendday')).value(),12);
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 end
+// for (var i = 0; i < cnt; i++) {
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 start
+// var downPrice1 = 0;
+// var upPrice1 = 0;
+// var downPrice3 = 0;
+// var upPrice3 = 0;
+// var downPrice4 = 0;
+// var upPrice4 = 0;
+// var Price_YearTXT = 0;
+// var LastMContract_Price = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContract_Price')).val());
+// var isnew = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':assetNewHidden')).val();
+// // 鍚堝悓鏈堟暟涔楃畻
+// var month = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:contract:monthRange')).val());
+// if (month == undefined || month == "") {
+// month = 1;
+// }
+// var month2 = 0;
+// if (month > 12) {
+// month2 = month - 12;
+// month = 12;
+// }
+// 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();
+// if(b != ''){
+// // var lastendDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':End_Date')).value());
+// var lastContRange = 0;
+// if(LastMContractRecord == 'VM_Contract'){
+// // lastendDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':endDateGurantee_Text')).value());
+// lastContRange = 36;
+// }else{
+// lastContRange = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':lastContRange')).value();
+// }
+// }
+// var Punish = calculateNtoMRatio( lastContRange,(month + month2));
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 end
+// if (!isDisabled) {
+// var Adjustment_ratio_Lower = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_ratio_Lower')).val());
+// var Adjustment_ratio_Upper = localParseFloat(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_ratio_Upper')).val());
+// 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;
+// }
+// // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 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 == '') {
+// console.log('鏂扮璁惧');
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(strMoney));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_priceHidden')).val(strMoney);
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(strMoney));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_priceHidden')).val(strMoney);
+// }
+// // 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 end
+// var startdate11 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:PastContractendday')).value();
+// var startdate1 = j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).value();
+// var startdate = new Date(startdate1);
+// var startdatesix1 = new Date(addMonths(startdate11,6));
+// startdatesix1.setDate(startdatesix1.getDate()-1);
+// var startdatesix2 = new Date(addMonths(startdate11,6));
+// startdatesix2.setDate(startdatesix2.getDate()+1);
+// var startdatesix3 = new Date(addMonths(startdate11,12));
+// startdatesix3.setDate(startdatesix3.getDate()+1);
+// // 绗竴涓棩鏈�
+// var result1 = Blankperiod(startdate,i,LastMContract_Price,Punish,Adjustment_ratio_Upper,Adjustment_ratio_Lower,strMoney,1);
+// var arr=result1.split( '/');
+// downPrice=parseInt(arr[0]);
+// upPrice=parseInt(arr[1]);
+// isSeamlessRenew=isSeamlessRenew+parseInt(arr[2]);
+// // console.log('result1='+result1);
+// // 绗簩涓棩鏈�
+// var result2 = Blankperiod(startdatesix1,i,LastMContract_Price,Punish,Adjustment_ratio_Upper,Adjustment_ratio_Lower,strMoney,2);
+// var arr2=result2.split( '/');
+// downPrice1=parseInt(arr2[0]);
+// upPrice1=parseInt(arr2[1]);
+// isSeamlessRenew1=isSeamlessRenew1+parseInt(arr2[2]);
+// // console.log('result2='+result2);
+// // 绗笁涓棩鏈�
+// var result3 = Blankperiod(startdatesix2,i,LastMContract_Price,Punish,Adjustment_ratio_Upper,Adjustment_ratio_Lower,strMoney,2);
+// var arr3=result3.split( '/');
+// downPrice3=parseInt(arr3[0]);
+// upPrice3=parseInt(arr3[1]);
+// isSeamlessRenew3=isSeamlessRenew3+parseInt(arr3[2]);
+// // console.log('result3='+result3);
+// // 绗洓涓棩鏈�
+// var result4 = Blankperiod(startdatesix3,i,LastMContract_Price,Punish,Adjustment_ratio_Upper,Adjustment_ratio_Lower,strMoney,2);
+// var arr4=result4.split( '/');
+// downPrice4=parseInt(arr4[0]);
+// upPrice4=parseInt(arr4[1]);
+// isSeamlessRenew4=isSeamlessRenew4+parseInt(arr4[2]);
+// // console.log('result4='+result4);
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 start
+// downPriceSum = downPriceSum + localParseFloat(toNum(downPrice));
+// upPriceSum = upPriceSum + localParseFloat(toNum(upPrice));
+// downPriceSum1 = downPriceSum1 + localParseFloat(toNum(downPrice1));
+// upPriceSum1 = upPriceSum1 + localParseFloat(toNum(upPrice1));
+// downPriceSum3 = downPriceSum3 + localParseFloat(toNum(downPrice3));
+// upPriceSum3= upPriceSum3 + localParseFloat(toNum(upPrice3));
+// downPriceSum4 = downPriceSum4 + localParseFloat(toNum(downPrice4));
+// upPriceSum4= upPriceSum4 + localParseFloat(toNum(upPrice4));
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 end
+// }
+// }
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+// // console.log('isSeamlessRenew='+isSeamlessRenew);
+// if (isSeamlessRenew==0) {
+// j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Is_Blank_period')).val(true);
+// }else{
+// j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Is_Blank_period')).val(false);
+// }
+// var startime1 = new Date(j$(escapeVfId('allPage:allForm:allBlock:contractInfo:PastContractendday')).value());
+// var startime2 = new Date(j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).value());
+// var result = (startime2-startime1)/(3600*24*1000);
+// Is_Blank_period1 = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Is_Blank_period')).value();
+// Cost_rate_ForecastF = j$(escapeVfId('allPage:allForm:allBlock:contractInfo:Cost_rate_ForecastF')).value();
+// // 5.褰撻娴嬫垚鏈巼涓虹┖鏃跺疄缁╄繛鍔ㄤ环鏍兼槸鍚︿韩鍙�9鎶樹紭鎯�
+// if (isSeamlessRenew==0 && ((parseFloat(Cost_rate_ForecastF)<100)||Cost_rate_ForecastF.length == 0)) {
+// downPriceSum = downPriceSum*0.9;
+// upPriceSum = upPriceSum*0.9;
+// }
+// if (isSeamlessRenew1==0) {
+// downPriceSum1 = downPriceSum1*0.9;
+// upPriceSum1 = upPriceSum1*0.9;
+// }
+// if (isSeamlessRenew3==0) {
+// downPriceSum3 = downPriceSum3*0.9;
+// upPriceSum3 = upPriceSum3*0.9;
+// }
+// if (isSeamlessRenew4==0) {
+// downPriceSum4 = downPriceSum4*0.9;
+// upPriceSum4 = upPriceSum4*0.9;
+// }
+// if (!isDisabled) {
+// j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceUp')).text(toNumComma(Math.round(upPriceSum)));
+// j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceUpHidden')).val(toNum(Math.round(upPriceSum)));
+// j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceDown')).text(toNumComma(Math.round(downPriceSum)));
+// j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceDownHidden')).val(toNum(Math.round(downPriceSum)));
+// }
+// document.getElementById("GuidePriceDown5").value = toNumComma(Math.round(downPriceSum));
+// document.getElementById("GuidePriceUp5").value = toNumComma(Math.round(upPriceSum));
+// document.getElementById("GuidePriceDown4").value = toNumComma(Math.round(downPriceSum1));
+// document.getElementById("GuidePriceUp4").value = toNumComma(Math.round(upPriceSum1));
+// document.getElementById("GuidePriceDown3").value = toNumComma(Math.round(downPriceSum3));
+// document.getElementById("GuidePriceUp3").value = toNumComma(Math.round(upPriceSum3));
+// document.getElementById("GuidePriceDown2").value = toNumComma(Math.round(downPriceSum4));
+// document.getElementById("GuidePriceUp2").value = toNumComma(Math.round(upPriceSum4));
+// // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
+// }
function refreshAsset(cnt) {
console.log('鎵цrefreshAsset');
console.log('decide==='+{!DecideBtnDisabled});
+
// alert(cnt);
// 鎻愪氦鍚庡氨椤甸潰涓嶈绠椾簡
var isDisabled = {!PageDisabled};
@@ -488,6 +687,8 @@
var GuranteeCount = 0;
//澶氬勾淇濈画绛惧悎鍚屾暟閲� thh 20220316 end
+
+
//2022鏁呴殰鍝佸姞璐� 鑾峰彇userInfo绠�妗ｅ悕绉� 鏄惁涓篎SE start
var isFSE = {!isFSE};
// var isFSE = true;
@@ -503,6 +704,10 @@
//20230208 涓婇檺鍚堝悓寮�鍙� hql end
// 棰勫畾寮�濮嬫棩
var startdate = new Date(j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).value());
+ // 鎶ヤ环瑙勫垯鏀瑰杽
+ // document.getElementById("startdateaddsix4").value = j$(escapeVfId('allPage:allForm:allBlock:contract:startdate')).value();
+ // 鎶ヤ环瑙勫垯鏀瑰杽
+
// 棰勫畾寮�濮嬫棩-6涓湀
startdate.setMonth(startdate.getMonth() - 6);
// 鐢宠鏃� 褰撳墠鏃ユ湡
@@ -529,6 +734,7 @@
month = 12;
}
for (var i = 0; i < cnt; i++) {
+ // console.log('绗�'+i+'涓澶�');
var strMoney = 0;
var repairMoney = 0;
// 琛岄」鐩� 鏈�楂樸�佹渶浣庝环鏍煎悎璁�
@@ -536,8 +742,7 @@
// 涓嬬嚎浠锋牸
var downPrice = 0;
// 涓婄嚎浠锋牸
- var upPrice = 0;
-
+ var upPrice = 0;
// 12涓湀鍚堝悓閲戦
var Price_YearTXT = 0;
@@ -546,7 +751,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
@@ -576,7 +781,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涓湀鍚庢墠鍙姤浠枫��)
@@ -620,112 +825,118 @@
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;
+ }else{
+ upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
+ downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 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);
+ // console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 upPrice'+ upPrice);
+ // console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 downPrice'+ downPrice);
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
@@ -734,18 +945,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);
@@ -754,24 +965,12 @@
//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));
@@ -815,7 +1014,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('***缁翠慨鍚堝悓璁板綍绫诲瀷2'+LastMContractRecord);
+ // console.log('***缁翠慨鍚堝悓璁板綍绫诲瀷2'+LastMContractRecord);
if(b != ''){
conCCount ++;
@@ -862,124 +1061,129 @@
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);
+ // 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);
+ // console.log('***鏈�楂樼郴鏁�'+Maxcoefficient);
+ // console.log('***鏈�浣庣郴鏁�'+Mincoefficient);
if(nowdate < Date.parse(lastendDate)){
- //璁惧灏忎簬涓ゅ勾鍗�
- // 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);
-
- //璁惧璁惧娑堣垂鐜囧皬浜�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);
-
- }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
-
+ upPrice = strMoney;
+ downPrice = strMoney * 0.8;
}else{
- //璁惧澶т簬涓ゅ勾鍗�
- // upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
- // downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
+ upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
+ downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
+ // //璁惧灏忎簬涓ゅ勾鍗�
+ // // 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);
- //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 start 璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟
- upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
- downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
+ // //璁惧璁惧娑堣垂鐜囧皬浜�1.4
+ // if(AssetRate<1.4){
+ // upPrice = VMassetListmonth *ContractMonth / 12;
+ // // console.log('娑堣垂鐜囧皬浜�1.4 upPrice = VMassetListmonth *month /12'+ upPrice);
- console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 upPrice'+ upPrice);
- console.log('璁惧澶т簬2骞村崐 缁浠锋牸 = 瀹氫环 *娑堣垂鐜囧搴旂郴鏁� / 12 *鍚堝悓鏈堟暟 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{
+ // 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 *鍚堝悓鏈堟暟
+ // 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');
+ // 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') {
@@ -998,18 +1202,7 @@
//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));
@@ -1021,13 +1214,14 @@
}
//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 -->
+
+ //<!-- (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)+'鍙穜epairMoney='+repairMoney);
// 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);
@@ -1039,7 +1233,7 @@
}
repairMoney1 = localParseFloat(repairMoney);
ISReducedpriceapproval = j$(escapeVfId('allPage:allForm:allBlock:ISReducedpriceapproval')).val();
- console.log('ISReducedpriceapproval=='+ISReducedpriceapproval);
+ // console.log('ISReducedpriceapproval=='+ISReducedpriceapproval);
var isDisabled = {!PageDisabled};
if (ISReducedpriceapproval =='鏈夊叓鎶樹互涓嬪緟瀹℃壒' || ISReducedpriceapproval =='鏄�'|| isDisabled) {
j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':repairPrice')).attr("disabled", true);
@@ -1086,6 +1280,7 @@
listSum = listSum + localParseFloat(toNum(strMoney));
downPriceSum = downPriceSum + localParseFloat(toNum(downPrice));
upPriceSum = upPriceSum + localParseFloat(toNum(upPrice));
+
}
@@ -1094,6 +1289,7 @@
//j$(escapeVfId('allPage:allForm:allBlock:contractInfo:assetSumPrice')).text(toNumComma(listSum));
//j$(escapeVfId('allPage:allForm:allBlock:contractInfo:assetSumPriceHidden')).val(toNum(listSum));
+
if (!isDisabled) {
j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceUp')).text(toNumComma(Math.round(upPriceSum)));
j$(escapeVfId('allPage:allForm:allBlock:contractInfo:GuidePriceUpHidden')).val(toNum(Math.round(upPriceSum)));
@@ -1125,14 +1321,18 @@
}else{
result = '缁鍚堝悓';
}
- console.log(result);
+ // 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();
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 start
+ // seamlessRenew(cnt);
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 end
number1++;
+
}
function changeAsset(cnt) {
console.log('鎵ц浜哻hangeAsset');
@@ -1216,7 +1416,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') {
@@ -1232,8 +1432,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') {
@@ -1289,107 +1489,111 @@
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{
+ upPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Upper/100);
+ downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
// 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;
+ // upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ // downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
}
// gzw 20220630 瀹為檯鑱斿姩6涓湀浠锋牸鍖哄垎
@@ -1509,104 +1713,108 @@
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);
+ // console.log('***鏈�楂樼郴鏁�'+Maxcoefficient);
+ // console.log('***鏈�浣庣郴鏁�'+Mincoefficient);
if(nowdate < Date.parse(lastendDate)){
+ upPrice = strMoney;
+ downPrice = strMoney * 0.8;
//璁惧灏忎簬涓ゅ勾鍗�
// upPrice = strMoney;
// downPrice = strMoney * 0.8;
- console.log('***灏忎簬2骞村崐')
+ // 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);
+ downPrice = (assetListmonth * Punish) * (1 + Adjustment_ratio_Lower/100);
// 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;
+ // upPrice = VMassetListmonth * ContractMonth *Maxcoefficient / 12;
+ // downPrice = VMassetListmonth * ContractMonth * Mincoefficient / 12;
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/1/30 end
}
@@ -1785,6 +1993,9 @@
}
console.log('涓婇檺閲戦涓�'+Limit_Price_Amount);
//涓婇檺鍚堝悓 20230214 hql end
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 start
+ // seamlessRenew(cnt);
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 end
}
@@ -2014,8 +2225,136 @@
// return true;
// }
}
+// 鎶ヤ环瑙勫垯鏀瑰杽 20230310 start
+// function addMonths(yearMonthDay ,monthNum){
+// var arr=yearMonthDay.split( '/');
+// var year=parseInt(arr[0]);
+// var month=parseInt(arr[1]);
+// var day=parseInt(arr[2]);
+// month=month+monthNum;
+// if(month>12){//鏈堜唤鍔�
+// var yearNum=parseInt( (month-1)/12);
+// month=month%12==0?12 :month%12;
+// year+=yearNum;
+// }else if(month<=0){//鏈堜唤鍑�
+// month=Math.abs( month);
+// var yearNum=parseInt( (month+12)/12);
+// year-=yearNum;
+// }
+// month=month<10?"0"+month :month;
+// return year+"/"+month+"/"+day;
+// }
+// function Blankperiod(startdate,i,LastMContract_Price,Punish,Adjustment_ratio_Upper,Adjustment_ratio_Lower,strMoney,type){
+// var downPrice = 0;
+// var upPrice = 0;
+// var isSeamlessRenew = 0;
+// Blank_period = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Blank_period')).value();
+// var lastendDate1= j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':End_Date')).value()
+// var lastendDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':End_Date')).value());
+// // console.log("lastendDate1="+lastendDate1);
+// var today = new Date();
+// if (lastendDate1.length !=0) {
+// if (startdate == null) {
+// // console.log(1);
+// Blank_period=(today-lastendDate)/(3600*24*1000);
+// }else{
+// // console.log(2);
+// Blank_period=(startdate-lastendDate)/(3600*24*1000);
+// }
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Blank_period')).val(Blank_period);
+// }
+// if (Number(Blank_period)<15&&Blank_period.length != 0) {
+// // console.log(3);
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Blank_period')).val('鏃犵紳缁');
+// }
+// Blank_period1 = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Blank_period')).value();
+// // console.log('Blank_period1='+Blank_period1);
+// // 2.鏃犵┖鐧芥湡璁惧鏄惁绠楁棤缂濈画绛捐澶� 鏄惁鍖呭惈鍦ㄦ棤缂濈画绛剧殑鎶ヤ环鍒ゆ柇涓紙棣栫鐨勮澶囷級?
+// if (Blank_period1 != '鏃犵紳缁' && Blank_period.length != 0) {
+// isSeamlessRenew++;
+// }
+// // 1.瀹炵哗杩炲姩浠锋牸鍜岃澶囧弬淇濆畾浠� 閫昏緫鏌ョ湅
+// upPrice1 = (LastMContract_Price * Punish) * (1 + Adjustment_ratio_Upper/100);
+// downPrice1 = (LastMContract_Price * Punish) * (1 + Adjustment_ratio_Lower/100);
+// // 瀹氫环8鎶�
+// downPrice2 = strMoney * 0.8;
+// upPrice1 = upPrice1.toFixed(2);
+// upPrice2 = strMoney.toFixed(2);
+// downPrice1 = downPrice1.toFixed(2);
+// downPrice2 = downPrice2.toFixed(2);
+// // console.log('LastMContract_Price='+LastMContract_Price);
+// // console.log('upPrice1='+upPrice1);
+// // console.log('downPrice1='+downPrice1);
+// // console.log('upPrice2='+upPrice2);
+// // console.log('downPrice2='+downPrice2);
+// if (!isDisabled) {
+// if (Blank_period1.length==0) {
+// downPrice = downPrice2;
+// upPrice = upPrice2;
+// }
+// if (Blank_period1.length!=0 && Number(Blank_period1)<180 || Blank_period1 == '鏃犵紳缁' ) {
+// if (type == 1) {
+// console.log('缁璁惧灏忎簬6涓湀');
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(downPrice1));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice1));
+// }
+// downPrice = downPrice1;
+// upPrice = upPrice1;
+// }
+// if (Blank_period1 != '鏃犵紳缁' && Number(Blank_period1)>180 && Number(Blank_period1)<365) {
+// if (downPrice1<downPrice2) {
+// if (type == 1) {
+// console.log('缁璁惧6-12涓湀1');
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(downPrice2));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice2));
+// }
+
+// downPrice = downPrice2;
+// upPrice = upPrice2;
+// }else{
+// if (type == 1) {
+// console.log('缁璁惧6-12涓湀2');
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(downPrice1));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice1));
+// }
+// downPrice = downPrice1;
+// upPrice = upPrice1;
+// }
+// }
+// if (Blank_period1 != '鏃犵紳缁' && Number(Blank_period1)>365) {
+
+// if (downPrice1<upPrice2) {
+// if (type == 1) {
+// console.log('缁璁惧12涓湀1');
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(upPrice2));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice2));
+// }
+// downPrice = upPrice2;
+// upPrice = upPrice2;
+// }else{
+// if (type == 1) {
+// console.log('缁璁惧12涓湀2');
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Lower_price')).text(toNumComma(downPrice1));
+// j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Adjustment_Upper_price')).text(toNumComma(upPrice1));
+// }
+// downPrice = downPrice1;
+// upPrice = upPrice1;
+// }
+// }
+// }
+// return downPrice+"/"+upPrice+"/"+isSeamlessRenew;
+// }
+// 鎶ヤ环瑙勫垯鏀瑰杽 20230310 end
function changeEstiStartdate(val) {
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 start
+ // var startday = addMonths(val,6);
+ // var startday1 = addMonths(val,12);
+ // document.getElementById("startdateaddsix1").value = startday;
+ // document.getElementById("startdateaddsix2").value = startday;
+ // document.getElementById("startdateaddsix3").value = startday1;
+ // document.getElementById("startdateaddsix4").value = val;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230310 end
if ('{!SaveBtnDisabled}' == 'false') {
j$(escapeVfId('allPage:allForm:contractstartdate')).val(val);
changeContractStartdate(val);
@@ -2200,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');
@@ -2618,17 +2957,22 @@
<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>
+ <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">{!$ObjectType.Asset.fields.CurrentContract_End_Date__c.label}</th>
+ <!-- <th style="width:70px" class="headerRow booleanColumn"> -->
+ <!-- 鏈�杩戜竴鏈熺淮淇悎鍚岀粨鏉� -->
+ <!-- {!$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>
@@ -2725,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 -->
@@ -2749,9 +3093,14 @@
<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"/>
</td>
+ <!-- 2023/03/21 !ar.rec.CurrentContract_F_asset__r.IS_VMContract_Asset__c 涓簍rue 淇濇湁璁惧缁撴潫鏃堕棿锛歵rue:澶氬勾淇濓細淇濅慨鏈熻嚦锛沠alse.鏈�杩戜竴鏈熺淮淇悎鍚岀粨鏉熸棩 -->
<td class="dataCell" width="70px">
- <apex:outputField value="{!ar.rec.CurrentContract_F__r.Contract_End_Date__c}" rendered="{!(Not(ar.IsManual)&& ar.rec.CurrentContract_F__c != null)}" id="End_Date" />
+ <!-- old: 鐩存帴鎷夸繚鏈夎澶囩殑鏈�杩戜竴鏈熺淮淇悎鍚� -->
+ <!-- <apex:outputField value="{!ar.rec.CurrentContract_F__r.Contract_End_Date__c}" rendered="{!(Not(ar.IsManual)&& ar.rec.CurrentContract_F__c != null)}" id="End_Date" /> -->
+ <!-- new: 鍦ㄨ幏鍙栦繚鏈夎澶囦俊鎭椂鐩存帴鍒ゆ柇淇濇湁璁惧鐨勫瓧娈垫椂闂达紙淇濅慨鏈熻嚦/鏈�杩戜竴鏈熺淮淇悎鍚岀粨鏉熸棩锛� -->
+ <apex:outputField value="{!ar.rec.CurrentContract_End_Date__c}" rendered="{!(Not(ar.IsManual) && ar.rec.CurrentContract_F__c != null )}" id="End_Date" />
</td>
+
<!-- 瀹炵哗鑱斿姩浠锋牸璁＄畻 start -->
<td class="dataCell" width="35px">
<apex:outputText value="{!ar.mcae.Adjustment_Upper_price__c}" id="Adjustment_Upper_price"/>
@@ -2788,6 +3137,9 @@
</td>
<!-- (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� start -->
<td class="dataCell" width="35px" style="text-align:right" >
+ <!-- // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start -->
+ <!-- <apex:inputField value="{!ar.mcae.Blank_period__c}" id="Blank_period" style="display:none"/> -->
+ <!-- // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start -->
<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;"/> -->
@@ -3038,6 +3390,12 @@
<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" />
+ <!-- // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start -->
+ <!-- <apex:inputHidden value="{!Is_Blank_period}" id="Is_Blank_period" />
+ <apex:inputField value="{!estimate.Maintenance_Contract__r.Past_Contract_end_day__c}" style="display:none" id="PastContractendday" />
+ <apex:inputHidden value="{!estimate.renewTen_OFF__c}" id="renewTenOFF" />
+ <apex:inputHidden value="{!Cost_rate_ForecastF}" id="Cost_rate_ForecastF" /> -->
+ <!-- // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end -->
</td>
<!-- 涓婇檺鍚堝悓 20230103 hql end -->
</tr>
@@ -3085,6 +3443,71 @@
<td style="text-align: center"></td>
</tr>
</table>
+ <!-- // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start -->
+ <!-- <table style="width:100%">
+ <tr>
+ <th style="text-align: center" colspan="3">璇风粨鍚堝疄闄呭彲浠ョ绾︾殑鏃ユ湡锛岄�夋嫨鎭板綋鐨勭敵璇烽噾棰濓紝浠ュ厤鍚庣画绌虹櫧鏈熷彉鍖栧鑷存爣鍑嗛噾棰濆彉鍖栵紝鍐嶆鐢宠浠锋牸寤惰鏃堕棿</th>
+ <th style="text-align: center"></th>
+ <th style="text-align: center"></th>
+ </tr>
+ <tr>
+ <th style="text-align: center">鏈璁″垝銆愬悎鍚岄瀹氬紑濮嬫棩銆�:<input type="text" id="startdateaddsix4" readonly="readonly" style="border: none;width:70px"></input> </th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶浣庝环鎬婚</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶楂樹环鎬婚</th>
+ </tr>
+ <tr>
+ <td style="text-align: center"></td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceDown5" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceUp5" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: center">褰撱�愬悎鍚岄瀹氬紑濮嬫棩銆戝湪<input type="text" id="startdateaddsix1" readonly="readonly" style="border: none;width:70px"></input> 涔嬪墠</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶浣庝环鎬婚</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶楂樹环鎬婚</th>
+ </tr>
+ <tr>
+ <td style="text-align: center"></td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceDown4" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceUp4" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: center">褰撱�愬悎鍚岄瀹氬紑濮嬫棩銆戝湪<input type="text" id="startdateaddsix2" readonly="readonly" style="border: none;width:70px"></input> 涔嬪悗</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶浣庝环鎬婚</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶楂樹环鎬婚</th>
+ </tr>
+ <tr>
+ <td style="text-align: center"></td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceDown3" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceUp3" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: center">褰撱�愬悎鍚岄瀹氬紑濮嬫棩銆戝湪<input type="text" id="startdateaddsix3" readonly="readonly" style="border: none;width:70px"></input> 涔嬪悗</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶浣庝环鎬婚</th>
+ <th style="text-align: center">鏍囧噯浠锋牸鐨勬渶楂樹环鎬婚</th>
+ </tr>
+ <tr>
+ <td style="text-align: center"></td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceDown2" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ <td style="text-align: center">
+ CNY<input type="text" id="GuidePriceUp2" readonly="readonly" style="border: none;width:70px"></input>
+ </td>
+ </tr>
+ </table> -->
+ <!-- // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end -->
</apex:outputPanel>
</apex:pageblocksection>
--
Gitblit v1.9.1