From ac719375874fd50fad5a11f8e04ac3329081bd0b Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期五, 08 四月 2022 22:58:44 +0800
Subject: [PATCH] Fix Weekly Report
---
force-app/main/default/pages/NewAndEditAddress.page | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditAddress.page b/force-app/main/default/pages/NewAndEditAddress.page
index ee20ca4..a767a50 100644
--- a/force-app/main/default/pages/NewAndEditAddress.page
+++ b/force-app/main/default/pages/NewAndEditAddress.page
@@ -2,7 +2,7 @@
@description :
@author : ChangeMeIn@UserSettingsUnder.SFDoc
@group :
- @last modified on : 03-17-2022
+ @last modified on : 03-23-2022
@last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Address__c" extensions="NewAndEditAddressController" id="page">
@@ -237,13 +237,13 @@
//1. Get Address Information from Form
let addressJson = getAddressInformation();
//2. Validate the Address field value formate, for example the email formate or phone formate
- let validationResultMessage = validateFieldValueFormate();
- console.log(validationResultMessage);
- if (validationResultMessage) {
- //Popup error message. - To Do After POC
- alertErrorMessage(validationResultMessage);
- return
- }
+ // let validationResultMessage = validateFieldValueFormate();
+ // console.log(validationResultMessage);
+ // if (validationResultMessage) {
+ // //Popup error message. - To Do After POC
+ // alertErrorMessage(validationResultMessage);
+ // return
+ // }
// Check Required Field
let checkRequiredFieldMsgResult = checkRequiredFieldMsg(addressJson);
if (checkRequiredFieldMsgResult) {
@@ -282,10 +282,11 @@
//1. Check account value
let accountNodeId = document.querySelector("[data-id='Customer__c']").id + '_lkid';
let accountValue = document.getElementById(accountNodeId).value;
+ let searchContactKeyWord = document.querySelector("[data-id='Customer__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) {
@@ -417,7 +418,16 @@
for (let n = 0; n < layoutSection.length; n++) {
let layoutField = layoutSection[n];
if (layoutField.fieldAPI != '' && document.querySelector("[data-id='"+layoutField.fieldAPI+"']") != null) {
- document.querySelector("[data-id='"+layoutField.fieldAPI+"']").disabled = !(layoutField.editableField);
+ let e = document.querySelector("[data-id='"+layoutField.fieldAPI+"']");
+ e.disabled = !(layoutField.editableField);
+ if (!(layoutField.editableField)) {
+ if (e.getAttribute("multiple") && e.getAttribute("multiple") == 'multiple') {
+ e.parentNode.classList.add("disabledbutton");
+ }
+ if (e.tagName == 'DIV') {
+ e.classList.add("disabledbutton");
+ }
+ }
}
}
}
@@ -432,14 +442,15 @@
//Replace Vlookup Field
replaceSearchContactLookup();
//3. Set Readonly Attribute
- // document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
+ // document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
+ /*
jQuery(".lookupInput").each(function(i,e){
let je =jQuery(e).find('input');
je.attr("readonly","");
je.css("background","unset");
let dataid = je.attr('data-id');
- if(['Province__c', 'OwnerId'].indexOf(dataid) > -1) return;
+ if(['Hospital_Name__c','Department_Class__c','OwnerId'].indexOf(dataid) > -1) return;
jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="'+dataid+'" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
})
@@ -455,13 +466,33 @@
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');
+ input.value = '';
+ let hidden = document.getElementById(id+'_lkid');
if(hidden){
- hidden.value = '';
+ hidden.value = '';
}
}
});
+ */
+
+ let previous_value = {};
+ jQuery(".lookupInput input").each(function(i,e){
+ let je =jQuery(e);
+
+ let dataid = je.attr('data-id');
+ if(['Contacts__c'].indexOf(dataid) < 0) return;
+
+ jQuery(e).focus(function(){
+ previous_value[this.id] = this.value;
+ })
+
+ jQuery(e).change(function(){
+ if (previous_value[this.id] != jQuery(this).val()) {
+ document.getElementById(this.id+'_lkid').value = '';
+ }
+ })
+ })
+
});
</script>
<div class="pbBottomButtons">
--
Gitblit v1.9.1