From 0e43bab9d421948c61ca0f79b763942ba9e724a6 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 30 十一月 2022 16:47:51 +0800
Subject: [PATCH] 有些是集采的有些不是是这些文件
---
force-app/main/default/pages/taskAlert.page | 158 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 110 insertions(+), 48 deletions(-)
diff --git a/force-app/main/default/pages/taskAlert.page b/force-app/main/default/pages/taskAlert.page
index f8fe1da..f642cc1 100644
--- a/force-app/main/default/pages/taskAlert.page
+++ b/force-app/main/default/pages/taskAlert.page
@@ -3,34 +3,33 @@
<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)}"/>
+<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 寰呭弽棣堜换鍔�
- var isShowTask = '{!isShowTask}'; // 2022-3-17 yjk 鏍规嵁绠�妗ｆ樉绀轰换鍔℃彁閱�
- var proId = '{!proId}';
- if(myAllTaskNumber > 0 ){
- str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝' ;
- }
- if(subTaskNumber > 0 ){
- str += '鎮ㄤ笅灞炴湭鎺ュ彈鐨勪换鍔″叡鏈�' + subTaskNumber +'涓紝' ;
- }
- if(UnfinishedTaskNumber > 0){
- str += '鎮ㄦ湭瀹屾垚鐨勪换鍔″叡鏈�' + UnfinishedTaskNumber + '涓�';
- }
+ // 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);
- }
+ // if(myAllTaskNumber > 0 ){
+ // str += '鎮ㄦ湭鎺ュ彈鐨勪换鍔″叡鏈�' + myAllTaskNumber +'涓紝' ;
+ // }
+ // if(subTaskNumber > 0 ){
+ // str += '鎮ㄤ笅灞炴湭鎺ュ彈鐨勪换鍔″叡鏈�' + subTaskNumber +'涓紝' ;
+ // }
+ // if(UnfinishedTaskNumber > 0){
+ // str += '鎮ㄦ湭瀹屾垚鐨勪换鍔″叡鏈�' + UnfinishedTaskNumber + '涓�';
+ // }
+
+ // 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}';
@@ -42,13 +41,22 @@
var subTaskNumber = '{!subTaskNumber}';
var myTaskNumber = '{!myTaskNumber}';
var UnfinishedTaskNumber = '{!UnfinishedTaskNumber}';
+ var opportunityTasksNumber = '{!opportunityTasksNumber}';
+ var opplostTasksNumber = '{!opplostTasksNumber}';
var feedbackNumber = '{!feedbackNumber}';
- if(subTaskNumber>0||myTaskNumber>0||UnfinishedTaskNumber>0||feedbackNumber>0){
+ var subOpportunityTasksNumber = '{!subOpportunityTasksNumber}'锛�
+ var subopplostTasksNumber = '{!subopplostTasksNumber}';
+ if(opportunityTasksNumber>0 || opplostTasksNumber>0){
+ j$(escapeVfId("allPage:alertPanel4")).attr('font-family','Microsoft YaHei');
+ j$(escapeVfId("allPage:alertPanel4")).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){
+ 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');
}
@@ -64,7 +72,7 @@
}
</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 +87,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\';" >
<!-- 寰呰窡杩涚殑鍜ㄨ鍗� -->
@@ -87,21 +96,23 @@
<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>
+ <apex:outputText value ="{!if( InquiryNumber > 0, ',' , '')}"/>
</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;">
<h3>
-
+
<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>
+ <apex:outputText value ="{!if( InquiryNumberFSE > 0, ',' , '')}"/>
</h3>
</apex:outputPanel>
<!--2022-4-19 yjk SWAG-CBUB2W 棣栭〉淇敼 end -->
</apex:outputPanel>
<!--2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end -->
-
- <!--2021-11-15 mzy 鏈浆鍖栬浠�-椤甸潰鎻愰啋 satrt -->
+
+ <!--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\';" >
<!--鏈浆鍖栬浠�-->
@@ -110,12 +121,13 @@
<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>
+ <apex:outputText value ="{!if( OppWithoutConformNumber > 0, ',' , '')}"/>
</h3>
</apex:outputPanel>
</apex:outputPanel>
- <!-- 2021-11-09 mzy SWAG-C8KCZZ end -->
+ <!-- 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,
@@ -124,67 +136,114 @@
<apex:outputPanel rendered = "{!if( myTBCNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family:\'Microsoft YaHei\'; ">
<h3>
- <!--<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>
+ <apex:outputText value ="{!if( myTBCNumber > 0, ',' , '')}"/>
</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, ',' , '')}"/>
<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>
+ <!-- 20221213 ljh SWAG-CK28WT start-->
+ <!-- <a href="javascript:return null;" onclick="window.open('{!$Label.InfoOwner_Tender}','_blank')"><font size="4" color="red">({!myTBRNumber}涓�)</font></a> -->
+ <a href="javascript:return null;" onclick="window.open('{!IF(Is2M4,$Label.InfoOwner_Tender_2M4,$Label.InfoOwner_Tender)}','_blank')"><font size="4" color="red">({!myTBRNumber}涓�)</font></a>
+ <!-- 20221213 ljh SWAG-CK28WT end -->
+ <apex:outputText value ="{!if( myTBRNumber > 0, ',' , '')}"/>
</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, ',' , '')}"/>
<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>
+ <a href="javascript:return null;" onclick="window.open('{!$Label.AccountOwner_Tender}','_blank')"><font size="4" color="red">({!myTBBNumber}涓�)</font></a>
+ <apex:outputText value ="{!if( myTBBNumber > 0, ',' , '')}"/>
</h3>
</apex:outputPanel>
</apex:outputPanel>
- <!--2021-05-19 鎷涙姇鏍囬」鐩�- 椤甸潰鎻愰啋 mzy end-->
+ <!-- 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(opportunityTasksNumber >0,
+ '涓爣缁撴灉纭浠诲姟','')}"/>
+ <a href="javascript:return null;" onclick="window.open('{!$Label.MyConfirmationofAwardTask_Tender}','_blank')"><font size="4" color="red">({!opportunityTasksNumber}涓�)</font></a>
+ <apex:outputText value ="{!if( opportunityTasksNumber > 0, ',' , '')}"/>
+ </h3>
+ </apex:outputPanel>
+ <!-- '{!$Label.AccountOwner_Tender}' -->
+ <apex:outputPanel rendered = "{!if( opplostTasksNumber > 0, 'true','false')}" style="font-size: 1.3em; font-weight: bold; font-family:\'Microsoft YaHei\';">
+ <h3>
+ <!-- <apex:outputText value=","/> -->
+
+ <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>
+ <apex:outputText value ="{!if( opplostTasksNumber > 0, ',' , '')}"/>
+ </h3>
+ </apex:outputPanel>
+ </apex:outputPanel>
+ <br/>
+ <!-- 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) && isShowTask,
+ <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 -->
<!--鏈帴鍙椾换鍔�-->
- <br/>
<apex:outputPanel rendered = "{!if( myTaskNumber > 0, 'true','false')}" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
<h3>
<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>
+ <apex:outputText value ="{!if( myTaskNumber > 0 , ',' , '')}"/>
</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, ',' , '')}"/>
<apex:outputText value ="{!if(UnfinishedTaskNumber > 0,'鏈畬鎴愪换鍔�','' )}"/>
<!-- paramType 鍙傛暟2浠ｈ〃锛� 02 鎺ュ彈-->
<a href="javascript:return null;" onclick="window.open('/apex/taskManage?paramType=2','_blank')"><font size="4" color="red" >({!UnfinishedTaskNumber}涓�)</font></a>
+ <apex:outputText value ="{!if( UnfinishedTaskNumber > 0 , ',' , '')}"/>
</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, ',' , ''))}"/>
<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>
+ <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')"><font size="4" color="red" >({!subTaskNumber}涓�)</font></a>
+ <apex:outputText value ="{!if( subTaskNumber > 0 , ',' , '')}"/>
</h3>
</apex:outputPanel>
+ <!-- 涓嬪睘涓爣缁撴灉纭浠诲姟 -->
+ <apex:outputPanel rendered = "{!if( subOpportunityTasksNumber > 0, 'true','false')}" style="font-weight: bold; font-family:\'Microsoft YaHei\';">
+ <h3>
+
+ <apex:outputText value ="{!if(subOpportunityTasksNumber >0,
+ '绱Н涓嬪睘涓爣缁撴灉纭浠诲姟','')}"/>
+ <a href="javascript:return null;" onclick="window.open('{!$Label.AllConfirmationofAwardTask_Tender}','_blank')"><font size="4" color="red">({!subOpportunityTasksNumber}涓�)</font></a> <apex:outputText value ="{!if( subOpportunityTasksNumber > 0 , ',' , '')}"/>
+ </h3>
+ </apex:outputPanel>
+ <!-- 涓嬪睘澶卞崟鎶ュ憡浠诲姟 -->
+ <apex:outputPanel rendered = "{!if( subopplostTasksNumber > 0, 'true','false')}" style=" font-weight: bold; font-family:\'Microsoft YaHei\';">
+ <h3>
+
+ <apex:outputText value ="{!if(subopplostTasksNumber >0,
+ '绱Н涓嬪睘澶卞崟鎶ュ憡浠诲姟','')}"/>
+ <a href="javascript:return null;" onclick="window.open('{!$Label.AllLostTask_Tender}','_blank')"><font size="4" color="red">({!subopplostTasksNumber}涓�)</font></a>
+ <apex:outputText value ="{!if( subopplostTasksNumber > 0 , ',' , '')}"/>
+ </h3>
+ </apex:outputPanel>
<!-- <h3> -->
<!-- <apex:outputText value ="{!if(myTaskNumber > 0,'鏈帴鍙椾换鍔�(' + Text(myTaskNumber) + '涓�)锛�','')}"/> -->
<!--201-09-18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� PK statr -->
@@ -207,6 +266,7 @@
<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>
+ <apex:outputText value ="{!if( feedbackNumber > 0 , ',' , '')}"/>
</h3>
</apex:outputPanel>
</apex:outputPanel>
@@ -223,12 +283,14 @@
<!--宸插畬鎴愬弽棣堜换鍔� 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/>
+ <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>
- </apex:outputPanel>
+ </h3>
+ <br/>
+ </apex:outputPanel>
+
+
<!--2021-11-15 mzy 浠诲姟绠＄悊鏀瑰杽 end-->
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1