From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份

---
 force-app/main/default/pages/taskAlert.page |  402 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 219 insertions(+), 183 deletions(-)

diff --git a/force-app/main/default/pages/taskAlert.page b/force-app/main/default/pages/taskAlert.page
index f8fe1da..749cfba 100644
--- a/force-app/main/default/pages/taskAlert.page
+++ b/force-app/main/default/pages/taskAlert.page
@@ -3,68 +3,74 @@
 <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
 <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
 <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
-<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
-    <script type="text/javascript">
-        function init() {
-            var str = '';
-            var subTaskNumber = '{!subTaskNumber}';
-            var myAllTaskNumber = '{!myTaskNumber}';
-            var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
-            var feedbackNumber = '{!feedbackNumber}'; // 2021-11-4 yjk 寰呭弽棣堜换鍔�
-            var isShowTask  = '{!isShowTask}'; // 2022-3-17 yjk 鏍规嵁绠�妗f樉绀轰换鍔℃彁閱�
-            var proId = '{!proId}';
-            if(myAllTaskNumber > 0 ){
-                str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝'  ;
-            }
-            if(subTaskNumber > 0 ){
-                str += '鎮ㄤ笅灞炴湭鎺ュ彈鐨勪换鍔″叡鏈�' + subTaskNumber +'涓紝'  ;
-            }
-            if(UnfinishedTaskNumber > 0){
-                str += '鎮ㄦ湭瀹屾垚鐨勪换鍔″叡鏈�' + UnfinishedTaskNumber + '涓�';
-            }
+<apex:includeScript value="/soap/ajax/29.0/connection.js"/>
+<apex:includeScript value="/soap/ajax/29.0/apex.js"/>
+	<script type="text/javascript">
+		function init() {
+			// var str = '';
+			// var subTaskNumber = '{!subTaskNumber}';
+			// var myAllTaskNumber = '{!myTaskNumber}';
+			// var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
+			// var feedbackNumber = '{!feedbackNumber}'; // 2021-11-4 yjk 寰呭弽棣堜换鍔�
 
-            console.log('1:'+str);
-            if( str != '' ){
-                console.log('2'+str);
-                str+= '濡傞渶澶勭悊锛岃鐐瑰嚮宸︿晶浠诲姟绠$悊琛ㄩ摼鎺ワ紒';
-                console.log('3'+str);
-                //alert(str);
-            }
-            var myTBCNumber = '{!myTBCNumber}';
-            var myTBRNumber = '{!myTBRNumber}';
-            var myTBBNumber = '{!myTBBNumber}';
-            if(myTBCNumber>0||myTBRNumber>0||myTBBNumber>0){
-                j$(escapeVfId("allPage:alertPanel2")).attr('font-family','Microsoft YaHei');
-                j$(escapeVfId("allPage:alertPanel2")).attr('font-weight','bold');
-            }
-            
-            var subTaskNumber = '{!subTaskNumber}';
-            var myTaskNumber = '{!myTaskNumber}';
-            var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
-            var feedbackNumber = '{!feedbackNumber}';
-            if(subTaskNumber>0||myTaskNumber>0||UnfinishedTaskNumber>0||feedbackNumber>0){
-                j$(escapeVfId("allPage:alertPanel")).attr('font-family','Microsoft YaHei');
-                j$(escapeVfId("allPage:alertPanel")).attr('font-weight','bold');
-            }
+			// if(myAllTaskNumber > 0 ){
+			// 	str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝'  ;
+			// }
+			// if(subTaskNumber > 0 ){
+			// 	str += '鎮ㄤ笅灞炴湭鎺ュ彈鐨勪换鍔″叡鏈�' + subTaskNumber +'涓紝'  ;
+			// }
+			// if(UnfinishedTaskNumber > 0){
+			// 	str += '鎮ㄦ湭瀹屾垚鐨勪换鍔″叡鏈�' + UnfinishedTaskNumber + '涓�';
+			// }
 
-            if(subTaskNumber==0 && myTaskNumber==0 && UnfinishedTaskNumber==0 && feedbackNumber==0){
-                j$(escapeVfId( "allPage:alertPanel3")).attr('font-family','Microsoft YaHei');
-                j$(escapeVfId( "allPage:alertPanel3")).attr('font-weight','bold');
-            }
+			// console.log('1:'+str);
+			// if( str != '' ){
+			// 	console.log('2'+str);
+			// 	str+= '濡傞渶澶勭悊锛岃鐐瑰嚮宸︿晶浠诲姟绠$悊琛ㄩ摼鎺ワ紒';
+			// 	console.log('3'+str);
+			// 	//alert(str);
+			// }
+			var myTBCNumber = '{!myTBCNumber}';
+			var myTBRNumber = '{!myTBRNumber}';
+			var myTBBNumber = '{!myTBBNumber}';
+			if(myTBCNumber>0||myTBRNumber>0||myTBBNumber>0){
+				j$(escapeVfId("allPage:alertPanel2")).attr('font-family','Microsoft YaHei');
+				j$(escapeVfId("allPage:alertPanel2")).attr('font-weight','bold');
+			}
+			
+			var subTaskNumber = '{!subTaskNumber}';
+			var myTaskNumber = '{!myTaskNumber}';
+			var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
+			var opportunityTasksNumber = '{!opportunityTasksNumber}';
+			var opplostTasksNumber = '{!opplostTasksNumber}';
+			var feedbackNumber = '{!feedbackNumber}';
+			if(opportunityTasksNumber>0 || opplostTasksNumber>0){
+				j$(escapeVfId("allPage:alertPanel4")).attr('font-family','Microsoft YaHei');
+				j$(escapeVfId("allPage:alertPanel4")).attr('font-weight','bold');
+			}
 
-            var isTwoSOne = '{!isTwoSOne}';
-            var OppWithoutConformNumber = '{!OppWithoutConformNumber}';
-            if(isTwoSOne==true&&OppWithoutConformNumber>0){
-                j$(escapeVfId( "allPage:OppWithoutConform")).attr('font-family','Microsoft YaHei');
-                j$(escapeVfId( "allPage:OppWithoutConform")).attr('font-weight','bold');
-            }
+			if(subTaskNumber>0||myTaskNumber>0||UnfinishedTaskNumber>0||feedbackNumber>0||opportunityTasksNumber>0){
+				j$(escapeVfId("allPage:alertPanel")).attr('font-family','Microsoft YaHei');
+				j$(escapeVfId("allPage:alertPanel")).attr('font-weight','bold');
+			}
+
+			if(subTaskNumber==0 && myTaskNumber==0 && UnfinishedTaskNumber==0 && feedbackNumber==0 && opportunityTasksNumber==0){
+			 	j$(escapeVfId( "allPage:alertPanel3")).attr('font-family','Microsoft YaHei');
+			 	j$(escapeVfId( "allPage:alertPanel3")).attr('font-weight','bold');
+			}
+
+			var isTwoSOne = '{!isTwoSOne}';
+			var OppWithoutConformNumber = '{!OppWithoutConformNumber}';
+			if(isTwoSOne==true&&OppWithoutConformNumber>0){
+			 	j$(escapeVfId( "allPage:OppWithoutConform")).attr('font-family','Microsoft YaHei');
+			 	j$(escapeVfId( "allPage:OppWithoutConform")).attr('font-weight','bold');
+			}
 
 
-        }
-    </script>
-    <body onload="init()"/>
-
+		}
+	</script>
+	<body onload="init()"/>
+    
     <!-- 2022-5-13 yjk 鍔╃悊寰呰窡杩涘挩璇㈠崟 start-->
     <apex:outputPanel id="InquiryNumberZhuliform" rendered="{!if( InquiryNumberZhuli > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >        
         <!--鏈浆鍖栬浠�--> 
@@ -79,6 +85,7 @@
 
     <!-- 2022-5-13 yjk 鍔╃悊寰呰窡杩涘挩璇㈠崟 end -->
 
+	
     <!--2021-11-23  mzy  鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼  start -->
     <apex:outputPanel id="LeadIntention" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >        
         <!-- 寰呰窡杩涚殑鍜ㄨ鍗�  -->
@@ -100,135 +107,164 @@
         <!--2022-4-19  yjk  SWAG-CBUB2W 棣栭〉淇敼  end -->
     </apex:outputPanel>
     <!--2021-11-23  mzy  鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼  end -->
+	
+	<!--2021-11-15  mzy  鏈浆鍖栬浠�-椤甸潰鎻愰啋  satrt -->
+	<!-- 2021-11-09  mzy  SWAG-C8KCZZ  start-->
+	<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;
+			<apex:outputText value ="{!if(OppWithoutConformNumber > 0,'鏈浆鍖栬浠�','')}"/>
+			<a  href="javascript:return null;" onclick="window.open('{!$Label.OppWithoutConform}','_blank')"><font size="4" color="red">({!OppWithoutConformNumber}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>
+	</apex:outputPanel>
+	<!-- 2021-11-09  mzy  SWAG-C8KCZZ  end-->
+	<!--2021-11-15  mzy  鏈浆鍖栬浠�-椤甸潰鎻愰啋  end -->
+	
+	<!--2021-11-15  mzy  浠诲姟绠$悊鏀瑰杽  start-->
+	<!--2021-05-19 鎷涙姇鏍囬」鐩�- 椤甸潰鎻愰啋 mzy  start--> 
+	<apex:outputPanel id="alertPanel2" rendered ="{!if(  myTBCNumber > 0 || myTBRNumber > 0 || myTBBNumber > 0,
+		'true','false')}" >
+		<!--寰呯‘璁ょ殑鎷涙姇鏍囬」鐩�-->  
+		<apex:outputPanel rendered = "{!if( myTBCNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family:\'Microsoft YaHei\'; "> 
+			<h3> 
+			&nbsp;&nbsp;
+			<!--<apex:outputText value ="{!if(subTaskNumber > 0 || myTaskNumber > 0 , ',' , '')}"/> -->
+			<apex:outputText value ="{!if(myTBCNumber >0,
+			'寰呯‘璁ょ殑鎷涙姇鏍囬」鐩�','')}"/>
+			<a href="javascript:return null;" onclick="window.open('{!$Label.GIORSP_Tender}','_blank')"><font size="4"  color="red" >({!myTBCNumber}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>
+		<!--寰呭叧鑱旇浠风殑鎷涙姇鏍囬」鐩�--> 
+		<apex:outputPanel rendered = "{!if( myTBRNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family:\'Microsoft YaHei\';">
+			<h3>
+			<apex:outputText value ="{!if( myTBCNumber > 0, ',' , '')}"/>
+			&nbsp;&nbsp;
+			<apex:outputText value ="{!if(myTBRNumber >0,
+			'寰呭叧鑱旇浠风殑鎷涙姇鏍囬」鐩�','')}"/>
+			<a href="javascript:return null;" onclick="window.open('{!$Label.InfoOwner_Tender}','_blank')"><font size="4" color="red">({!myTBRNumber}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>
+		<!--寰呭簲鏍囩殑鎷涙姇鏍囬」鐩�--> 
+		<apex:outputPanel rendered = "{!if( myTBBNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold; font-family:\'Microsoft YaHei\';">
+			<h3>
+			<apex:outputText value ="{!if( myTBRNumber > 0 || myTBCNumber > 0, ',' , '')}"/>
+			&nbsp;&nbsp;	
+			<apex:outputText value ="{!if(myTBBNumber >0,
+			'寰呭簲鏍囩殑鎷涙姇鏍囬」鐩�','')}"/>
+			<a href="javascript:return null;" onclick="window.open('{!$Label.AccountOwner_Tender}','_blank')"><font size="4"  color="red">({!myTBBNumber}涓�)</font></a>		
+			</h3>
+		</apex:outputPanel> 
+		<br/>
+		<div style='height:5px;'/>
+	</apex:outputPanel>
+	<!-- 20220627 sx 璇环浠诲姟寮�鍙� - 鎴愰兘 2. -->
+	<apex:outputPanel id="alertPanel4" rendered ="{!if(  opportunityTasksNumber > 0 || opplostTasksNumber > 0 ,'true','false')}">
+		<apex:outputPanel rendered = "{!if( opportunityTasksNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold; font-family:\'Microsoft YaHei\';">
+			<h3>
+			<apex:outputText value ="{!if( myTBBNumber > 0 , ',' , '')}"/>
+			&nbsp;&nbsp;	
+			<apex:outputText value ="{!if(opportunityTasksNumber >0,
+			'涓爣缁撴灉纭浠诲姟','')}"/>
+			<a href="javascript:return null;" onclick="window.open('{!$Label.MyConfirmationofAwardTask_Tender}','_blank')"><font size="4"  color="red">({!opportunityTasksNumber}涓�)</font></a>		
+			</h3>
+		</apex:outputPanel> 
+		<!-- '{!$Label.AccountOwner_Tender}' -->
 
-     <!--2021-11-15  mzy  鏈浆鍖栬浠�-椤甸潰鎻愰啋  satrt -->
-    <!-- 2021-11-09  mzy  SWAG-C8KCZZ  start-->
-    <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;"> 
-            <h3> 
-            &nbsp;&nbsp;
-            <apex:outputText value ="{!if(OppWithoutConformNumber > 0,'鏈浆鍖栫殑缁忛攢鍟嗚浠�','')}"/>
-            <a  href="javascript:return null;" onclick="window.open('{!$Label.OppWithoutConform}','_blank')"><font size="4" color="red">({!OppWithoutConformNumber}涓�)</font></a>
-            </h3>
-        </apex:outputPanel>
-    </apex:outputPanel>
-    <!-- 2021-11-09  mzy  SWAG-C8KCZZ  end -->
-    <!--2021-11-15  mzy  鏈浆鍖栬浠�-椤甸潰鎻愰啋  end -->
+		<apex:outputPanel rendered = "{!if( opplostTasksNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold; font-family:\'Microsoft YaHei\';">
+			<h3>
+			<!-- <apex:outputText value=","/> -->
+			&nbsp;&nbsp;	
+			<apex:outputText value ="{!if(opplostTasksNumber >0,
+			'澶卞崟浠诲姟','')}"/>
+			<a href="javascript:return null;" onclick="window.open('{!$Label.MyLostTask_Tender}','_blank')"><font size="4"  color="red">({!opplostTasksNumber}涓�)</font></a>		
+			</h3>
+		</apex:outputPanel> 
+		<br/>
+	</apex:outputPanel>
+	<!-- 20220627 sx 璇环浠诲姟寮�鍙� - 鎴愰兘 2. end-->
+	<!--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,
+		'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >
+		<!--2021-09-26         wangweipeng                  start -->			
+		<!--鏈帴鍙椾换鍔�-->  
+		<apex:outputPanel rendered = "{!if( myTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" > 
+			<h3> 
+			&nbsp;&nbsp;
+			<apex:outputText value ="{!if(myTaskNumber > 0,'鏈帴鍙椾换鍔�','')}"/>
+			<a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')"><font size="4" color="red">({!myTaskNumber}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>
+		<!--鏈畬鎴愪换鍔�--> 
+		<apex:outputPanel rendered = "{!if( UnfinishedTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';">
+			<h3>
+			<apex:outputText value ="{!if( myTaskNumber > 0, ',' , '')}"/>
+			&nbsp;&nbsp;
+			<apex:outputText value ="{!if(UnfinishedTaskNumber > 0,'鏈畬鎴愪换鍔�','' )}"/>
+			<!-- paramType 鍙傛暟2浠h〃锛� 02 鎺ュ彈-->
+			<a href="javascript:return null;" onclick="window.open('/apex/taskManage?paramType=2','_blank')"><font size="4" color="red" >({!UnfinishedTaskNumber}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>
+		<!--绱涓嬪睘鏈帴鍙椾换鍔�--> 
+		<apex:outputPanel rendered = "{!if( subTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';">
+			<h3>
+			<apex:outputText value ="{!if( UnfinishedTaskNumber > 0, ',' , if( myTaskNumber > 0, ',' , ''))}"/>
+			&nbsp;&nbsp;	
+			<apex:outputText value ="{!if(subTaskNumber > 0,'绱涓嬪睘鏈帴鍙椾换鍔�','')}"/>
+			<a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')"><font size="4" color="red"  >({!subTaskNumber}涓�)</font></a>	
+			</h3>
+		</apex:outputPanel> 
+		<!-- <h3> -->
+		<!-- <apex:outputText value ="{!if(myTaskNumber > 0,'鏈帴鍙椾换鍔�(' + Text(myTaskNumber) + '涓�)锛�','')}"/> -->
+		<!--201-09-18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� PK statr -->
+		<!-- <apex:outputText value ="{!if(UnfinishedTaskNumber > 0,'鏈畬鎴愪换鍔�('+ Text(UnfinishedTaskNumber) + '涓�)锛�','' )}"/> -->
+		<!--201-09-18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� PK end -->
+		<!-- <apex:outputText value ="{!if(subTaskNumber > 0,'绱涓嬪睘鏈帴鍙椾换鍔★紙' + Text(subTaskNumber) + '涓�)锛�','')}"/> -->
+		<!-- 杩涜澶勭悊璇风偣 -->
+		<!-- <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a> -->
 
-    <!--2021-11-15  mzy  浠诲姟绠$悊鏀瑰杽  start-->
-    <!--2021-05-19 鎷涙姇鏍囬」鐩�- 椤甸潰鎻愰啋 mzy  start--> 
-    <apex:outputPanel id="alertPanel2" rendered ="{!if(  myTBCNumber > 0 || myTBRNumber > 0 || myTBBNumber > 0,
-        'true','false')}" >
-        <!--寰呯‘璁ょ殑鎷涙姇鏍囬」鐩�-->  
-        <apex:outputPanel rendered = "{!if( myTBCNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family:\'Microsoft YaHei\'; "> 
-            <h3> 
-            &nbsp;&nbsp;
-            <!--<apex:outputText value ="{!if(subTaskNumber > 0 || myTaskNumber > 0 , ',' , '')}"/> -->
-            <apex:outputText value ="{!if(myTBCNumber >0,
-            '寰呯‘璁ょ殑鎷涙姇鏍囬」鐩�','')}"/>
-            <a href="javascript:return null;" onclick="window.open('{!$Label.GIORSP_Tender}','_blank')"><font size="4"  color="red" >({!myTBCNumber}涓�)</font></a>
-            </h3>
-        </apex:outputPanel>
-        <!--寰呭叧鑱旇浠风殑鎷涙姇鏍囬」鐩�--> 
-        <apex:outputPanel rendered = "{!if( myTBRNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family:\'Microsoft YaHei\';">
-            <h3>
-            <apex:outputText value ="{!if( myTBCNumber > 0, ',' , '')}"/>
-            &nbsp;&nbsp;
-            <apex:outputText value ="{!if(myTBRNumber >0,
-            '寰呭叧鑱旇浠风殑鎷涙姇鏍囬」鐩�','')}"/>
-            <a href="javascript:return null;" onclick="window.open('{!$Label.InfoOwner_Tender}','_blank')"><font size="4" color="red">({!myTBRNumber}涓�)</font></a>
-            </h3>
-        </apex:outputPanel>
-        <!--寰呭簲鏍囩殑鎷涙姇鏍囬」鐩�--> 
-        <apex:outputPanel rendered = "{!if( myTBBNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold; font-family:\'Microsoft YaHei\';">
-            <h3>
-            <apex:outputText value ="{!if( myTBRNumber > 0 || myTBCNumber > 0, ',' , '')}"/>
-            &nbsp;&nbsp;    
-            <apex:outputText value ="{!if(myTBBNumber >0,
-            '寰呭簲鏍囩殑鎷涙姇鏍囬」鐩�','')}"/>
-            <a href="javascript:return null;" onclick="window.open('{!$Label.AccountOwner_Tender}','_blank')"><font size="4"  color="red">({!myTBBNumber}涓�)</font></a>      
-            </h3>
-        </apex:outputPanel> 
-    </apex:outputPanel>
-    <!--2021-05-19 鎷涙姇鏍囬」鐩�- 椤甸潰鎻愰啋 mzy  end-->    
+		
+		<!-- </h3> -->
+		<!--2021-09-26         wangweipeng                  end -->
+		<apex:outputPanel id="feedbackPanel" rendered ="{!if( feedbackNumber > 0 ,
+			'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
+			<!--2021-09-26         wangweipeng                  start -->			
+			<!--鏈帴鍙椾换鍔�-->  
+			<apex:outputPanel rendered = "{!if( feedbackNumber > 0, 'true','false')}" style="font-weight: bold;font-family:  \'Microsoft YaHei\';" > 
+				<h3> 
+				<apex:outputText value ="{!if( UnfinishedTaskNumber > 0, ',' , if( myTaskNumber > 0, ',' , if(feedbackNumber>0,',','')))}"/>
+				&nbsp;&nbsp;
+				<apex:outputText style="font-family: Microsoft YaHei" value ="{!if(feedbackNumber > 0,'寰呭弽棣堜换鍔�','')}"/>
+				<a href="javascript:return null;" onclick="window.open('/apex/taskFeedback','_blank')"><font size="4" color="red">({!feedbackNumber}涓�)</font></a>
+				</h3>
+			</apex:outputPanel>
+		</apex:outputPanel>
+		<!--宸插畬鎴愬弽棣堜换鍔�   mzy  2021-11-17 start-->  
+		<!--<apex:outputPanel rendered = "{!if( OverFeedbackNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';">
+			<h3>
+			<apex:outputText value ="{!if(myTaskNumber >0 || subTaskNumber > 0 || UnfinishedTaskNumber >0 || feedbackNumber>0 , ',' , '')}"/>
+			&nbsp;-->
+			<!--<apex:outputText value ="{!if(OverFeedbackNumber > 0,'宸插畬鎴愬弽棣堜换鍔�','' )}"/>-->
+			<!--<font size="3.5" color="#015ba7">宸插畬鎴愬弽棣堜换鍔�</font>
+			<a href="javascript:return null;" onclick="window.open('{!$Label.OverFeedbackTask}','_blank')"><font size="4" color="red" >({!OverFeedbackNumber}涓�)</font></a>
+			</h3>
+		</apex:outputPanel>-->
+		<!--宸插畬鎴愬弽棣堜换鍔�   mzy  2021-11-17 end-->  
+	</apex:outputPanel>
 
-    <!--2021-05-19 浠诲姟- 椤甸潰鎻愰啋 mzy  start-->
-    <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 -->           
-        <!--鏈帴鍙椾换鍔�-->  
-        <br/>
-        <apex:outputPanel rendered = "{!if( myTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" > 
-            <h3> 
-            &nbsp;&nbsp;
-            <apex:outputText value ="{!if(myTaskNumber > 0,'鏈帴鍙椾换鍔�','')}"/>
-            <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')"><font size="4" color="red">({!myTaskNumber}涓�)</font></a>
-            </h3>
-        </apex:outputPanel>
-        <!--鏈畬鎴愪换鍔�--> 
-        <apex:outputPanel rendered = "{!if( UnfinishedTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';">
-            <h3>
-            <apex:outputText value ="{!if( myTaskNumber > 0, ',' , '')}"/>
-            &nbsp;&nbsp;
-            <apex:outputText value ="{!if(UnfinishedTaskNumber > 0,'鏈畬鎴愪换鍔�','' )}"/>
-            <!-- paramType 鍙傛暟2浠h〃锛� 02 鎺ュ彈-->
-            <a href="javascript:return null;" onclick="window.open('/apex/taskManage?paramType=2','_blank')"><font size="4" color="red" >({!UnfinishedTaskNumber}涓�)</font></a>
-            </h3>
-        </apex:outputPanel>
-        <!--绱涓嬪睘鏈帴鍙椾换鍔�--> 
-        <apex:outputPanel rendered = "{!if( subTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';">
-            <h3>
-            <apex:outputText value ="{!if( UnfinishedTaskNumber > 0, ',' , if( myTaskNumber > 0, ',' , ''))}"/>
-            &nbsp;&nbsp;    
-            <apex:outputText value ="{!if(subTaskNumber > 0,'绱涓嬪睘鏈帴鍙椾换鍔�','')}"/>
-            <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')"><font size="4" color="red"  >({!subTaskNumber}涓�)</font></a>    
-            </h3>
-        </apex:outputPanel> 
-        <!-- <h3> -->
-        <!-- <apex:outputText value ="{!if(myTaskNumber > 0,'鏈帴鍙椾换鍔�(' + Text(myTaskNumber) + '涓�)锛�','')}"/> -->
-        <!--201-09-18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� PK statr -->
-        <!-- <apex:outputText value ="{!if(UnfinishedTaskNumber > 0,'鏈畬鎴愪换鍔�('+ Text(UnfinishedTaskNumber) + '涓�)锛�','' )}"/> -->
-        <!--201-09-18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� PK end -->
-        <!-- <apex:outputText value ="{!if(subTaskNumber > 0,'绱涓嬪睘鏈帴鍙椾换鍔★紙' + Text(subTaskNumber) + '涓�)锛�','')}"/> -->
-        <!-- 杩涜澶勭悊璇风偣 -->
-        <!-- <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a> -->
+	<apex:outputPanel id="alertPanel3" rendered="{!if( subTaskNumber == 0 && myTaskNumber == 0 && UnfinishedTaskNumber == 0,	'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
+		<h3>
+		鎮ㄦ病鏈夋湭鎺ュ彈鐨勪换鍔★紝闇�瑕佽繘鍏ヤ换鍔$鐞嗚〃璇风偣
+		<a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a>
+		</h3>		 
+		<br/>
+	</apex:outputPanel>  
 
-        
-        <!-- </h3> -->
-        <!--2021-09-26         wangweipeng                  end -->
-        <apex:outputPanel id="feedbackPanel" rendered ="{!if( feedbackNumber > 0 ,
-            'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
-            <!--2021-09-26         wangweipeng                  start -->           
-            <!--鏈帴鍙椾换鍔�-->  
-            <apex:outputPanel rendered = "{!if( feedbackNumber > 0, 'true','false')}" style="font-weight: bold;font-family:  \'Microsoft YaHei\';" > 
-                <h3> 
-                <apex:outputText value ="{!if( UnfinishedTaskNumber > 0, ',' , if( myTaskNumber > 0, ',' , if(feedbackNumber>0,',','')))}"/>
-                &nbsp;&nbsp;
-                <apex:outputText style="font-family: Microsoft YaHei" value ="{!if(feedbackNumber > 0,'寰呭弽棣堜换鍔�','')}"/>
-                <a href="javascript:return null;" onclick="window.open('/apex/taskFeedback','_blank')"><font size="4" color="red">({!feedbackNumber}涓�)</font></a>
-                </h3>
-            </apex:outputPanel>
-        </apex:outputPanel>
-        <!--宸插畬鎴愬弽棣堜换鍔�   mzy  2021-11-17 start-->  
-        <!--<apex:outputPanel rendered = "{!if( OverFeedbackNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';">
-            <h3>
-            <apex:outputText value ="{!if(myTaskNumber >0 || subTaskNumber > 0 || UnfinishedTaskNumber >0 || feedbackNumber>0 , ',' , '')}"/>
-            &nbsp;-->
-            <!--<apex:outputText value ="{!if(OverFeedbackNumber > 0,'宸插畬鎴愬弽棣堜换鍔�','' )}"/>-->
-            <!--<font size="3.5" color="#015ba7">宸插畬鎴愬弽棣堜换鍔�</font>
-            <a href="javascript:return null;" onclick="window.open('{!$Label.OverFeedbackTask}','_blank')"><font size="4" color="red" >({!OverFeedbackNumber}涓�)</font></a>
-            </h3>
-        </apex:outputPanel>-->
-        <!--宸插畬鎴愬弽棣堜换鍔�   mzy  2021-11-17 end-->  
-    </apex:outputPanel>
 
-    <apex:outputPanel id="alertPanel3" rendered="{!if( subTaskNumber == 0 && myTaskNumber == 0 && UnfinishedTaskNumber == 0 && isShowTask,  'true','false')  }" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
-        <br/>
-        <h3>
-        鎮ㄦ病鏈夋湭鎺ュ彈鐨勪换鍔★紝闇�瑕佽繘鍏ヤ换鍔$鐞嗚〃璇风偣
-        <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a>
-        </h3>
-    </apex:outputPanel>
-    <!--2021-11-15  mzy  浠诲姟绠$悊鏀瑰杽  end-->
+	<!--2021-11-15  mzy  浠诲姟绠$悊鏀瑰杽  end-->
 </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1