From ee915c5009a0ecff56488487039d32b3643f8456 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 30 十一月 2022 16:50:28 +0800
Subject: [PATCH] Merge branch '集采'
---
force-app/main/default/classes/taskAlertController.cls | 230 +++++++++++++++++--------
force-app/main/default/classes/TenderInformationHandlerTest.cls | 80 +++++---
force-app/main/default/classes/TenderManageControllerTest.cls | 34 ++-
force-app/main/default/classes/TenderManageController.cls | 18 +
force-app/main/default/pages/taskAlert.page | 158 ++++++++++++-----
5 files changed, 346 insertions(+), 174 deletions(-)
diff --git a/force-app/main/default/classes/TenderInformationHandlerTest.cls b/force-app/main/default/classes/TenderInformationHandlerTest.cls
index 51aff5c..754c58c 100644
--- a/force-app/main/default/classes/TenderInformationHandlerTest.cls
+++ b/force-app/main/default/classes/TenderInformationHandlerTest.cls
@@ -6,6 +6,8 @@
StaticParameter.EscapeOtherUpdateTenOwner = false;
Profile p = [select id from Profile where id = :System.Label.ProfileId_SystemAdmin];
String loginId = UserInfo.getUserId();
+ User thisUser= [select Id from User where Id=:UserInfo.getUserId()];
+System.runAs (thisUser){
User sys = [select id from User where Id = :loginId];
StaticParameter.EscapeNFM001AgencyContractTrigger = true;
User u1 = new User(Test_staff__c = true);
@@ -24,6 +26,7 @@
u1.ProfileId = p.id;
u1.Job_Category__c = '閿�鍞湇鍔�';
u1.Province__c = '鏉变含';
+ u1.Employee_No__c = '0001';//20220426 ljh add
insert u1;
StaticParameter.EscapeNFM001AgencyContractTrigger = true;
User u2 = new User(Test_staff__c = true);
@@ -43,6 +46,7 @@
u2.Job_Category__c = '閿�鍞帹骞�';
u2.Province__c = '鏉变含';
u2.IsActive = true;
+ u2.Employee_No__c = '0002';//20220426 ljh add
insert u2;
StaticParameter.EscapeNFM001AgencyContractTrigger = true;
User u3 = new User(Test_staff__c = true);
@@ -62,6 +66,7 @@
u3.Job_Category__c = '閿�鍞帹骞�';
u3.Province__c = '鏉变含';
u3.IsActive = true;
+ u3.Employee_No__c = '0003';//20220426 ljh add
insert u3;
StaticParameter.EscapeNFM001AgencyContractTrigger = true;
User u4 = new User(Test_staff__c = true);
@@ -81,35 +86,37 @@
u4.Job_Category__c = '閿�鍞帹骞�';
u4.Province__c = '鏉变含';
u4.IsActive = true;
+ u4.Employee_No__c = '0004';//20220426 ljh add
insert u4;
StaticParameter.EscapeNFM001AgencyContractTrigger = true;
- User u5 = new User(Test_staff__c = true);
- u5.LastName = 'test00001';
- u5.FirstName = 'qbcuy';
- u5.Batch_User__c = true;
- u5.Alias = '12cs';
- u5.Email = 'olympusT221cd04@sunbridge.com';
- u5.Username = 'olymp11est3221@sunbridge.com';
- u5.CommunityNickname = 'fewfa';
- u5.IsActive = true;
- u5.EmailEncodingKey = 'ISO-2022-JP';
- u5.TimeZoneSidKey = 'Asia/Tokyo';
- u5.LocaleSidKey = 'ja_JP';
- u5.LanguageLocaleKey = 'ja';
- u5.ProfileId = p.id;
- u5.Job_Category__c = '閿�鍞帹骞�';
- u5.Province__c = '鏉变含';
- u5.IsActive = true;
- insert u5;
+ // User u5 = new User(Test_staff__c = true);
+ // u5.LastName = 'test00001';
+ // u5.FirstName = 'qbcuy';
+ // u5.Batch_User__c = true;
+ // u5.Alias = '12cs';
+ // u5.Email = 'olympusT221cd04@sunbridge.com';
+ // u5.Username = 'olymp11est3221@sunbridge.com';
+ // u5.CommunityNickname = 'fewfa';
+ // u5.IsActive = true;
+ // u5.EmailEncodingKey = 'ISO-2022-JP';
+ // u5.TimeZoneSidKey = 'Asia/Tokyo';
+ // u5.LocaleSidKey = 'ja_JP';
+ // u5.LanguageLocaleKey = 'ja';
+ // u5.ProfileId = p.id;
+ // u5.Job_Category__c = '閿�鍞帹骞�';
+ // u5.Province__c = '鏉变含';
+ // u5.IsActive = true;
+ // u5.Employee_No__c = '0005'; //20220426 ljh add
+ // insert u5;
// StaticParameter.EscapeOpportunityBefUpdTrigger = true;
- // OCM_Management_Province__c mp1 = new OCM_Management_Province__c();
- // mp1.Name = '鍖椾含';
- // mp1.GI_assistant__c = u1.Id;
- // mp1.SP_assistant__c = u2.Id;
- // mp1.Window2__c = u3.Id;
- // mp1.Admin_assistant3__c = u4.Id;
- // insert mp1;
+ OCM_Management_Province__c mp1 = new OCM_Management_Province__c();
+ mp1.Name = '鍖椾含';
+ mp1.GI_assistant__c = u1.Id;
+ mp1.SP_assistant__c = u2.Id;
+ mp1.Window2__c = u3.Id;
+ mp1.Admin_assistant3__c = u4.Id;
+ insert mp1;
// RecordType rt1 = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
// Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('HP').getRecordTypeId();
// RecordType rt2 = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
@@ -186,6 +193,7 @@
System.runAs(u1) {
info.OwnerId = u1.Id;
info.Name = 'TEST001';
+ info.InfoTitle__c = 'TEST001';
info.AreaProvince__c = '鍖椾含';
info.Hospital__c = hospital.Id;
info.IsBid__c = '鍚�';
@@ -197,17 +205,20 @@
info.YingyeWindow__c = u2.Id;
info.SP_assistant__c = u2.Id;
info.GI_assistant__c = u2.Id;
+ info.ResultDate__c=Date.today();
+ info.subInfoType__c='1-1锛氭剰瑙佸緛闆�';
info.department_selection__c = '01210000000QemLAAS';
if(!NFMUtil.isSandbox()){
info.RecordTypeId = '01210000000VLZ8';
} else {
- info.RecordTypeId = '0121m000000bKzA';
+ info.RecordTypeId = '01210000000VLZ8';
}
insert info;
info2.OwnerId = u1.Id;
info2.Name = 'TEST002';
+ info2.InfoTitle__c = 'TEST002';
info2.AreaProvince__c = '鍖椾含';
info2.Hospital__c = hospital.Id;
info2.IsBid__c = '鍚�';
@@ -219,7 +230,9 @@
info2.YingyeWindow__c = u2.Id;
info2.SP_assistant__c = u2.Id;
info2.GI_assistant__c = u2.Id;
- insert info2;
+ info2.ResultDate__c=Date.today();
+ info2.subInfoType__c='1-1锛氭剰瑙佸緛闆�';
+ // insert info2;
Tender_Opportunity_Link__c BlinksList = new Tender_Opportunity_Link__c();
BlinksList.Opportunity__c = opp.Id;
@@ -228,12 +241,12 @@
BlinksList.IsRelated__c = false;
insert BlinksList;
- Tender_Opportunity_Link__c BlinksList2 = new Tender_Opportunity_Link__c();
- BlinksList2.Opportunity__c = opp.Id;
- BlinksList2.CurrencyIsoCode = 'CNY';
- BlinksList2.Tender_information__c = info2.Id;
- BlinksList2.IsRelated__c = false;
- insert BlinksList2;
+ // Tender_Opportunity_Link__c BlinksList2 = new Tender_Opportunity_Link__c();
+ // BlinksList2.Opportunity__c = opp.Id;
+ // BlinksList2.CurrencyIsoCode = 'CNY';
+ // // BlinksList2.Tender_information__c = info2.Id;
+ // BlinksList2.IsRelated__c = false;
+ // insert BlinksList2;
List<Tender_information__c> clist = [select id, department_category__c from Tender_information__c ];
info.InfoType__c = '2锛氬叕鍛�';
@@ -243,4 +256,5 @@
Test.stopTest();
}
+}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/TenderManageController.cls b/force-app/main/default/classes/TenderManageController.cls
index e70251f..674d8a8 100644
--- a/force-app/main/default/classes/TenderManageController.cls
+++ b/force-app/main/default/classes/TenderManageController.cls
@@ -52,12 +52,24 @@
String query = 'SELECT id,status__c,NotBidApprovalStatus__c,ViewWaitConfirm__c,ViewRelatedOpp__c,ViewBidConfirm__c ';
query += 'FROM Tender_information__c ';
//寰呯‘璁�
- query += 'WHERE ( status__c = \'01.寰呯‘璁' AND ViewWaitConfirm__c = true ) ';
+ // 20221013 ljh SWAG-CK28WT update start
+ // query += 'WHERE ( status__c = \'01.寰呯‘璁' AND ViewWaitConfirm__c = true ) ';
+ query += 'WHERE (( status__c = \'01.寰呯‘璁' AND ViewWaitConfirm__c = true ) ';
//寰呭叧鑱旇浠�
query += 'OR ( status__c =\'04.寰呭叧鑱旇浠穃' AND ViewRelatedOpp__c = true ) ';
//寰呭簲鏍� zys 20210709 搴旀爣纭 鍙樹负 寰呭簲鏍囩‘璁�
- query += 'OR ( status__c = \'03.鏄惁搴旀爣\' AND NotBidApprovalStatus__c != \'鐢宠涓璡' AND ViewBidConfirm__c = true) ';
-
+ // query += 'OR ( status__c = \'03.鏄惁搴旀爣\' AND NotBidApprovalStatus__c != \'鐢宠涓璡' ) ';
+ query += 'OR ( status__c = \'03.鏄惁搴旀爣\' AND NotBidApprovalStatus__c != \'鐢宠涓璡' )) ';
+ // 20221013 ljh SWAG-CK28WT update end
+
+ // 20221013 ljh SWAG-CK28WT add start
+ String proId = UserInfo.getProfileId();
+ String p_2M4 = System.Label.ProfileId_2M4;
+ if(proId.substring(0,15) == p_2M4.substring(0,15)){
+ query += ' AND OwnerId =\''+UserInfo.getUserId()+'\'';
+ }
+ System.debug('query:'+query);
+ // 20221013 ljh SWAG-CK28WT add end
AllTender = Database.query(query);
return AllTender;
diff --git a/force-app/main/default/classes/TenderManageControllerTest.cls b/force-app/main/default/classes/TenderManageControllerTest.cls
index 6e8ce4e..6ed7a1a 100644
--- a/force-app/main/default/classes/TenderManageControllerTest.cls
+++ b/force-app/main/default/classes/TenderManageControllerTest.cls
@@ -31,6 +31,10 @@
User loginUser = new User();
+
+ Profile p = [select Id from Profile where id = :System.Label.ProfileId_2S6];
+ /*
+ // 20221013 ljh SWAG-CK28WT 娉ㄩ噴
Profile p = [select Id from Profile where Name = '2S6_閿�鍞湰閮ㄧ獥鍙�&钀ヤ笟鍔╃悊'];
loginUser.ProfileId = p.Id;
loginUser.FirstName = '銉︺兗銈躲兗';
@@ -43,10 +47,9 @@
loginUser.Username = 'test_user@example.com' + System.now().millisecond();
loginUser.Alias = '銉嗐儲';
loginUser.CommunityNickname = 'tu1' + System.now().millisecond();
-
-
- insert loginUser;
- System.runAs(loginUser){
+ insert loginUser;*/
+ loginUser = [select id from user where IsActive = true and ProfileId =:p.Id limit 1];
+ // System.runAs(loginUser){ // 20221013 ljh SWAG-CK28WT 娉ㄩ噴
//寰呯‘璁ゆ嫑鎶曟爣椤圭洰 : GI鍔╃悊/SP鍔╃悊 and 01.寰呯‘璁�
@@ -55,6 +58,9 @@
info.OpportunityStatus__c = '';
info.IsBid__c = null;
info.IsRelateProject__c = null;
+ // 20221013 ljh SWAG-CK28WT start
+ info.subInfoType__c='1-1锛氭剰瑙佸緛闆�';
+ info.ownerId = loginUser.Id;
insert info;
info.GI_assistant__c = String.valueOf(loginUser.Id).subString(0,15);
@@ -64,9 +70,9 @@
//System.assertEquals('00510000005sEEMAA2',info.GI_assistant__c); //18 00510000005sEEMAA2
//System.assertEquals(null,loginUser.Id); //18 00510000005sEEMAA2
- //System.assertEquals(true,info.Is_GIORSP__c);
- //System.assertEquals('01.寰呯‘璁�',info.status__c);
- //System.assertEquals(true,info.Is_GIORSP__c);
+ // System.assertEquals(true,info.Is_GIORSP__c);
+ System.assertEquals('01.寰呯‘璁�',info.status__c);
+ // System.assertEquals(true,info.Is_GIORSP__c);
//寰呭叧鑱旇浠风殑鎷涙姇鏍囬」鐩� : GI鍔╃悊/SP鍔╃悊 and 04.纭搴旀爣
@@ -74,7 +80,9 @@
info2.Name = 'TEST002';
info2.OpportunityStatus__c = '';
info2.IsBid__c = '鏄�';
- info2.OpportunityNum__c = 0;
+ info2.OpportunityNum__c = 0;
+ // 20221013 ljh SWAG-CK28WT start
+ info2.subInfoType__c='1-1锛氭剰瑙佸緛闆�';
insert info2;
info2.SP_assistant__c = String.valueOf(loginUser.Id).subString(0,15);
@@ -82,12 +90,10 @@
info2 = [select status__c,Is_GIORSP__c from Tender_information__c where id = :info2.Id];
- //System.assertEquals(true,info2.Is_GIORSP__c);
- //System.assertEquals('04.纭搴旀爣',info2.status__c);
-
- TenderManageController.getCurrentTenderInformation();
-
-
+ // System.assertEquals(true,info2.Is_GIORSP__c);
+ // System.assertEquals('04.纭搴旀爣',info2.status__c);
+ System.runAs(loginUser){ // 20221013 ljh SWAG-CK28WT add
+ TenderManageController.getCurrentTenderInformation();
}
diff --git a/force-app/main/default/classes/taskAlertController.cls b/force-app/main/default/classes/taskAlertController.cls
index 0ffa512..6f728b0 100644
--- a/force-app/main/default/classes/taskAlertController.cls
+++ b/force-app/main/default/classes/taskAlertController.cls
@@ -1,48 +1,108 @@
public with sharing class taskAlertController {
- public Integer myTaskNumber { get; set; }
- public Integer myAllTaskNumber { get; set; }
- public Integer subTaskNumber { get; set; }
- public Integer UnfinishedTaskNumber { get; set; }
- //2021-05-19 鎷涙姇鏍囬」鐩�--椤甸潰鎻愰啋 mzy start
- public Integer myTBCNumber { get; set; }
- public Integer myTBRNumber { get; set; }
- public Integer myTBBNumber { get; set; }
- //2021-05-19 鎷涙姇鏍囬」鐩�-- 椤甸潰鎻愰啋 mzy end
- //2021-11-09 SWAG-C8KCZZ mzy start
- public Boolean isTwoSOne {get;set;}
- public Integer OppWithoutConformNumber {get;set;}
- //2021-11-09 SWAG-C8KCZZ mzy end
+ public Integer myTaskNumber { get; set; }
+ public Integer myAllTaskNumber { get; set; }
+ public Integer subTaskNumber { get; set; }
+ public Integer UnfinishedTaskNumber { get; set; }
+ public Integer opportunityTasksNumber {get; set;}
+ public Integer opplostTasksNumber {get; set;}
+ public Integer subOpportunityTasksNumber {get; set;}
+ public Integer subopplostTasksNumber {get; set;}
- public Integer feedbackNumber{ get; set; } // 2021-11-04 yjk 寰呭弽棣�
- public Integer OverFeedbackNumber{ get; set; } // 2021-11-17 mzy 鍙嶉Over
- //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
- public Boolean isShowInquiry {get;set;}
- public Integer InquiryNumber{ get; set; }
- //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
- public taskAlertController() {
- }
- public PageReference init() {
- Date today = Date.today();
- Date firstDate = Date.newInstance(today.year(), today.month(), 1);
+ //2021-05-19 鎷涙姇鏍囬」鐩�--椤甸潰鎻愰啋 mzy start
+ public Integer myTBCNumber { get; set; }
+ public Integer myTBRNumber { get; set; }
+ public Integer myTBBNumber { get; set; }
+ //2021-05-19 鎷涙姇鏍囬」鐩�-- 椤甸潰鎻愰啋 mzy end
+ //2021-11-09 SWAG-C8KCZZ mzy start
+ public Boolean isTwoSOne {get;set;}
+ public Integer OppWithoutConformNumber {get;set;}
+ //2021-11-09 SWAG-C8KCZZ mzy end
- //2021-09-28 mzy 浠诲姟绠＄悊鏀瑰杽 start
- taskManageController.Task allTask =
- taskManageController.getCurrentTask(null, null, '01 鍒嗛厤', null, null, null,null,
- null, null, null, '01 鍒嗛厤', null , null, null,null);
- system.debug('allTask锛�' + allTask.myTasks.size());
- //2021.9.18 pk statr
- taskManageController.Task UnfinishedTasks =
- taskManageController.getCurrentTask(null, null, '02 鎺ュ彈', null, null, null,null,
- null, null, null, '02 鎺ュ彈', null , null, null,null);
- //2021-09-28 mzy 浠诲姟绠＄悊鏀瑰杽 end
- system.debug('UnfinishedTasks锛�' + UnfinishedTasks.myTasks.size());
- //2021.9.18 pk end
- myTaskNumber = allTask.myTasks == null ? 0 : allTask.myTasks.size();
- subTaskNumber = allTask.subTasks == null ? 0 : allTask.subTasks.size();
+ public Integer feedbackNumber{ get; set; } // 2021-11-04 yjk 寰呭弽棣�
+ public Integer OverFeedbackNumber{ get; set; } // 2021-11-17 mzy 鍙嶉Over
+ //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
+ public Boolean isShowInquiry {get;set;}
+ public Integer InquiryNumber{ get; set; }
+ //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
- //2021.9.18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� pk statr
- unfinishedTaskNumber = UnfinishedTasks.myTasks == null ? 0 : UnfinishedTasks.myTasks.size();
- //2021.9.18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� pk end
+ //2022-4-19 yjk FSE鍏遍�氬钩鍙伴」鐩� start
+ public Integer InquiryNumberFSE{ get; set; }
+ //2022-4-19 yjk FSE鍏遍�氬钩鍙伴」鐩� end
+
+ //2022-5-13 yjk 鍔╃悊寰呰窡杩涘挩璇㈠崟 start
+ public Integer InquiryNumberZhuli{ get; set; }
+ //2022-5-13 yjk 鍔╃悊寰呰窡杩涘挩璇㈠崟 end
+
+ //2022-3-17 yjk 鏍规嵁绠�妗ｆ樉绀轰换鍔℃彁閱�
+ public Boolean isShowTask{get;set;}
+ public String proId{get;set;}
+
+
+ public Boolean Is2M4{get;set;} // 20221213 ljh SWAG-CK28WT
+
+ public taskAlertController() {
+ Is2M4 = false;
+ }
+ public PageReference init() {
+ //2022-3-17 yjk 鏍规嵁绠�妗ｆ樉绀轰换鍔℃彁閱�
+ proId = UserInfo.getProfileId();
+ if(UserInfo.getProfileId() == System.Label.ProfileId_OBA1zbjd ){
+ isShowTask = false;
+ }else{
+ isShowTask = true;
+ }
+ // 20221013 ljh SWAG-CK28WT start
+ String p_2M4 = System.Label.ProfileId_2M4;
+ if(proId.substring(0,15) == p_2M4.substring(0,15)){
+ Is2M4 = true;
+ }
+ // 20221013 ljh SWAG-CK28WT end
+ Date today = Date.today();
+ Date firstDate = Date.newInstance(today.year(), today.month(), 1);
+
+ //2021-09-28 mzy 浠诲姟绠＄悊鏀瑰杽 start
+ taskManageController.Task allTask =
+ taskManageController.getCurrentTask(null, null, '01 鍒嗛厤', null, null, null,null,
+ null, null, null, '01 鍒嗛厤', null , null, null,null);
+ system.debug('allTask锛�' + allTask.myTasks.size());
+ //2021.9.18 pk statr
+ taskManageController.Task UnfinishedTasks =
+ taskManageController.getCurrentTask(null, null, '02 鎺ュ彈', null, null, null,null,
+ null, null, null, '02 鎺ュ彈', null , null, null,null);
+ //2021-09-28 mzy 浠诲姟绠＄悊鏀瑰杽 end
+ system.debug('UnfinishedTasks锛�' + UnfinishedTasks.myTasks.size());
+ //2021.9.18 pk end
+
+ //20220624 sx 璇环璺熻繘浠诲姟 澶卞崟鎶ュ憡浠诲姟 聽taskDifferent__c '琚姩浠诲姟' 聽 聽taskStatus__c 聽'02 鎺ュ彈'
+ taskManageController.Task opportunityTasks =
+ taskManageController.getCurrentTask(null,'涓爣缁撴灉纭', '02 鎺ュ彈' , null, null, null, null,
+ null, '涓爣缁撴灉纭', null, '02 鎺ュ彈', null, null, null, null);
+
+ taskManageController.Task opplostTasks =
+ taskManageController.getCurrentTask(null,'澶卞崟鎶ュ憡浠诲姟', '02 鎺ュ彈' , null, null, null, null,
+ null, '澶卞崟鎶ュ憡浠诲姟', null, '02 鎺ュ彈', null, null, null, null);
+
+
+ system.debug('==========subTask=======' + opplostTasks.subTasks);
+ system.debug('==========subTask=======' + opportunityTasks.subTasks);
+
+ system.debug('====================opplostTasks:' + opplostTasks.myTasks.size());
+ system.debug('opportunityTasks' + opportunityTasks.myTasks.size());
+ //20220624 sx 璇环璺熻繘浠诲姟end
+
+ myTaskNumber = allTask.myTasks == null ? 0 : allTask.myTasks.size();
+ subTaskNumber = allTask.subTasks == null ? 0 : allTask.subTasks.size();
+
+ //2021.9.18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� pk statr
+ unfinishedTaskNumber = UnfinishedTasks.myTasks == null ? 0 : UnfinishedTasks.myTasks.size();
+ //2021.9.18 澧炲姞鏈畬鎴愪换鍔℃暟閲忔樉绀� pk end
+
+ //20220624 sx 璇环璺熻繘浠诲姟 聽taskDifferent__c '琚姩浠诲姟' 聽 聽taskStatus__c 聽'02 鎺ュ彈'
+ opportunityTasksNumber = opportunityTasks.myTasks == null ? 0 : opportunityTasks.myTasks.size();
+ opplostTasksNumber = opplostTasks.myTasks == null ? 0 : opplostTasks.myTasks.size();
+ subOpportunityTasksNumber = opportunityTasks.subTasks == null ? 0 : opportunityTasks.subTasks.size();
+ subopplostTasksNumber = opplostTasks.subTasks == null ? 0 : opplostTasks.subTasks.size();
+ //20220624 sx 璇环璺熻繘浠诲姟end
// taskManageController.Task myallTask =
// taskManageController.getMyTask(null, null,
@@ -79,40 +139,58 @@
//2021-11-17 mzy 浠诲姟绠＄悊鏀瑰杽 end
- //2021-11-08 mzy SWAG-C8KCZZ start
- AgencyOpportunityManageCotroller.AgencyOpportunityView AOView =
- AgencyOpportunityManageCotroller.getCurrentAgencyOpportunity();
- if(AOView.isShow){
- this.isTwoSOne = AOView.isShow;
- this.OppWithoutConformNumber = AOView.AgencyOpportunityList.size();
- }else{
- this.isTwoSOne = false;
- this.OppWithoutConformNumber = 0;
- }
- //2021-11-08 mzy SWAG-C8KCZZ end
- //2022-02-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
- // LeadIntentionController LeadIntController = new LeadIntentionController();
- // LeadIntController.init();
- // Integer pclCount = LeadIntController.pclCount;
- // if(pclCount>0){
- // InquiryNumber = pclCount;
- // isShowInquiry = true;
- // }else{
- // isShowInquiry = false;
- // InquiryNumber = 0;
- // }
- InquiryFormManageController.InquiryFormView IFView =
- InquiryFormManageController.getCurrentInquiryInform();
- if(IFView.isShow){
- this.isShowInquiry = IFView.isShow;
- this.InquiryNumber = IFView.InquiryFormList.size();
- }else{
- this.isShowInquiry = false;
- this.InquiryNumber = 0;
- }
+ //2021-11-08 mzy SWAG-C8KCZZ start
+ AgencyOpportunityManageCotroller.AgencyOpportunityView AOView =
+ AgencyOpportunityManageCotroller.getCurrentAgencyOpportunity();
+ if(AOView.isShow){
+ this.isTwoSOne = AOView.isShow;
+ this.OppWithoutConformNumber = AOView.AgencyOpportunityList.size();
+ }else{
+ this.isTwoSOne = false;
+ this.OppWithoutConformNumber = 0;
+ }
+ //2021-11-08 mzy SWAG-C8KCZZ end
+ //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 start
- //2022-02-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
-
- return null;
- }
+ //2022-4-19 yjk SWAG-CBUB2W start
+ List<String> profileIdList = new List<String>();
+ profileIdList.add(System.Label.ProfileId_2S1);
+ profileIdList.add(System.Label.ProfileIdN_2S1);
+ profileIdList.add(System.Label.ProfileId_2S4);
+ profileIdList.add(System.Label.ProfileId_2S4_Chief);
+ profileIdList.add(System.Label.ProfileId_2S5);
+ profileIdList.add(System.Label.ProfileId_2S6);
+ profileIdList.add(System.Label.ProfileId_2S8);
+ profileIdList.add(System.Label.ProfileId_2S10);
+
+ if( profileIdList.contains(UserInfo.getProfileId())){
+ //2022-4-22 yjk 淇敼鏌ヨ閫昏緫
+ List<Inquiry_form__c> InquiryNumberFSEList = [select id from Inquiry_form__c where Service_Status__c = '01.鏈窡杩�' and FSE_Owner__c =:UserInfo.getUserId()];
+ InquiryNumberFSE = InquiryNumberFSEList.size();
+ }
+
+ //2022-5-13 yjk 鍔╃悊寰呰窡杩涘挩璇㈠崟 start 2022-5-30 yjk澧炲姞鍒ゆ柇
+ InquiryNumberZhuli = 0;
+ if(System.Label.ProfileId_2S6.equals(UserInfo.getProfileId())){
+ List<Inquiry_form__c> InquiryNumberZhuliList = [select id from Inquiry_form__c where IfGotoDepartment__c = false and (GI_assistant__c =:UserInfo.getUserId() or SP_assistant__c =:UserInfo.getUserId() )];
+ InquiryNumberZhuli = InquiryNumberZhuliList.size();
+ }
+ //2022-5-13 yjk 鍔╃悊寰呰窡杩涘挩璇㈠崟 end
+ LeadIntentionController LeadIntController = new LeadIntentionController();
+ LeadIntController.init();
+ Integer pclCount = LeadIntController.pclCount;
+ system.debug('pclCount--------------------'+pclCount);
+ if(pclCount>0){
+ InquiryNumber = pclCount;
+ isShowInquiry = true;
+ }else{
+ isShowInquiry = false;
+ InquiryNumber = 0;
+ }
+
+ //2022-4-19 yjk SWAG-CBUB2W end
+ //2021-11-23 mzy 鍏遍�氬钩鍙伴」鐩�-棣栭〉淇敼 end
+
+ return null;
+ }
}
\ No newline at end of file
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