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/NewMCHPDFController.cls |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/NewMCHPDFController.cls b/force-app/main/default/classes/NewMCHPDFController.cls
index 7fe53f1..611e5e4 100644
--- a/force-app/main/default/classes/NewMCHPDFController.cls
+++ b/force-app/main/default/classes/NewMCHPDFController.cls
@@ -205,6 +205,10 @@
         public String TermFive_Nine {get; private set;}
         public String TermFive_Ten {get; private set;}
         public String TermFive_Ten2 {get; private set;}
+        //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 XXF 20221031 start
+        public String TermFive_Eleven1 {get; private set;}
+        public String TermFive_Eleven2 {get; private set;}
+        //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 XXF 20221031 end
         //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start
         public String TermFive_Eleven {get; private set;}
         public String TermFive_Table11 {get; private set;}
@@ -488,7 +492,7 @@
 
                 this.TermZero_One = '鐢层�佷箼鍙屾柟缁忚繃鍏卞悓鍗忓晢锛屽氨鐢叉柟鍏�';
                 this.TermZero_Two = '绉�/瀹ゅ叡';
-                this.TermZero_Three = '浠跺ゥ鏋楀反鏂郴鍒椾骇鍝佸湪鏈悎鍚屾湇鍔″鎵樻湡闄愬唴鐢变箼鏂规彁渚涙湁鍋挎湇鍔★紙鍖呮嫭涔欐柟鍗忓姪鐢叉柟瀵瑰弬淇濊澶囪繘琛岄闃叉晠闅滃伐浣滐紝涓哄弬淇濊澶囨彁渚涚淮淇湇鍔°�佸鍝佹湇鍔°�佸皬淇繚鍏诲拰鍚堝悓鎵ц鎶ュ憡绛夋湇鍔★級鑰岀璁㈡湰鏈嶅姟鍚堝悓锛堜互涓嬬畝绉扳�滄湰鍚堝悓鈥濓級銆�';
+                this.TermZero_Three = '浠跺ゥ鏋楀反鏂郴鍒椾骇鍝佸湪鏈悎鍚屾湇鍔″鎵樻湡闄愬唴鐢变箼鏂规彁渚涙湁鍋挎湇鍔★紙鍖呮嫭涔欐柟鍗忓姪鐢叉柟瀵瑰弬淇濊澶囪繘琛岄闃叉晠闅滃伐浣滐紝涓哄弬淇濊澶囨彁渚涚淮淇湇鍔°�佸鍝佹湇鍔°�佸皬淇繚鍏诲拰鍚堝悓鎵ц鎶ュ憡绛夋湇鍔★級鑰岀璁㈡湰缁翠慨鏈嶅姟鍚堝悓锛堜互涓嬬畝绉扳�滄湰鍚堝悓鈥濓級銆�';
                 this.TermOne_One = '涓�銆�    鏈悎鍚岀殑鍙備繚璁惧娓呭崟鍙傝闄勪欢1锛屼笖蹇呴』鍦ㄦ湇鍔″鎵樻湡寮�濮嬫椂澶勪簬鍋ュ悍瀹屽ソ鐘舵�併�傚鍙備繚鏃舵湁鏁呴殰瀛樺湪锛岄櫎鍙屾柟鏈夊彟琛岀害瀹氬锛屽凡鏈夋晠闅滃簲璇ュ厛杩涜淇悊涓斾笉璁″叆鏈悎鍚岋紝涔嬪悗涔欐柟鎸夋湰鍚堝悓绾﹀畾鎵挎媴鐩稿簲璐d换銆�';
                 this.TermOne_Two = '鎵�鏈夐檮浠舵槸鏈悎鍚屾湁鏁堢粍鎴愰儴鍒嗭紝涓庢湰鍚堝悓鍏锋湁鍚岀瓑娉曞緥鏁堝姏銆�';
             	this.TermTwo_One = '浜屻��	   鏈悎鍚屾湇鍔″鎵樻湡闄愪负';
@@ -536,8 +540,12 @@
             	this.TermFive_Nine = '9銆� 鍦ㄦ湰鍚堝悓鏈嶅姟濮旀墭鏈熷唴锛屼箼鏂圭粨鍚堢敳鏂圭殑瀹為檯鎯呭喌锛屽垽鏂槸鍚﹁鍚戞湰鍚堝悓鍙備繚璁惧鎻愪緵鏁呴殰棰勯槻宸ュ叿銆傚涔欐柟鍒ゆ柇闇�瑕佹椂锛岀敱涔欐柟鐩存帴鍚戠敳鏂规彁渚涖�傚叿浣撴彁渚涙柟寮忓拰鏁伴噺锛屼互涔欐柟鍒ゆ柇涓哄噯銆�';
             	this.TermFive_Ten = '10銆� 涔欐柟鎸囧畾宸ョ▼甯堜负鐢叉柟鎻愪緵1骞�';
             	this.TermFive_Ten2 = '娆$偣妫�锛屽苟鎻愪氦妫�鏌ユ姤鍛婄粰鍖婚櫌澶囨。銆�';
+                //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 XXF 20221031 start
+                this.TermFive_Eleven1 = '11銆佽嫢闄勪欢1銆婂弬淇濊澶囨竻鍗曘�嬩腑鍖呭惈鈥滃唴闀滄竻娲楁秷姣掕缃�濓紙鍨嬪彿锛歄ER-AW銆�';
+                this.TermFive_Eleven2 = 'OER-Smart锛屼互涓嬬畝绉扳�淥ER-AW銆丱ER-Smart鈥濓級鐨勶紝鍦ㄦ湰鍚堝悓鏈熼檺鍐咃紝涔欐柟灏嗗畨鎺掑伐绋嬪笀杩涜姣�6涓湀1娆′笂闂ㄧ淮鎶ゆ娴嬨�備箼鏂规帴鍒扮敳鏂硅澶囧嚭鐜扮淮鎶や繚鍏绘姤璀︽彁绀洪�氱煡鍚庤繘琛岀淮鎶や繚鍏绘湇鍔★紝鏇存崲鐩稿叧缁勪欢銆�';
+                //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 XXF 20221031 end
                 //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start
-                this.TermFive_Eleven = '11銆� 鑻ラ檮浠�1銆婂弬淇濊澶囨竻鍗曘�嬩腑鍖呭惈涓嬭〃涓殑濂ヨ緣绯诲垪浜у搧锛屾湰鏉$8娆俱�佺9娆俱�佸強绗�10娆句笉閫傜敤浜庤濂ヨ緣绯诲垪浜у搧銆�';
+                this.TermFive_Eleven = '12銆� 鑻ラ檮浠�1銆婂弬淇濊澶囨竻鍗曘�嬩腑鍖呭惈涓嬭〃涓殑濂ヨ緣绯诲垪浜у搧锛屾湰鏉$8娆俱�佺9娆俱�佸強绗�10娆句笉閫傜敤浜庤濂ヨ緣绯诲垪浜у搧銆�';
                 this.TermFive_Table11 = '浜у搧鍚嶇О';
                 this.TermFive_Table12 = '鍨嬪彿';
                 this.TermFive_Table21 = '鐢靛瓙缁撹偁闀�';
@@ -551,7 +559,7 @@
                 //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start
 
             	this.TermSix_Title = '鍏��	鐢叉柟璐d换鑼冨洿 ';
-            	this.TermSix_One = '1銆� 鐢叉柟搴旂埍鎶ゆ湰鍚堝悓鍐呮墍鍖呭惈涔嬭澶囷紝搴旀寜鐓т箼鏂硅鏄庝功绉瀬鍋氬ソ鏈悎鍚屽弬淇濊澶囩殑鏃ュ父缁存姢鍜屼繚鍏诲伐浣滐紝纭繚鍐呴暅濮嬬粓澶勪簬鑹ソ鐨勫伐浣滅姸鎬併��';
+            	this.TermSix_One = '1銆� 鐢叉柟搴旂埍鎶ゆ湰鍚堝悓鍐呮墍鍖呭惈涔嬭澶囷紝搴旀寜鐓т箼鏂硅鏄庝功绉瀬鍋氬ソ鏈悎鍚屽弬淇濊澶囩殑鏃ュ父缁存姢鍜屼繚鍏诲伐浣滐紝纭繚鍐呴暅濮嬬粓澶勪簬鑹ソ鐨勫伐浣滅姸鎬併�傚綋璁惧鍑虹幇缁存姢淇濆吇鎶ヨ鎻愮ず鏃讹紝鐢叉柟搴斿強鏃堕�氱煡涔欐柟銆�';
             	this.TermSix_Two = '2銆� 鏃犺鍦ㄤ换浣曟儏鍐典笅锛岀敳鏂瑰潎涓嶅緱灏嗘湰鍚堝悓鍙備繚璁惧閫佽嚦闈炲ゥ鏋楀反鏂巶瀹惰繘琛岀淮淇�傚惁鍒欙紝涔欐柟瀵圭粡杩囬潪濂ユ灄宸存柉鍘傚缁翠慨鐨勮澶囪繘琛岀淮淇椂锛屽皢鎸夋甯告爣鍑嗗悜鐢叉柟鏀跺彇缁翠慨璐圭敤锛岃�屼笉瑙嗕负鏈悎鍚岃垂鐢ㄣ��';
             	this.TermSix_Three = '3銆� 鏃犺鍦ㄤ换浣曟儏鍐典笅锛岀敳鏂瑰潎涓嶅緱鑷鎷嗗嵏鏈悎鍚屽弬淇濊澶囥�傚惁鍒欙紝涔欐柟瀵圭敳鏂硅嚜琛屾媶鍗哥殑璁惧杩涜缁翠慨鏃讹紝灏嗘寜姝e父鏍囧噯鍚戠敳鏂规敹鍙栫淮淇垂鐢紝鑰屼笉瑙嗕负鏈悎鍚岃垂鐢ㄣ��';
             	this.TermSix_Four = '4銆� 鐢叉柟涓嶅彲浠ュ皢鏈悎鍚屽弬淇濊澶囧�熺粰鍏朵粬鍖婚櫌鎴栨満鏋勪娇鐢紝鑻ョ敱姝ら�犳垚鐨勬晠闅滐紝涔欐柟灏嗗悜鐢叉柟鏀跺彇姝e父鐨勭淮淇垂锛岃�屼笉瑙嗕负鏈悎鍚岃垂鐢ㄣ��';

--
Gitblit v1.9.1