From f127c76b19f5316032d4bed127a1dde710c48d74 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 24 三月 2022 10:10:36 +0800
Subject: [PATCH] PIPLFunctionFixBug0324
---
force-app/main/default/pages/NewAndEditLead.page | 127 +++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 40 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditLead.page b/force-app/main/default/pages/NewAndEditLead.page
index cd868a2..61fa0f9 100644
--- a/force-app/main/default/pages/NewAndEditLead.page
+++ b/force-app/main/default/pages/NewAndEditLead.page
@@ -140,11 +140,18 @@
}
function QueryLeadFromAWSIFS() {
//staticResourceInquiryForm
- AWSService.query(staticResourceInquiryForm.queryUrl, '{!AWSDataIdInquiryForm}', queryBack, staticResourceInquiryForm.token);
+ AWSService.query(staticResourceInquiryForm.queryUrl, '{!AWSDataIdInquiryForm}', queryBackIFS, staticResourceInquiryForm.token);
}
var queryBack = function queryBack(data) {
console.log('data = ' + data);
document.querySelector("[data-id='LastName']").value = data.object.lastName == null ? '' : data.object.lastName;
+ document.querySelector("[data-id='Phone']").value = data.object.phone == null ? '' : data.object.phone;
+ document.querySelector("[data-id='Email']").value = data.object.email == null ? '' : data.object.email;
+ unblockUI();
+ };
+ var queryBackIFS = function queryBackIFS(data) {
+ console.log('data = ' + data);
+ //document.querySelector("[data-id='LastName']").value = document.querySelector("[data-id='Contact_Name__c']").value
document.querySelector("[data-id='Phone']").value = data.object.phone == null ? '' : data.object.phone;
document.querySelector("[data-id='Email']").value = data.object.email == null ? '' : data.object.email;
unblockUI();
@@ -273,10 +280,11 @@
//1. Check account value
let accountNodeId = document.querySelector("[data-id='Hospital_Name__c']").id + '_lkid';
let accountValue = document.getElementById(accountNodeId).value;
+ let searchContactKeyWord = document.querySelector("[data-id='Contact_Name__c']").value;
console.log(accountValue);
if (accountValue != '000000000000000') {
let baseUrl = "/apex/SearchContactPage";
- let suffixUrl = "?contactId=" + contactNodeId + "&accountId=" + accountValue;
+ let suffixUrl = "?contactId=" + contactNodeId + "&accountId=" + accountValue+"&searchContactKeyWord=" + searchContactKeyWord;
let newSearchContactParam = 'height=600,width=800,left=100,top=100,dialogHide=true,resizable=no,scrollbars=yes,toolbar=no,status=no';
newSearchContactWindow = window.open(baseUrl + suffixUrl, 'Popup', newSearchContactParam);
if (window.focus) {
@@ -323,6 +331,7 @@
}
let queryBackContactName = function queryBackContactName(result){
document.querySelector("[data-id='Contact_Name__c']").value = result.object.lastName;
+ //document.querySelector("[data-id='LastName']").value = result.object.lastName;
};
AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
@@ -338,6 +347,25 @@
// }).then((result) => {
// document.querySelector("[data-id='Contact_Name__c']").value = result.object.lastName;
// })
+ }
+ function queryContactName2() {
+ let sfId = document.getElementById(document.querySelector("[data-id='Contact_Name__c']").id + '_lkid').value;
+ let dataId = '';
+ if ('{!contactsInfo}' != '') {
+ let contactsInfo = JSON.parse('{!contactsInfo}');
+ dataId = contactsInfo[sfId];
+ } else if ('{!contactDataId}' != '') {
+ dataId = '{!contactDataId}';
+ }else{
+ //娌℃湁杩涜鍔犲瘑
+ document.querySelector("[data-id='LastName']").value = document.querySelector("[data-id='Contact_Name__c']").value;
+ return;
+ }
+ let queryBackContactName = function queryBackContactName(result){
+ document.querySelector("[data-id='Contact_Name__c']").value = result.object.lastName;
+ document.querySelector("[data-id='LastName']").value = result.object.lastName;
+ };
+ AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
}
</script>
<div class="bPageTitle">
@@ -431,10 +459,9 @@
//3. Set Readonly Attribute
document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
- //濡傛灉鏄仈绯讳汉杩囨潵鐨勭偣鍑绘柊寤烘剰鍚�
- if('{!isQueryContact}' == '1'){
- //鏌ユ壘瀹㈡埛濮撳悕
- queryContactName();
+ //鏄惁瑙ｅ瘑鑱旂郴浜�
+ if('{!isDecryptContact}' == '1'){
+ queryContactName2();
}
@@ -442,15 +469,13 @@
if ('{!ifc}' != '') {
blockme();
//鐘舵��
- document.querySelector("[data-id='Status']").value = '璺熻繘涓�'
+ document.querySelector("[data-id='Status']").value = '鏈窡杩�'
//浼氳璇㈤棶鍗�
if ('{!ifc.Id}')
document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:15:j_id37_lkid').value = '{!ifc.Id}'
if ('{!ifc.Name}')
document.querySelector("[data-id='Lead_Inquiry_form__c']").value = '{!ifc.Name}'
//瀹㈡埛濮撳悕
- // if('{!ifc.Contact_Name__c}')
- // document.querySelector("[data-id='Contact_Name__c']").value = '{!ifc.Contact_Name__c}'
if ('{!ifc.Contact_Id__c}')
document.getElementById(document.querySelector("[data-id='Contact_Name__c']").id + '_lkid').value = '{!ifc.Contact_Id__c}'
//鍖婚櫌
@@ -482,12 +507,9 @@
//閭欢
if ('{!ifc.Email__c}')
document.querySelector("[data-id='Email']").value = '{!ifc.Email__c}'
- //濮撳悕
- if ('{!ifc.Last_Name__c}')
- document.querySelector("[data-id='LastName']").value = '{!ifc.Last_Name__c}'
//鍜ㄨ鍗曟潵婧�
- if ('{!ifc.LeadSource__c}' && document.querySelector("[data-id='LeadSource__c']"))
- document.querySelector("[data-id='LeadSource__c']").value = '{!ifc.LeadSource__c}'
+ if ('{!ifc.LeadSource__c}' && document.querySelector("[data-id='LeadSource']"))
+ document.querySelector("[data-id='LeadSource']").value = '{!ifc.LeadSource__c}'
//鎰忓悜鍖哄垎
if ('{!ifc.Opportunity_Division__c}')
document.querySelector("[data-id='Opportunity_Division__c']").value = '{!ifc.Opportunity_Division__c}'
@@ -519,41 +541,66 @@
//绱ф��
if ('{!ifc.Urgent__c}')
document.querySelector("[data-id='urgent__c']").checked = '{!ifc.Urgent__c}' == 'false' ? false : true;
+ //鍏徃锛堢瀹わ級 = 绉戝鍚嶇О
+ if(document.querySelector("[data-id='Company']") && document.querySelector("[data-id='Hospital_Name__c']").value != ''){
+ document.querySelector("[data-id='Company']").value = document.querySelector("[data-id='Hospital_Name__c']").value;
+ }
//鏌ユ壘瀹㈡埛濮撳悕
- queryContactName();
+ queryContactName2();
//瑙ｅ瘑
QueryLeadFromAWSIFS();
+
unblockUI();
}
- jQuery(".lookupInput").each(function (i, e) {
- let je = jQuery(e).find('input');
- je.attr("readonly", "");
- je.css("background", "unset");
+ let previous_value = {};
+ jQuery(".lookupInput input").each(function(i,e){
+ let je =jQuery(e);
- let dataid = je.attr('data-id');
- if (['Contact_Name__c'].indexOf(dataid) > -1)
- jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="' + dataid + '" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
- })
+ let dataid = je.attr('data-id');
+ if(['Contact_Name__c'].indexOf(dataid) < 0) return;
- jQuery(".lookupInput").on("mouseenter", "img[generate]", function (e) {
- this.className = "closeIconOn";
- });
+ jQuery(e).focus(function(){
+ previous_value[this.id] = this.value;
+ })
- jQuery(".lookupInput").on("mouseleave", "img[generate]", function (e) {
- this.className = "closeIcon"
- });
+ jQuery(e).change(function(){
+ if (previous_value[this.id] != jQuery(this).val()) {
+ document.getElementById(this.id+'_lkid').value = '';
+ }
+ })
+ })
+ //Updated by Li Jun 20220323 Start
+ // jQuery(".lookupInput").each(function (i, e) {
+ // let je = jQuery(e).find('input');
+ // je.attr("readonly", "");
+ // je.css("background", "unset");
- jQuery(".lookupInput").on("click", "img[generate]", function (e) {
- let id = jQuery("input[data-id='" + jQuery(this).attr("data-id") + "']").attr("id");
- let input = document.getElementById(id);
- if (input) {
- input.value = '';
- let hidden = document.getElementById(id + '_lkid');
- if (hidden) {
- hidden.value = '';
- }
- }
- });
+ // let dataid = je.attr('data-id');
+ // if (['Contact_Name__c'].indexOf(dataid) > -1)
+ // jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="' + dataid + '" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
+ // })
+
+ // jQuery(".lookupInput").on("mouseenter", "img[generate]", function (e) {
+ // this.className = "closeIconOn";
+ // });
+
+ // jQuery(".lookupInput").on("mouseleave", "img[generate]", function (e) {
+ // this.className = "closeIcon"
+ // });
+
+
+ // jQuery(".lookupInput").on("click", "img[generate]", function (e) {
+ // let id = jQuery("input[data-id='" + jQuery(this).attr("data-id") + "']").attr("id");
+ // let input = document.getElementById(id);
+ // if (input) {
+ // input.value = '';
+ // let hidden = document.getElementById(id + '_lkid');
+ // if (hidden) {
+ // hidden.value = '';
+ // }
+ // }
+ // });
+ //Updated by Li Jun 20220323 Start
});
</script>
<div class="pbBottomButtons">
--
Gitblit v1.9.1