From 896e69e68ecc01b0b8a4c03dd010e0a31603be6e Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 10 五月 2022 15:13:27 +0800
Subject: [PATCH] Merge branch 'PIPLFunctionReportEnhance0509'
---
force-app/main/default/pages/NewAndEditCase.page | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditCase.page b/force-app/main/default/pages/NewAndEditCase.page
index cea8c3f..5c02f89 100644
--- a/force-app/main/default/pages/NewAndEditCase.page
+++ b/force-app/main/default/pages/NewAndEditCase.page
@@ -3,7 +3,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<style>
.disabledbutton {
pointer-events: none;
@@ -20,11 +20,11 @@
var requiredAPIToChangedLabelMap = new Map();
requiredAPIToChangedLabelMap.set('LastName', '{!PIPL_Name_Label}');
console.log('{!contactsInfo}');
- var VLookUpFields = new Set(['Account__c', 'ContactId', 'Asset__c', 'prod__c', 'Competitor_info__c', 'AccountId', 'Field1_staff__c']);
+ var VLookUpFields = new Set(['Account__c', 'ContactId', 'Asset__c', 'prod__c', 'Competitor_info__c', 'AccountId', 'Field1_staff__c','OwnerId']);
//鍒ゆ柇insert or update
function ProcessPI(caseJson, payloadForNewPI) {
blockme();
- if ({!isNewMode} || {!isCloneMode}) {
+ if ({!isNewMode} || {!isCloneMode}||!'{!AWSDataId}') {//Add by Li Jun, if the awsdataid is blank. go to insert process
NewPIToAWS(caseJson, payloadForNewPI)
}else {
UpdatePIToAWS(caseJson, payloadForNewPI)
@@ -123,7 +123,7 @@
for (let idx = 0; idx < describedbyAll.length; idx++) {
let describedby = describedbyAll[idx];
if (describedby.title.indexOf('Text_attachement__c') > 0){
- result.Text_attachement__c = describedby.contentWindow.document.getElementsByTagName('body')[0].innerHTML;
+ result.Text_attachement__c = describedby.contentWindow.document.getElementsByTagName('body')[0].innerHTML;
if (result.Text_attachement__c == '<br>') {
result.Text_attachement__c = '';
}
@@ -135,7 +135,7 @@
console.log(nodelist[index].id.indexOf('lkwgt'));
if (nodelist[index].id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = nodelist[index].id + '_lkid';
- if (nodelist[index].getAttribute("data-id") == 'Field1_staff__c') {
+ if (nodelist[index].tagName.toLowerCase() == 'div') {
vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
}
let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
@@ -192,10 +192,13 @@
payloadJson.Customer_manual_Encrypted__c = r.object[0].customerManualEncrypt;
//payloadJson.AWS_Data_Id__c = r.object[0].dataId;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
- if (isNewMode || {!isCloneMode}) {
+ if (isNewMode || {!isCloneMode} || !'{!AWSDataId}') {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
+ }
+ if('{!sfRecordIdForEdit}'){
+ payloadJson.Id = '{!sfRecordIdForEdit}';
}
if('{!rtTypeId}'){
payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
@@ -227,13 +230,15 @@
//insert to AWS
function NewPIToAWS(caseJson, payloadForNewPI) {
let controllerSaveMethod = '{!$RemoteAction.NewAndEditCaseController.saveCase}';
- AWSService.insert(staticResources.newUrl, caseJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ AWSService.insert(staticResources.newUrl, caseJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, {!isNewMode}, insertOrUpdateBack, redirectCallBack);
}
//蹇呭～瀛楁
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 {
let fieldAPIValue = requiredFieldAPIList[i]
@@ -531,10 +536,10 @@
// 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 = '';
// }
// }
// });
--
Gitblit v1.9.1