From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/classes/NewPaymentPlanLoadController.cls |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/force-app/main/default/classes/NewPaymentPlanLoadController.cls b/force-app/main/default/classes/NewPaymentPlanLoadController.cls
index b5b2909..d06c9ca 100644
--- a/force-app/main/default/classes/NewPaymentPlanLoadController.cls
+++ b/force-app/main/default/classes/NewPaymentPlanLoadController.cls
@@ -104,7 +104,7 @@
 
 			PageMCEElement = PageMCE[0];
 			//HWAG-BHT7XX 2019/11/26 START
-			agreeUpperLimit = PageMCE[0].agree_Upper_limit__c ;
+			agreeUpperLimit = PageMCE[0].URF_Contract__c ;
 			//HWAG-BHT7XX 2019/11/26 END
 			// fxk 2021/8/31 鐐规娆℃暟蹇呴』閫� Star
 			// if (PageMCEElement.Inspection_Time__c == null || ''.equals(PageMCEElement.Inspection_Time__c) || '0'.equals(PageMCEElement.Inspection_Time__c)) {
@@ -205,17 +205,12 @@
 	public List<SelectOption> getTerm_Of_Payment() {
 		List<SelectOption> options = new List<SelectOption>();
 		options.add(new SelectOption('涓�娆℃�т粯娆�', '涓�娆℃�т粯娆�'));
+		//URF闄愭鍚堝悓2鏈� LY 20220811 start
+		//if (!PageMCEElement.old_Is_RecognitionModel__c){
 		if (!PageMCEElement.URF_Contract__c){
+		//URF闄愭鍚堝悓2鏈� LY 20220811 end
 			options.add(new SelectOption('澶氭浠樻', '澶氭浠樻'));
 		}
-		//URF闄愭鍚堝悓2鏈� LY 20220811 start
-		// if (PageMCEElement.URF_Contract__c || PageMCEElement.old_Is_RecognitionModel__c){
-		// 	options.add(new SelectOption('涓�娆℃�т粯娆�', '涓�娆℃�т粯娆�'));
-		// }else {
-		// 	options.add(new SelectOption('涓�娆℃�т粯娆�', '涓�娆℃�т粯娆�'));
-		// 	options.add(new SelectOption('澶氭浠樻', '澶氭浠樻'));
-		// }
-		//URF闄愭鍚堝悓2鏈� LY 20220811 end
 		return options;
 	}
 
@@ -446,12 +441,14 @@
 				if (PageMCEElement.Engineer_Name__c == null || ''.equals(PageMCEElement.Engineer_Name__c)) {
 					requiredInput += '宸ョ▼甯堝鍚�';
 				}
-				if (PageMCEElement.Phone_Number__c == null || ''.equals(PageMCEElement.Phone_Number__c)) {
-					if (!''.equals(requiredInput)) {
-						requiredInput += '銆�';
-					}
-					requiredInput += '鎵嬫満鍙风爜';
-				}
+				//URF闄愭鍚堝悓2鏈� LY 20220920 start
+				// if (PageMCEElement.Phone_Number__c == null || ''.equals(PageMCEElement.Phone_Number__c)) {
+				// 	if (!''.equals(requiredInput)) {
+				// 		requiredInput += '銆�';
+				// 	}
+				// 	requiredInput += '鎵嬫満鍙风爜';
+				// }
+				//URF闄愭鍚堝悓2鏈� LY 20220920 end
 				if (PageMCEElement.Small_Repair_Time__c == null || ''.equals(PageMCEElement.Small_Repair_Time__c)) {
 					if (!''.equals(requiredInput)) {
 						requiredInput += '銆�';

--
Gitblit v1.9.1