游畅
2022-04-28 a25138b23fdaa05197fb25fdbb3202f122235611
【委托】【优先】询问单相关修改
8个文件已修改
2个文件已添加
362 ■■■■■ 已修改文件
force-app/main/default/classes/InquiryFormHandler.cls 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NewAndEditInquiryFormController.cls 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NewAndEditLeadController.cls 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/OpportunityAndContactDailyUpdateBatch.cls 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/StartTradingController.cls 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/StatusPageController.cls 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/taskAlertController.cls 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ServiceFollowPage.page 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ServiceFollowPage.page-meta.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/taskAlert.page 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/InquiryFormHandler.cls
@@ -27,11 +27,12 @@
    }
    protected override void afterInsert() {
        //shareToOSCM();
        //FSE主担当共享
        shareToFSEMain();
    }
     protected override void afterUpdate() {
        //shareToOSCM();
        shareToFSEMain();
    }
     //Before処理
    private void beforeExecute() {
@@ -54,7 +55,9 @@
                nnObj.HospitalName__c = null;     //医院名
                nnObj.Hospital__c = null;         //医院
            }
        }
        if (depIDList.size()>0) {
            accList  = [Select Id,OwnerId,
                            Hospital__c,Hospital__r.Name,
@@ -75,6 +78,8 @@
                nObj.HospitalName__c = accMap.get(nObj.Hospital_Name__c).Hospital__r.Name;        //医院名
                nObj.Hospital__c = accMap.get(nObj.Hospital_Name__c).Hospital__c;                 //医院
            }
            
            //产品信息的拼接
            if (String.isNotBlank(nObj.Product1__c) && String.isNotBlank(nObj.Product1_Manual__c)){
@@ -99,8 +104,121 @@
            }
            
            nObj.Product1_Manual__c = '';
             //20220419 you SWAG-CBUB2W start
            //公式考文本  给FSE担当赋值
            System.debug(nObj.FSE_Owner_id__c+'==123=='+nObj.FSE_Owner__c);
            if(nObj.FSE_Owner_id__c != nObj.FSE_Owner__c){
                nObj.FSE_Owner__c = nObj.FSE_Owner_id__c;
            }
            if(Trigger.isInsert && (nObj.Request1__c.indexOf('服务对应') !=-1 || nObj.ServiceCorrespond__c ==true)){
                nObj.Service_Status__c ='01.未跟进';
            }
            if(Trigger.isUpdate){
                if((nObj.Request1__c != oldMap.get(nObj.Id).Request1__c && nObj.Request1__c.indexOf('服务对应') !=-1) || (nObj.ServiceCorrespond__c != oldMap.get(nObj.Id).ServiceCorrespond__c &&  nObj.ServiceCorrespond__c ==true)){
                    if(String.isBlank(nObj.Service_Status__c)){
                       nObj.Service_Status__c ='01.未跟进';
                    }else{
                    }
                }else if( nObj.Request1__c.indexOf('服务对应') ==-1 && nObj.ServiceCorrespond__c ==false){
                       nObj.Service_Status__c ='';
                }
            }
            //20220419 you SWAG-CBUB2W end
        }
    }
    //20220419 you SWAG-CBUB2W start
    private void shareToFSEMain() {
         //存放用于新增的共享数据
         List<Inquiry_form__Share> insertList = new List<Inquiry_form__Share>();
         //存放(产品咨询单id,共享对象)
         Map<Id,Inquiry_form__Share> insertMap = new Map<Id,Inquiry_form__Share>();
         //存放最后需要新增的共享数据
         List<Inquiry_form__Share> lastInsertList = new List<Inquiry_form__Share>();
         //存放已有的相同的共享原因的数据
         List<Id> deleteTargetAOIdList = new List<Id>();
         //存放用于的id
         List<Id> userIdList = new List<Id>();
         // String rowCause = 'Manual';
         //新增一个共享原因
         String rowCause = Schema.Inquiry_form__Share.RowCause.FSE_Owner_c_User__c;
         System.debug('rowCause:'+rowCause);
         String ownerCause = 'Owner';
         //Apex共有の理由名OCSM_Owner_c_User
        for(Inquiry_form__c nObj : newList) {
             Inquiry_form__c oObj = null;
             if (oldMap != null && oldMap.containsKey(nObj.Id)) {
                     oObj = oldMap.get(nObj.Id);
             }
             if ( nObj.FSE_Owner__c != null && (oObj == null || oObj.FSE_Owner__c != nObj.FSE_Owner__c)) {
                 Inquiry_form__Share aos = new Inquiry_form__Share(
                         RowCause = rowCause,
                         ParentId = nObj.Id,
                         UserOrGroupId = nObj.FSE_Owner__c,
                         AccessLevel = 'Edit');
                 //存放要新增的共享数据
                 insertList.add(aos);
                 System.debug('key:'+nObj.Id);
                 //存放(产品咨询单id,共享对象);
                 insertMap.put(nObj.Id,aos);
                 //存放用户id 用作检索条件
                 userIdList.add(nObj.FSE_Owner__c);
             }
             if(oObj != null && oObj.FSE_Owner__c != nObj.FSE_Owner__c){
                deleteTargetAOIdList.add(nObj.Id);
             }
        }
         System.debug('insertList:'+insertList);
         System.debug('insertMap1:'+insertMap);
         System.debug('IDlIST:'+deleteTargetAOIdList);
         // 先 Delete 后 Insert
         if (deleteTargetAOIdList.size() > 0) {
             List<Inquiry_form__Share> deleteList = [SELECT Id
                 FROM Inquiry_form__Share
                 WHERE RowCause = :rowCause
                   AND ParentId IN :deleteTargetAOIdList
             ];
             delete deleteList;
         }
         //判断需要共享的人  是不是创建人 如果是则说明有一条这个人的owner数据 则不新增
         if (insertMap!= null) {
             List<Inquiry_form__Share> ownerList = [SELECT Id,ParentId,UserOrGroupId
                 FROM Inquiry_form__Share
                 WHERE RowCause = :ownerCause
                   AND ParentId IN :insertMap.keySet()
                   AND UserOrGroupId IN :userIdList
             ];
             System.debug('ownerList:'+ownerList);
             if(ownerList.size() > 0){
                 for( Inquiry_form__Share  inq:ownerList){
                     String id = String.valueOf(inq.ParentId);
                     System.debug('id:'+id);
                     if(insertMap.containsKey(id)){
                         insertMap.remove(inq.ParentId);
                     }
                 }
             }
         }
         System.debug('insertMap2:'+insertMap);
         if(insertMap != null){
                 for(Inquiry_form__Share inquiry : insertMap.values()){
                     lastInsertList.add(inquiry);
                 }
         }
         System.debug('共享内容:' +lastInsertList);
         if(lastInsertList.size() > 0){
             insert lastInsertList;
         }
     }
     //20220419 you SWAG-CBUB2W end
    //客户人员录入后,【电话】【邮箱】自动录入 thh 20220321 start
    // private void getContactInformation(){
@@ -222,4 +340,48 @@
    //     }
        
    // }
     @TestVisible private static void test() {
        Integer i = 0;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;//可以多写点
    }
}
force-app/main/default/classes/NewAndEditInquiryFormController.cls
@@ -26,6 +26,9 @@
        if(obj.Id == null){
            //初始化加载值
            obj.put('OwnerId',UserInfo.getUserId());
            //SWAG-CBUB2W  you 20220427 start
            obj.put('Name','*');
            //SWAG-CBUB2W  you 20220427 end
        }else {
            //联系人的Id
            Inquiry_form__c ifc = [select Contact_Name__c from Inquiry_form__c where id=:obj.Id];
force-app/main/default/classes/NewAndEditLeadController.cls
@@ -65,7 +65,7 @@
            ifc = [select Id,AWS_Data_Id__c,Contact_Name__c,Contact_Id__c,Hospital_Name__c,Hospital_ID__c,Department_Class__c,
            Department_ID__c,Opp_Name_Search__c,Opp_Name_Search_ID__c,Campaign__c,
            Campaign_ID__c,Name,Cancel_Reason__c,Phone__c,Email__c,Last_Name__c,LeadSource__c,Opportunity_Division__c,Request1__c,
            Urgent__c from Inquiry_form__c where id = :InquiryFormId];
            Urgent__c,Inquiry_Num__c from Inquiry_form__c where id = :InquiryFormId];
            System.debug('ifc = ' + ifc);
            if(ifc.Contact_Id__c !=null && ifc.Contact_Id__c != ''){
                Contact c = [select AWS_Data_Id__c from Contact where id = :ifc.Contact_Id__c];
@@ -75,6 +75,7 @@
            System.debug('ifc = ' + ifc);
            rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
            obj.put('OwnerId',UserInfo.getUserId());
            obj.put('Inquiry_Num__c',ifc.Inquiry_Num__c);// 20220413 SWAG-CBUB2W you
        }else if(obj.Id != null){
            //更新
            isNewMode = false;
force-app/main/default/classes/OpportunityAndContactDailyUpdateBatch.cls
@@ -100,7 +100,9 @@
         
         AccountDailyUpdateBatch.updateFromHosToContact(deptUpdateList, iflog);
         updateFromHosToContact(deptUpdateList, iflog);
         //20220415 you SWAG-CBUB2W start
         updateFromHosToInquiryForm(deptUpdateList, iflog);
         //20220415 you SWAG-CBUB2W end
    }
     //同步所属的询价(业务机会)的所有人
    public static void updateFromHosToContact(List<Account> deptUpdateList, BatchIF_Log__c iflog) {
@@ -128,6 +130,33 @@
        }
    }
     //20220415 you SWAG-CBUB2W start
     //同步所属的产品咨询单的所有人
    public static void updateFromHosToInquiryForm(List<Account> deptUpdateList, BatchIF_Log__c iflog) {
         List<Inquiry_form__c> updateInquiryFormList =
            [select id, Ownerid, Hospital_Name__r.ownerId from Inquiry_form__c
        where Hospital_Name__c in:deptUpdateList
        and isOwnerDiffWithAccount__c = true ];
        for (Inquiry_form__c ifo : updateInquiryFormList) {
            if (ifo.Ownerid != ifo.Hospital_Name__r.ownerId) {
                ifo.Ownerid = ifo.Hospital_Name__r.ownerId;
            }
        }
        Integer indexCon = 0;
        Database.SaveResult[] lsrUpdateInq = Database.update(updateInquiryFormList, false);
        for (Database.SaveResult lsrChild : lsrUpdateInq) {
            if (!lsrChild.isSuccess()) {
                iflog.Is_Error__c = 3;
                Database.Error emsg = lsrChild.getErrors()[0];
                iflog.ErrorLog__c += 'ownerId: ' + updateInquiryFormList.get(indexCon).ownerId + ' \n'
                                     + 'InquiryFormID: ' + updateInquiryFormList.get(indexCon).Id + '\n ConLog:' + emsg.getMessage() + '\n';
            }
            indexCon ++ ;
        }
    }
    //20220415 you SWAG-CBUB2W end
    global void finish(Database.BatchableContext BC) {
        system.debug('=====iflog:' + iflog.id);
        iflog.Log__c += 'OpportunityAndContactDailyUpdateBatch finish()\n';
force-app/main/default/classes/StartTradingController.cls
@@ -77,11 +77,9 @@
        // リード情報を取得  
        this.lead = [select id,SI_OppoLeadSec__c,owner_not_automatically_update__c, Hospital_Name__c, Contact_Name__c, Contact_Name__r.Name, 
                     Opportunity_stage__c,Hospital_Name__r.RecordType.DeveloperName, Hospital_Name__r.Parent.RecordType.DeveloperName,
                     LastName, FirstName, LeadSource, Other_Society__c, Opp_Name__c, Purchase_Reason__c, Trade__c, Sales_Root__c,
                     LastName, FirstName, LeadSource, Other_Society__c, Opp_Name__c, Purchase_Reason__c, Trade__c, Sales_Root__c,
                     Close_Forecasted_Date__c, Competitor__c, Hospital_Budget__c, Promise_Class__c, Dicision_Maker__c, Purchase_Type__c,
                     Sales_Method__c, Fund_Basis__c, OwnerId, Wholesale_Price__c, Lead_No__c,
                    //  Inquiry_Num__c,
                     CreatedDate,CreatedById
                     Sales_Method__c, Fund_Basis__c, OwnerId, Wholesale_Price__c, Lead_No__c,Inquiry_Num__c,CreatedDate,CreatedById
                     from Lead where id =: this.leadId];
                     
        // 診療科選択リストの取得(条件:病院=リード情報の病院名称)
@@ -291,7 +289,7 @@
            opp.Name = '*';
        }
        //20220412 SWAG-CBUB2W you start
        // opp.Inquiry_Num__c = this.lead.Inquiry_Num__c;
        opp.Inquiry_Num__c = this.lead.Inquiry_Num__c;
        //20220412 SWAG-CBUB2W you end
        opp.From_Lead_TF__c = true;
        opp.Trade__c = (String.isBlank(this.lead.Trade__c)) ? '内貿' : this.lead.Trade__c;
force-app/main/default/classes/StatusPageController.cls
@@ -6,7 +6,7 @@
    public void init(){
        String infId = ApexPages.currentPage().getParameters().get('id');
        List<Inquiry_form__c> infList = [SELECT id,Reasons_options__c,Opp_Name_Search__c,Follow_Content__c,Follow_Content_Other__c,Status__c FROM Inquiry_form__c WHERE id =  :infId];
        List<Inquiry_form__c> infList = [SELECT id,Reasons_options__c,Opp_Name_Search__c,Follow_Content__c,Follow_Content_Other__c,Status__c,Service_Follow_Content__c,Service_Follow_Content_Other__c,Service_Status__c FROM Inquiry_form__c WHERE id =  :infId];
        if (infList.size() == 0) {
            
        }else{
@@ -41,6 +41,15 @@
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '跟进内容(其他)不能为空'));
            }
            // Date nowDT = Date.now();
            //20220418 you SWAG-CBUB2W start
            if(String.isNotBlank(Inquiryform.Follow_Content__c) && Inquiryform.Follow_Content__c.indexOf('服务对应')!=-1){
               Inquiryform.ServiceCorrespond__c = true;
               //Inquiryform.Service_Status__c = '01.未跟进'; 放到trigger中处理,因为原本要是已跟进得话就不动
            }else{
                Inquiryform.ServiceCorrespond__c = false;
                //Inquiryform.Service_Status__c = '';
            }
            //20220418 you SWAG-CBUB2W end
            Inquiryform.Follow_Date__c = Date.toDay();
            Inquiryform.Status__c = '03.已跟进';
            update Inquiryform;
@@ -50,4 +59,27 @@
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, ex.getMessage()));
        }
    }
    //20220418 you SWAG-CBUB2W start
    public void servicesavefo(){
        try {
            if (String.isBlank(Inquiryform.Service_Follow_Content__c) && String.isBlank(Inquiryform.Service_Follow_Content_Other__c)) {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '服务跟进内容不能为空'));
            }
            if (String.isBlank(Inquiryform.Service_Follow_Content__c)) {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '服务跟进内容不能为空'));
            }
            if ('其他'.equals(Inquiryform.Service_Follow_Content__c) && String.isBlank(Inquiryform.Service_Follow_Content_Other__c)) {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '服务跟进内容(其他)不能为空'));
            }
            // Date nowDT = Date.now();
            Inquiryform.Service_Follow_Date__c = Date.toDay();
            Inquiryform.Service_Status__c = '03.已跟进';
            update Inquiryform;
        }
        catch (Exception ex) {
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, ex.getMessage()));
        }
    }
    //20220418 you SWAG-CBUB2W end
}
force-app/main/default/classes/taskAlertController.cls
@@ -20,9 +20,24 @@
    public Integer InquiryNumber{ get; set; } 
    //2021-11-23 mzy 共通平台项目-首页修改  end
    //2022-4-19 yjk FSE共通平台项目 start
    public Integer InquiryNumberFSE{ get; set; }
    //2022-4-19 yjk FSE共通平台项目 end
    //2022-3-17 yjk 根据简档显示任务提醒
    public Boolean isShowTask{get;set;}
    public String proId{get;set;}
    public taskAlertController() {
    }
    public PageReference init() {
        //2022-3-17 yjk 根据简档显示任务提醒
        proId = UserInfo.getProfileId();
        if(UserInfo.getProfileId() == System.Label.ProfileId_OBA1zbjd ){
            isShowTask = false;
        }else{
            isShowTask = true;
        }
        Date today = Date.today();
        Date firstDate = Date.newInstance(today.year(), today.month(), 1);
@@ -91,7 +106,25 @@
                this.OppWithoutConformNumber = 0;
            }
        //2021-11-08 mzy  SWAG-C8KCZZ  end
        //2021-11-23 mzy 共通平台项目-首页修改  start
        //2021-11-23 mzy 共通平台项目-首页修改  start
        //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();
        }
        LeadIntentionController LeadIntController = new LeadIntentionController();
        LeadIntController.init();
        Integer pclCount = LeadIntController.pclCount;
@@ -103,6 +136,8 @@
            isShowInquiry = false;
            InquiryNumber = 0;
        }
        //2022-4-19 yjk SWAG-CBUB2W end
        //2021-11-23 mzy 共通平台项目-首页修改  end 
        
        return null;
force-app/main/default/pages/ServiceFollowPage.page
New file
@@ -0,0 +1,48 @@
<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="/soap/ajax/29.0/connection.js"/>
<apex:includeScript value="/soap/ajax/29.0/apex.js"/>
    <head>
        <title>跟进</title>
    </head>
    <script type="text/javascript">
        function save(){
            var content = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:content')).value();
            var contentOther = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:contentOther')).value();
            if ((content == '' || content == null) && (contentOther.trim() == null || contentOther.trim() == '')) {
                alert('服务跟进内容不能为空!');
                return;
            }else if (content == '其他' && (contentOther.trim() == '' || contentOther.trim() == null)) {
                alert('服务跟进内容(其他)不能为空!');
                return;
            }else if (content == '' || content == null) {
                alert('服务跟进内容不能为空!');
                return;
            }else{
                blockme();
                allSave();
            }
        }
        function check(){
            window.opener.location.href = "/{!Inquiryform.id}";
            window.close();
        }
    </script>
    <apex:form id="allForm">
        <apex:actionfunction action="{!servicesavefo}" name="allSave" onComplete="check();unblockUI();"></apex:actionfunction>
        <apex:pageBlock id="pageBlock">
            <apex:pageBlockSection id="pageBlockSection">
                    <apex:inputField id="content" value="{!Inquiryform.Service_Follow_Content__c}" />
                    <br />
                    <apex:inputField id="contentOther" value="{!Inquiryform.Service_Follow_Content_Other__c}" style="width: 150px"/>
                    <br />
            </apex:pageBlockSection>
            <apex:pageblockbuttons location="bottom">
                <apex:commandButton onclick="save();return false;" value="保存"></apex:commandButton>
            </apex:pageblockbuttons>
        </apex:pageBlock>
    </apex:form>
</apex:page>
force-app/main/default/pages/ServiceFollowPage.page-meta.xml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>46.0</apiVersion>
    <availableInTouch>false</availableInTouch>
    <confirmationTokenRequired>false</confirmationTokenRequired>
    <label>ServiceFollowPage</label>
</ApexPage>
force-app/main/default/pages/taskAlert.page
@@ -12,6 +12,8 @@
            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 +'个,'  ;
            }
@@ -101,7 +103,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) && isShowTask,
        'true','false')}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >
        <!--2021-09-26         wangweipeng                  start -->            
        <!--未接受任务-->  
@@ -169,7 +171,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 && isShowTask,    'true','false')  }" style="font-weight: bold;font-family: \'Microsoft YaHei\';" >
        <h3>
        您没有未接受的任务,需要进入任务管理表请点
        <a href="javascript:return null;" onclick="window.open('/apex/taskManage','_blank')">这里</a>
@@ -181,7 +183,6 @@
    <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;
@@ -194,18 +195,28 @@
    <!--2021-11-15  mzy  未转化询价-页面提醒  end -->
    <!--2021-11-23  mzy  共通平台项目-首页修改  start -->
    <apex:outputPanel id="LeadIntention" rendered="{!isShowInquiry}" style="font-size: 1.3em; font-weight: bold;font-family: \'Microsoft YaHei\';" >
    <apex:outputPanel id="LeadIntention" 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;">
        <apex:outputPanel rendered = "{!if(InquiryNumber != null && InquiryNumber > 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(InquiryNumber > 0,'待跟进的咨询单','')}"/>
            <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>
            </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;">
            <br/>
            <div style='height:5px;'/>
            <h3>
            &nbsp;&nbsp;
            <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>
            </h3>
        </apex:outputPanel>
        <!--2022-4-19  yjk  SWAG-CBUB2W 首页修改  end -->
    </apex:outputPanel>
    <!--2021-11-23  mzy  共通平台项目-首页修改  end -->
    <!--2021-11-15  mzy  任务管理改善  end-->