From a25138b23fdaa05197fb25fdbb3202f122235611 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期四, 28 四月 2022 16:22:34 +0800
Subject: [PATCH] 【委托】【优先】询问单相关修改
---
force-app/main/default/classes/taskAlertController.cls | 37 +++++
force-app/main/default/classes/StartTradingController.cls | 8
force-app/main/default/classes/NewAndEditLeadController.cls | 3
force-app/main/default/classes/NewAndEditInquiryFormController.cls | 3
force-app/main/default/classes/OpportunityAndContactDailyUpdateBatch.cls | 31 ++++
force-app/main/default/classes/StatusPageController.cls | 34 ++++
force-app/main/default/pages/ServiceFollowPage.page | 48 ++++++
force-app/main/default/classes/InquiryFormHandler.cls | 166 +++++++++++++++++++++++
force-app/main/default/pages/ServiceFollowPage.page-meta.xml | 7 +
force-app/main/default/pages/taskAlert.page | 25 ++-
10 files changed, 344 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/classes/InquiryFormHandler.cls b/force-app/main/default/classes/InquiryFormHandler.cls
index d0507c0..aa44703 100644
--- a/force-app/main/default/classes/InquiryFormHandler.cls
+++ b/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
+ //鍏紡鑰冩枃鏈� 缁橣SE鎷呭綋璧嬪��
+ 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>();
+ //瀛樻斁(浜у搧鍜ㄨ鍗昳d,鍏变韩瀵硅薄)
+ 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>();
+ //瀛樻斁鐢ㄤ簬鐨刬d
+ 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;
+ }
+ //鍒ゆ柇闇�瑕佸叡浜殑浜� 鏄笉鏄垱寤轰汉 濡傛灉鏄垯璇存槑鏈変竴鏉¤繖涓汉鐨刼wner鏁版嵁 鍒欎笉鏂板
+ 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++;//鍙互澶氬啓鐐�
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/NewAndEditInquiryFormController.cls b/force-app/main/default/classes/NewAndEditInquiryFormController.cls
index 64380cf..c25ebc0 100644
--- a/force-app/main/default/classes/NewAndEditInquiryFormController.cls
+++ b/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];
diff --git a/force-app/main/default/classes/NewAndEditLeadController.cls b/force-app/main/default/classes/NewAndEditLeadController.cls
index 6ff38fd..87e4e6c 100644
--- a/force-app/main/default/classes/NewAndEditLeadController.cls
+++ b/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;
diff --git a/force-app/main/default/classes/OpportunityAndContactDailyUpdateBatch.cls b/force-app/main/default/classes/OpportunityAndContactDailyUpdateBatch.cls
index 9cfc17a..e5baedd 100644
--- a/force-app/main/default/classes/OpportunityAndContactDailyUpdateBatch.cls
+++ b/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';
diff --git a/force-app/main/default/classes/StartTradingController.cls b/force-app/main/default/classes/StartTradingController.cls
index 4579d0c..c28ce4b 100644
--- a/force-app/main/default/classes/StartTradingController.cls
+++ b/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;
diff --git a/force-app/main/default/classes/StatusPageController.cls b/force-app/main/default/classes/StatusPageController.cls
index 8cf62b4..3c473c0 100644
--- a/force-app/main/default/classes/StatusPageController.cls
+++ b/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
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/taskAlertController.cls b/force-app/main/default/classes/taskAlertController.cls
index 77c0cf4..5626c28 100644
--- a/force-app/main/default/classes/taskAlertController.cls
+++ b/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;
diff --git a/force-app/main/default/pages/ServiceFollowPage.page b/force-app/main/default/pages/ServiceFollowPage.page
new file mode 100644
index 0000000..4364f4b
--- /dev/null
+++ b/force-app/main/default/pages/ServiceFollowPage.page
@@ -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>
\ No newline at end of file
diff --git a/force-app/main/default/pages/ServiceFollowPage.page-meta.xml b/force-app/main/default/pages/ServiceFollowPage.page-meta.xml
new file mode 100644
index 0000000..b77a910
--- /dev/null
+++ b/force-app/main/default/pages/ServiceFollowPage.page-meta.xml
@@ -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>
diff --git a/force-app/main/default/pages/taskAlert.page b/force-app/main/default/pages/taskAlert.page
index c358d3b..e457ac7 100644
--- a/force-app/main/default/pages/taskAlert.page
+++ b/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>
@@ -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>
- <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>
+
+ <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-->
--
Gitblit v1.9.1