From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
index b8e18aa..eaa5ffe 100644
--- a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
+++ b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
@@ -14,6 +14,9 @@
AWSService.sfSessionId = '{!GETSESSIONID()}';
//Initial Required Information
var staticResources = JSON.parse('{!staticResource}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ var staticResourcesV2 = JSON.parse('{!staticResourceV2}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
var VLookUpFields = new Set(['Consum_Apply__c','Consum_Apply_Equipment_Set__c','Asset__c','Canceled__c','DeliverySlip__c','Return_DeliverySlip__c']);
@@ -50,7 +53,8 @@
//Query Required Parameter
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Trial_User__c']").value = data.object.trialUser;
+ if(document.querySelector("[data-id='Trial_User__c']"))
+ document.querySelector("[data-id='Trial_User__c']").value = data.object.trialUser;
unblockUI();
};
@@ -62,7 +66,9 @@
console.log('Result from AWS' + JSON.stringify(r));
console.log('payloadJson=' + JSON.stringify(payloadJson));
payloadJson.Trial_User__c = r.object[0].trialUser;
- payloadJson.Trial_User_Encrypt__c = r.object[0].trialUserEncrypt;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //payloadJson.Trial_User_Encrypt__c = r.object[0].trialUserEncrypt;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
@@ -141,7 +147,8 @@
result[userVLookUpFields[i]] = userVlookUpNodeValue;
}
}
- result.Consum_Apply_Equipment_Set__c = document.querySelector('[data-id=Consum_Apply_Equipment_Set__c]').textContent;
+ debugger
+ //result.Consum_Apply_Equipment_Set__c = document.querySelector('[data-id=Consum_Apply_Equipment_Set__c]').textContent; //zhj MEBG 鏂版柟妗堟敼閫� 2022-12-02
console.log(JSON.stringify(result));
return result;
}
@@ -157,20 +164,28 @@
let obj = JSON.parse(payloadForNewPI);
obj[0].dataId = '{!AWSDataId}';
let payloadForNewPIJson = JSON.stringify(obj);
- AWSService.update(staticResources.updateUrl, consumApplyJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.update(staticResources.updateUrl, consumApplyJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ AWSService.update(staticResourcesV2.updateUrl, consumApplyJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//Insert Sensitive Information to AWS
function NewPIToAWS(consumApplyJson, payloadForNewPI) {
let controllerSaveMethod = '{!$RemoteAction.NewConsumApplyEquipSetDetailController.saveConsumApply}';
- AWSService.insert(staticResources.newUrl, consumApplyJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.insert(staticResources.newUrl, consumApplyJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ AWSService.insert(staticResourcesV2.newUrl, consumApplyJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//Check Required Fields
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 == '') {
--
Gitblit v1.9.1