| force-app/main/default/classes/TenderInformationHandlerTest.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| force-app/main/default/classes/TenderManageController.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| force-app/main/default/classes/TenderManageControllerTest.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| force-app/main/default/classes/taskAlertController.cls | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| force-app/main/default/pages/taskAlert.page | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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(); } } } 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; 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(); }
@@ -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; } } 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>
