From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/NewAndEditCase.page | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditCase.page b/force-app/main/default/pages/NewAndEditCase.page
index 3646fcf..98c0e00 100644
--- a/force-app/main/default/pages/NewAndEditCase.page
+++ b/force-app/main/default/pages/NewAndEditCase.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Case" extensions="NewAndEditCaseController" id="page">
+<apex:page standardController="Case" extensions="NewAndEditCaseController" id="page" lightningStylesheets="true">
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -13,6 +13,9 @@
<script>
AWSService.sfSessionId = '{!GETSESSIONID()}';
var staticResources = JSON.parse('{!staticResource}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ var staticResourcesV2 = JSON.parse('{!staticResourceV2}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
var staticResourcesContact = JSON.parse('{!staticResourceContact}');
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
@@ -20,11 +23,12 @@
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','OwnerId']);
+ //var VLookUpFields = new Set(['Account__c', 'ContactId', 'Asset__c', 'prod__c', 'Competitor_info__c', 'AccountId', 'Field1_staff__c','OwnerId']);
+ var VLookUpFields = {! VLookUpFieldsJson};
//鍒ゆ柇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)
@@ -131,15 +135,25 @@
}
}
for (let index = 0; index < nodelist.length; index++) {
- if (VLookUpFields.has(nodelist[index].getAttribute("data-id"))) {
+ let tag_name = nodelist[index].tagName.toLowerCase();
+ if(tag_name == 'div'){
+ console.log(nodelist[index])
+ }
+ if (VLookUpFields.indexOf(nodelist[index].getAttribute("data-id")) >= 0) {
console.log(nodelist[index].id.indexOf('lkwgt'));
if (nodelist[index].id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = nodelist[index].id + '_lkid';
- if (nodelist[index].tagName.toLowerCase() == 'div') {
+ if (tag_name == 'div') {
vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
}
- let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
- result[nodelist[index].getAttribute("data-id")] = vlookUpNodeValue;
+ let vlookUpNodeValue = document.getElementById(vlookUpNodeId);
+ let v = '';
+ if(vlookUpNodeValue){
+ v = vlookUpNodeValue.value;
+ }else{
+ v = nodelist[index].value;
+ }
+ result[nodelist[index].getAttribute("data-id")] = v;
}
} else if (nodelist[index].type == 'checkbox') {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].checked;
@@ -187,15 +201,20 @@
payloadJson.cic_telephone__c = r.object[0].cicTelephone;
payloadJson.CASE_CUSTOMER__c = r.object[0].caseCustomer;
payloadJson.Customer_manual__c = r.object[0].customerManual;
- payloadJson.cic_telephone_Encrypted__c = r.object[0].cicTelephoneEncrypt;
- payloadJson.CASE_CUSTOMER_Encrypted__c = r.object[0].caseCustomerEncrypt;
- payloadJson.Customer_manual_Encrypted__c = r.object[0].customerManualEncrypt;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ // payloadJson.cic_telephone_Encrypted__c = r.object[0].cicTelephoneEncrypt;
+ // payloadJson.CASE_CUSTOMER_Encrypted__c = r.object[0].caseCustomerEncrypt;
+ // payloadJson.Customer_manual_Encrypted__c = r.object[0].customerManualEncrypt;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
//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
@@ -222,20 +241,26 @@
let obj = JSON.parse(payloadForNewPI);
obj[0].dataId = '{!AWSDataId}';
let payloadForNewPIJson = JSON.stringify(obj);
- AWSService.update(staticResources.updateUrl, caseJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.update(staticResources.updateUrl, caseJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ AWSService.update(staticResourcesV2.updateUrl, caseJson, payloadForNewPIJson, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//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);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.insert(staticResources.newUrl, caseJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, {!isNewMode}, insertOrUpdateBack, redirectCallBack);
+ AWSService.insert(staticResourcesV2.newUrl, caseJson, payloadForNewPI, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, {!isNewMode}, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//蹇呭～瀛楁
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for (i = 0; i < requiredFieldAPIList.length; i++) {
- if (formData[requiredFieldAPIList[i]] && !VLookUpFields.has(requiredFieldAPIList[i])) {
+ if (formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)) {
continue;
- }else if(VLookUpFields.has(requiredFieldAPIList[i]) && formData[requiredFieldAPIList[i]] != '000000000000000'){
+ }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
} else {
let fieldAPIValue = requiredFieldAPIList[i]
@@ -458,6 +483,17 @@
if (layoutField.fieldAPI != '' && document.querySelector("[data-id='"+layoutField.fieldAPI+"']") != null) {
let e = document.querySelector("[data-id='"+layoutField.fieldAPI+"']");
e.disabled = !(layoutField.editableField);
+ // update 20220621 By Chen Yanan Start
+ if(e.tagName == 'TEXTAREA' && layoutField.fieldAPI!= 'Staff_manual__c'){
+ console.log('add element');
+ e.cols = "75";
+ e.rows = "6";
+ } else if(e.tagName == 'TEXTAREA' && layoutField.fieldAPI == 'Staff_manual__c'){
+ console.log('add element');
+ e.cols = "40";
+ e.rows = "2";
+ }
+ // update 20220621 By Chen Yanan End
/*
if (!(layoutField.editableField)) {
if (e.getAttribute("multiple") && e.getAttribute("multiple") == 'multiple') {
--
Gitblit v1.9.1