From 580549d5dace2d9982e71e18ac931febbe0428da Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 11 四月 2022 18:31:08 +0800
Subject: [PATCH] PIPLCloneIssue0411
---
force-app/main/default/pages/NewAndEditLead.page | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditLead.page b/force-app/main/default/pages/NewAndEditLead.page
index 4fee35a..75bc878 100644
--- a/force-app/main/default/pages/NewAndEditLead.page
+++ b/force-app/main/default/pages/NewAndEditLead.page
@@ -23,8 +23,7 @@
var VLookUpFields = new Set(['Hospital_Name__c', 'Department_Class__c', 'Contact_Name__c', 'Campaign__c', 'Lead_Inquiry_form__c', 'Opp_Name_Search__c']);
function ProcessPI(leadJson, payloadForNewPI) {
blockme();
- if ({!isNewMode
- }) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(leadJson, payloadForNewPI)
}else {
UpdatePIToAWS(leadJson, payloadForNewPI)
@@ -74,15 +73,15 @@
let textEmail = "[data-id='Email']";
let textPhone = "[data-id='Phone']";
//Email
- let email = document.querySelector(textEmail);
- if (email.value != '' && !/^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(email.value)) {
- error_msg += ';閭欢鏍煎紡閿欒';
- }
- let phone = document.querySelector(textPhone);
+ // let email = document.querySelector(textEmail);
+ // if (email.value != '' && !/^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(email.value)) {
+ // error_msg += ';閭欢鏍煎紡閿欒';
+ // }
+ // let phone = document.querySelector(textPhone);
- if (phone.value != '' && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)) {
- error_msg += ';鐢佃瘽鍙风爜閿欒';
- }
+ // if (phone.value != '' && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)) {
+ // error_msg += ';鐢佃瘽鍙风爜閿欒';
+ // }
let es = document.getElementsByTagName('select')
for(let ei in es){
@@ -119,12 +118,26 @@
} else if (nodelist[index].type == 'checkbox') {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].checked;
} else if (nodelist[index].type == 'select-multiple') {
- //nodelist[index].getAttribute("data-id")
+ //After Update By zhj 20220411 Start
let multiple = nodelist[index].getAttribute("data-id");
- let targets = document.querySelector("[data-id=" + multiple + "]").parentNode.children[1].children[0].children[1].children[2].children[0].innerText;
- targets = targets.replace(/\n/g, ";");
- console.log('targets = ' + targets);
- result[nodelist[index].getAttribute("data-id")] = targets;
+ let targets = document.querySelector("[data-id=" + multiple + "]").options;
+ let selValues = [];
+ for(i=0; i < targets.length; i++){
+ if(targets[i].selected){
+ selValues.push(targets[i].value);
+ }
+ }
+ let setValuesStr = JSON.stringify(selValues);
+ setValuesStr = setValuesStr.substring(1,setValuesStr.length-1);
+ if(setValuesStr){
+ setValuesStr = setValuesStr.replace(/"/g,"");
+ if(setValuesStr.indexOf(',')!=-1){
+ setValuesStr = setValuesStr.replace(/,/g,";");
+ }
+ }
+ console.log('targets = ' + setValuesStr);
+ result[nodelist[index].getAttribute("data-id")] = setValuesStr;
+ //After Update By zhj 20220411 end
} else {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].value;
}
@@ -170,7 +183,7 @@
payloadJson.Email_Encrypted__c = r.object[0].emailEncrypt;
//payloadJson.AWS_Data_Id__c = r.object[0].dataId;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
- if (isNewMode) {
+ if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
@@ -500,9 +513,10 @@
document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:4:j_id37_lkid').value = '{!ifc.Department_ID__c}'
//宸叉湁璇环鍚嶇О
if ('{!ifc.Opp_Name_Search__c}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:12:j_id37_lkold').value = '{!ifc.Opp_Name_Search__c}'
+ //document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:12:j_id37_lkold').value = '{!ifc.Opp_Name_Search__c}'
+ document.getElementById(document.querySelector("[data-id='Opp_Name_Search__c']").id + '_lkold').value = '{!ifc.Opp_Name_Search__c}'
if ('{!ifc.Opp_Name_Search_ID__c}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:12:j_id37_lkid').value = '{!ifc.Opp_Name_Search_ID__c}'
+ document.getElementById(document.querySelector("[data-id='Opp_Name_Search__c']").id + '_lkid').value = '{!ifc.Opp_Name_Search_ID__c}'
//涓昏瀛︿細
if ('{!ifc.Campaign__c}')
document.getElementById('page:form:block:j_id34:1:j_id35:j_id36:3:j_id37_lkold').value = '{!ifc.Campaign__c}'
--
Gitblit v1.9.1