From a25138b23fdaa05197fb25fdbb3202f122235611 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期四, 28 四月 2022 16:22:34 +0800
Subject: [PATCH] 【委托】【优先】询问单相关修改

---
 force-app/main/default/pages/taskAlert.page |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/pages/taskAlert.page b/force-app/main/default/pages/taskAlert.page
index c358d3b..e457ac7 100644
--- a/force-app/main/default/pages/taskAlert.page
+++ b/force-app/main/default/pages/taskAlert.page
@@ -12,6 +12,8 @@
 			var myAllTaskNumber = '{!myTaskNumber}';
 			var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
 			var feedbackNumber = '{!feedbackNumber}'; // 2021-11-4 yjk 寰呭弽棣堜换鍔�
+			var isShowTask  = '{!isShowTask}'; // 2022-3-17 yjk 鏍规嵁绠�妗ｆ樉绀轰换鍔℃彁閱�
+			var proId = '{!proId}';
 			if(myAllTaskNumber > 0 ){
 				str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝'  ;
 			}
@@ -101,7 +103,7 @@
 	</apex:outputPanel>
 	<!--2021-05-19 鎷涙姇鏍囬」鐩�- 椤甸潰鎻愰啋 mzy  end-->    
 	<!--2021-05-19 浠诲姟- 椤甸潰鎻愰啋 mzy  start-->
-	<apex:outputPanel id="alertPanel" rendered ="{!if( (subTaskNumber > 0 || myTaskNumber > 0 || UnfinishedTaskNumber > 0 || feedbackNumber > 0 || OverFeedbackNumber > 0) ,
+	<apex:outputPanel id="alertPanel" rendered ="{!if( (subTaskNumber > 0 || myTaskNumber > 0 || UnfinishedTaskNumber > 0 || feedbackNumber > 0 || OverFeedbackNumber > 0) && isShowTask,
 		'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >
 		<!--2021-09-26         wangweipeng                  start -->			
 		<!--鏈帴鍙椾换鍔�-->  
@@ -169,7 +171,7 @@
 		<!--宸插畬鎴愬弽棣堜换鍔�   mzy  2021-11-17 end-->  
 	</apex:outputPanel>
 
-	<apex:outputPanel id="alertPanel3" rendered="{!if( subTaskNumber == 0 && myTaskNumber == 0 && UnfinishedTaskNumber == 0 ,'true','false')  }" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
+	<apex:outputPanel id="alertPanel3" rendered="{!if( subTaskNumber == 0 && myTaskNumber == 0 && UnfinishedTaskNumber == 0 && isShowTask,	'true','false')  }" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
 		<h3>
 		鎮ㄦ病鏈夋湭鎺ュ彈鐨勪换鍔★紝闇�瑕佽繘鍏ヤ换鍔＄鐞嗚〃璇风偣
 		<a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a>
@@ -181,7 +183,6 @@
 	<apex:outputPanel id="OppWithoutConform" rendered="{!isTwoSOne}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >		
 		<!--鏈浆鍖栬浠�--> 
 		<apex:outputPanel rendered = "{!if( OppWithoutConformNumber > 0, 'true','false')}" style="font-family:\'\5FAE\8F6F\96C5\9ED1\'; font-weight: bold;"> 
-			<br/> 
 			<div style='height:5px;'/>
 			<h3> 
 			&nbsp;&nbsp;
@@ -194,18 +195,28 @@
 	<!--2021-11-15  mzy  鏈浆鍖栬浠�-椤甸潰鎻愰啋  end -->
 
 	<!--2021-11-23  mzy  鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼  start -->
-	<apex:outputPanel id="LeadIntention" rendered="{!isShowInquiry}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >		
+	<apex:outputPanel id="LeadIntention" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >		
 		<!-- 寰呰窡杩涚殑鍜ㄨ鍗�  -->
-		{!InquiryNumber}
-		<apex:outputPanel rendered = "{!if( InquiryNumber > 0, 'true','false')}" style="font-family:\'\5FAE\8F6F\96C5\9ED1\'; font-weight: bold;"> 
+		<apex:outputPanel rendered = "{!if(InquiryNumber != null && InquiryNumber > 0, 'true','false')}" style="font-family:\'\5FAE\8F6F\96C5\9ED1\'; font-weight: bold;"> 
 			<br/> 
 			<div style='height:5px;'/>
 			<h3> 
 			&nbsp;&nbsp;
-			<apex:outputText value ="{!if(InquiryNumber > 0,'寰呰窡杩涚殑鍜ㄨ鍗�','')}"/>
+			<apex:outputText value ="{!if(InquiryNumber != null && InquiryNumber > 0,'寰呰窡杩涚殑鍜ㄨ鍗�','')}"/>
 			<a  href="javascript:return null;" onclick="window.open('{!$Label.WaitFollowInquiryForm}','_blank')"><font size="4" color="red">({!InquiryNumber}涓�)</font></a>
 			</h3>
 		</apex:outputPanel>
+		<!--2022-4-19  yjk  SWAG-CBUB2W 棣栭〉淇敼  start -->
+		<apex:outputPanel rendered = "{!if(InquiryNumberFSE != null && InquiryNumberFSE > 0, 'true','false')}" style="font-family:\'\5FAE\8F6F\96C5\9ED1\'; font-weight: bold;"> 
+			<br/> 
+			<div style='height:5px;'/>
+			<h3> 
+			&nbsp;&nbsp;
+			<apex:outputText value ="{!if(InquiryNumberFSE != null && InquiryNumberFSE > 0,'FSE寰呰窡杩涚殑鍜ㄨ鍗�','')}"/>
+			<a  href="javascript:return null;" onclick="window.open('{!$Label.FSEWaitFollowInquiryForm}','_blank')"><font size="4" color="red">({!InquiryNumberFSE}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>
+		<!--2022-4-19  yjk  SWAG-CBUB2W 棣栭〉淇敼  end -->
 	</apex:outputPanel>
 	<!--2021-11-23  mzy  鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼  end -->
 	<!--2021-11-15  mzy  浠诲姟绠＄悊鏀瑰杽  end-->

--
Gitblit v1.9.1