From 4238b5408fde989099dc289e4f830ac3c1a0a6d3 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 11 五月 2022 17:04:57 +0800
Subject: [PATCH] Page Enhance 0511
---
force-app/main/default/pages/NewConsumApply.page | 235 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 167 insertions(+), 68 deletions(-)
diff --git a/force-app/main/default/pages/NewConsumApply.page b/force-app/main/default/pages/NewConsumApply.page
index 5f78415..f9386a3 100644
--- a/force-app/main/default/pages/NewConsumApply.page
+++ b/force-app/main/default/pages/NewConsumApply.page
@@ -2,7 +2,7 @@
@description :
@author : ChangeMeIn@UserSettingsUnder.SFDoc
@group :
- @last modified on : 03-18-2022
+ @last modified on : 03-30-2022
@last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Consum_Apply__c" extensions="NewConsumApplyController" id="page">
@@ -10,7 +10,7 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<style>
.disabledbutton {
pointer-events: none;
@@ -26,6 +26,19 @@
var VLookUpFields = new Set(['Loaner_medical_Staff__c', 'Hospital__c', 'Strategic_dept__c', 'Account__c', 'QIS_number__c', 'OPDPlan__c', 'Campaign__c', 'Rental_Apply__c', 'Shipment_address__c', 'Dealer__c', 'Old_Consum_Apply__c', 'DeliverySlip__c', 'OwnerId', 'OPD__c']);
var userVLookUpFields = ['Person_In_Charge__c', 'applyUser__c', 'CC_EmailUser__c', 'Assign_Person__c', 'Consum_Assistant__c', 'Consum_Assistant2__c', 'Consum_Assistant3__c', 'SalesManager__c', 'ZongjianApprovalManager__c', 'BuchangApprovalManagerSales__c', 'TongkuoZongjian__c'];
var redirectMode = 'Save';
+
+ function EditButton(isDisabled){
+ var topele = document.getElementById('topButtonRow');
+ var bottomele = document.getElementById('bottomButtonRow');
+
+ if (isDisabled) {
+ topele.classList.add("disabledbutton");
+ bottomele.classList.add("disabledbutton");
+ }else {
+ topele.classList.remove("disabledbutton");
+ bottomele.classList.remove("disabledbutton");
+ }
+ }
//Redirect Required Parameter
var redirectCallBack = function redirectCallBack(sfId,errorMessage) {
@@ -44,8 +57,10 @@
//Query Required Parameter
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
- document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
+ if(document.querySelector("[data-id='Phone_number__c']"))
+ document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
+ if(document.querySelector("[data-id='direct_shippment_address__c']"))
+ document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
unblockUI();
};
@@ -60,10 +75,14 @@
payloadJson.Phone_Number_Encrypt__c = r.object[0].phoneNumberEncrypt;
payloadJson.Direct_Shippment_Address_Encrypt__c = r.object[0].directShippmentAddressEncrypt;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
- if (isNewMode) {
+ if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
+ }
+ if('{!rtTypeId}'){
+ payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
}
return payloadJson;
}
@@ -71,8 +90,7 @@
// New Or Edit
function ProcessPI(consumApplyJson, payloadForNewPI) {
blockme();
- if ({!isNewMode
- }) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(consumApplyJson, payloadForNewPI)
}else {
UpdatePIToAWS(consumApplyJson, payloadForNewPI)
@@ -126,7 +144,7 @@
//瀵屾枃鏈�
if(document.querySelector("[aria-describedby = 'cke_34']")){
result.HP_received_sign_rich__c = document.querySelector("[aria-describedby = 'cke_34']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
- }
+ }
for (let index = 0; index < nodelist.length; index++) {
if (VLookUpFields.has(nodelist[index].getAttribute("data-id"))) {
console.log(nodelist[index].id.indexOf('lkwgt'));
@@ -153,11 +171,41 @@
}
}
for (let i = 0; i < userVLookUpFields.length; i++) {
- let userVlookUpNodeValue = document.querySelector("[data-id='" + userVLookUpFields[i] + "']").children[1].value;
- console.log('userVlookUpNodeValue:'+userVlookUpNodeValue);
- if(userVlookUpNodeValue!='000000000000000'){
- result[userVLookUpFields[i]] = userVlookUpNodeValue;
- }
+ if(document.querySelector("[data-id='" + userVLookUpFields[i] + "']")!=null){
+ let userVlookUpNodeValue = document.querySelector("[data-id='" + userVLookUpFields[i] + "']").children[1].value;
+ console.log('userVlookUpNodeValue:'+userVlookUpNodeValue);
+ if(userVlookUpNodeValue!='000000000000000'){
+ result[userVLookUpFields[i]] = userVlookUpNodeValue;
+ }
+ }
+ }
+ //鏍煎紡鍖栨椂闂�
+ if(result.pickup_time__c){
+ result.pickup_time__c = result.pickup_time__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Request_Shipping_7days_Before__c){
+ result.Request_Shipping_7days_Before__c = result.Request_Shipping_7days_Before__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Request_shipping_day__c){
+ result.Request_shipping_day__c = result.Request_shipping_day__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Consum_Received_Day__c){
+ result.Consum_Received_Day__c = result.Consum_Received_Day__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Request_demo_time__c){
+ result.Request_demo_time__c = result.Request_demo_time__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Request_approval_time__c){
+ result.Request_approval_time__c = result.Request_approval_time__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Application_accept_time__c){
+ result.Application_accept_time__c = result.Application_accept_time__c.replace(/\//g, '-')+':00';
+ }
+ if(result.Request_answer_time__c){
+ result.Request_answer_time__c = result.Request_answer_time__c.replace(/\//g, '-')+':00';
+ }
+ if(result.HP_received_sign_rich__c == '<br>'){
+ result.HP_received_sign_rich__c = '';
}
console.log(JSON.stringify(result));
return result;
@@ -187,7 +235,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for (i = 0; i < requiredFieldAPIList.length; i++) {
- if (formData[requiredFieldAPIList[i]]) {
+ if (formData[requiredFieldAPIList[i]] && !VLookUpFields.has(requiredFieldAPIList[i])) {
+ continue;
+ }else if(VLookUpFields.has(requiredFieldAPIList[i]) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
} else {
if (blankRequiredFields == '') {
@@ -203,6 +253,8 @@
//Base Process
function saveConsumApplyProcess(saveMode) {
+ EditButton(true);
+
redirectMode = saveMode;
console.log('redirectMode' + redirectMode);
hiddenErrorMsgNode();
@@ -231,16 +283,17 @@
//Alert Error Message
function alertErrorMessage(errorMsg) {
- let errorMsgNode = document.getElementById("page:form:msgContent");
+ let errorMsgNode = document.getElementById("page:form:block:msgContent");
errorMsg = '閿欒锛氭棤鏁堟暟鎹��' + '\n' + errorMsg;
errorMsgNode.innerText = errorMsg;
errorMsgNode.className = 'pbError';
unblockUI();
+ EditButton(false);
}
//Hide Error Message
function hiddenErrorMsgNode() {
- let errorMsgNode = document.getElementById("page:form:msgContent");
+ let errorMsgNode = document.getElementById("page:form:block:msgContent");
errorMsgNode.innerText = '';
errorMsgNode.className = '';
}
@@ -264,10 +317,16 @@
return template.content.firstChild;
}
function queryContactName() {
- // let sfId = document.getElementById(document.querySelector("[data-id='Account__c']").id + '_lkid').value;
- // let contactsInfo = JSON.parse('{!contactsInfo}');
- // let dataId = contactsInfo[sfId];
- // let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
+ let sfId = document.getElementById(document.querySelector("[data-id='Loaner_medical_Staff__c']").id + '_lkid').value;
+ let contactsInfo = JSON.parse('{!contactsInfo}');
+ let dataId = contactsInfo[sfId];
+ let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
+ let queryBackContactName = function queryBackContactName(result){
+ if(document.querySelector("[data-id='Loaner_medical_Staff__c']"))
+ document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
+ //document.querySelector("[data-id='LastName']").value = result.object.lastName;
+ };
+ AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
// fetch(url, {
// method: 'GET',
// headers: {
@@ -279,18 +338,6 @@
// }).then((result) => {
// document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
// })
- let sfId = document.getElementById(document.querySelector("[data-id='Account__c']").id + '_lkid').value;
- let dataId = '';
- if ('{!contactsInfo}' != '') {
- let contactsInfo = JSON.parse('{!contactsInfo}');
- dataId = contactsInfo[sfId];
- } else if ('{!AWSDataId}' != '') {
- dataId = '{!AWSDataId}';
- }
- let queryBackContactName = function queryBackContactName(result){
- document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
- };
- AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
}
//鑷畾涔塴ookup鏌ヨ
function searchContact(contactNodeId){
@@ -299,10 +346,11 @@
let accountNodeId = document.querySelector("[data-id='Account__c']").id + '_lkid';
accountValue = document.getElementById(accountNodeId).value;
}
+ let searchContactKeyWord = document.querySelector("[data-id='Loaner_medical_Staff__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) {
@@ -348,11 +396,7 @@
</div>
<apex:form id="form">
<apex:inputHidden value="{!contactId}" id="contactId"/>
- <!-- Error Msg-->
- <apex:outputPanel id="errorMsg">
- <apex:pageMessages id="msgContent" escape="false" />
- </apex:outputPanel>
- <apex:pageblock >
+ <apex:pageblock id="block">
<div class="pbHeader">
<table cellspacing="0" cellpadding="0" border="0">
<tbody>
@@ -361,7 +405,7 @@
<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
<h2 class="mainTitle">鑰楁潗澶囧搧鐢宠缂栬緫</h2>
</td>
- <td class="pbButton" id="topButtonRow">
+ <td class="pbButton" id="topButtonRow" style="pointer-events: none; opacity: 0.4;">
<input class="btn" type="Button" value="淇濆瓨" onclick="saveConsumApplyProcess('Save')" />
<input class="btn" type="Button" value="淇濆瓨骞舵柊寤�" onclick="saveConsumApplyProcess('SaveAndNew')" />
<apex:commandButton action="{!cancel}" value="鍙栨秷" />
@@ -370,14 +414,24 @@
</tbody>
</table>
</div>
+ <!-- Error Msg-->
+ <div style="text-align: center;">
+ <apex:outputPanel id="errorMsg">
+ <apex:pageMessages id="msgContent" escape="false" />
+ </apex:outputPanel>
+ </div>
<!-- Iterate the layoutSections, which is a list of sections -->
<apex:repeat value="{!layoutSections}" var="layoutSection">
<apex:pageBlockSection title="{!layoutSection.name}" collapsible="{!layoutSection.allowCollapse}" columns="{!layoutSection.columns}">
<!--Each section has layoutFields, let's iterate them as well-->
<apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
- <apex:inputField html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
+ <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
required="{!layoutField.isRequired}" />
+ <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}"
+ required="{!layoutField.isRequired}" />
+ <apex:outputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
+ />
<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
</apex:pageblocksectionitem>
</apex:repeat>
@@ -387,13 +441,37 @@
<script>
//Append Page
sfdcPage.appendToOnloadQueue(function () {
+ debugger
var layoutSections = JSON.parse('{!layoutSectionsStr}');
for (let m = 0; m < layoutSections.length; m++) {
let layoutSection = layoutSections[m].layoutFields;
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");
+ }
+ // let id = 'page:form:block:j_id34:10:j_id35:j_id36:0:j_id37';
+ // let id2 = 'page:form:block:j_id34:9:j_id35:j_id36:0:j_id37'
+ // let lookUpSuffix = '_lkwgt';
+ // // if(document.getElementById(id)){
+ // // document.getElementById(id).classList.add("disabledbutton");
+ // // document.getElementById(id + lookUpSuffix).classList.add("disabledbutton");
+ // // }
+ // if(document.getElementById(id2)){
+ // document.getElementById(id2 + lookUpSuffix).classList.add("disabledbutton");
+ // }
+ if(document.querySelectorAll("[data-id='Old_Consum_Apply__c']")){
+ document.querySelectorAll("[data-id='Old_Consum_Apply__c']")[0].classList.add("disabledbutton")
+ document.querySelectorAll("[data-id='Old_Consum_Apply__c']")[1].classList.add("disabledbutton")
+ }
+ }
}
}
}
@@ -406,36 +484,57 @@
//Replace Vlookup Field
replaceSearchContactLookup();
document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
+
+ document.getElementById('topButtonRow').style = '';
+聽 聽 聽 聽 聽 聽 聽document.getElementById('bottomButtonRow').style = '';
- 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(['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;">');
- })
-
- 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 = '';
+ if(['Loaner_medical_Staff__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 = '';
}
- }
+ })
});
+
+ // 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(['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;">');
+ // })
+
+ // 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 = '';
+ // }
+ // }
+ // });
});
</script>
@@ -445,7 +544,7 @@
<tr>
<td class="pbTitle">
<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" /> </td>
- <td class="pbButtonb" id="bottomButtonRow">
+ <td class="pbButtonb" id="bottomButtonRow" style="pointer-events: none; opacity: 0.4;">
<input class="btn" type="Button" value="淇濆瓨" onclick="saveConsumApplyProcess('Save')" />
<input class="btn" type="Button" value="淇濆瓨骞舵柊寤�" onclick="saveConsumApplyProcess('SaveAndNew')" />
<apex:commandButton action="{!cancel}" value="鍙栨秷" />
--
Gitblit v1.9.1