From 9fea9c7f6c14fe5500c70c63b4da3336631bc1d4 Mon Sep 17 00:00:00 2001 From: 涂煌豪 <tuhuanghao@prec-tech.com> Date: 星期六, 02 四月 2022 17:07:13 +0800 Subject: [PATCH] 产品咨询单提醒上线 --- force-app/main/default/pages/taskAlert.page | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/force-app/main/default/pages/taskAlert.page b/force-app/main/default/pages/taskAlert.page index da90dd0..c358d3b 100644 --- a/force-app/main/default/pages/taskAlert.page +++ b/force-app/main/default/pages/taskAlert.page @@ -12,7 +12,6 @@ var myAllTaskNumber = '{!myTaskNumber}'; var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}'; var feedbackNumber = '{!feedbackNumber}'; // 2021-11-4 yjk 寰呭弽棣堜换鍔� - if(myAllTaskNumber > 0 ){ str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝' ; } @@ -102,7 +101,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) , 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" > <!--2021-09-26 wangweipeng start --> <!--鏈帴鍙椾换鍔�--> @@ -170,7 +169,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 ,'true','false') }" style="font-weight: bold;font-family: \'Microsoft YaHei\';" > <h3> 鎮ㄦ病鏈夋湭鎺ュ彈鐨勪换鍔★紝闇�瑕佽繘鍏ヤ换鍔$鐞嗚〃璇风偣 <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">杩欓噷</a> @@ -194,19 +193,20 @@ <!-- 2021-11-09 mzy SWAG-C8KCZZ end --> <!--2021-11-15 mzy 鏈浆鍖栬浠�-椤甸潰鎻愰啋 end --> - <!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start + <!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start --> <apex:outputPanel id="LeadIntention" rendered="{!isShowInquiry}" 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;"> <br/> <div style='height:5px;'/> <h3> <apex:outputText value ="{!if(InquiryNumber > 0,'寰呰窡杩涚殑鍜ㄨ鍗�','')}"/> - <a href="javascript:return null;" onclick="window.open('/apex/LeadIntention','_blank')"><font size="4" color="red">({!InquiryNumber}涓�)</font></a> + <a href="javascript:return null;" onclick="window.open('{!$Label.WaitFollowInquiryForm}','_blank')"><font size="4" color="red">({!InquiryNumber}涓�)</font></a> </h3> </apex:outputPanel> </apex:outputPanel> - 2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end --> + <!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end --> <!--2021-11-15 mzy 浠诲姟绠$悊鏀瑰杽 end--> </apex:page> \ No newline at end of file -- Gitblit v1.9.1