From d3e4451e36fbe25da4427bccd4e6b41aefd473c8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 14:53:16 +0800
Subject: [PATCH] newclass0626formate
---
force-app/main/default/pages/NewRepair.page | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/NewRepair.page b/force-app/main/default/pages/NewRepair.page
index 20b67eb..822db24 100644
--- a/force-app/main/default/pages/NewRepair.page
+++ b/force-app/main/default/pages/NewRepair.page
@@ -22,10 +22,14 @@
var staticResourceContact = JSON.parse('{!staticResourceContact}');
var staticResourceAddress = JSON.parse('{!staticResourceAddress}');
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(['Delivered_Product__c','Hospital__c','Department_Class__c','Account__c','Dealer__c','Incharge_Staff_Contact__c','Maintenance_Contract__c','VM_Maintenance_Contract__c','Repair_Quotation_Id__c','RepairSubOrder__c','On_Call_ID__c','QIS_ID__c','InsReport__c','NFM108_Receipt__c','Rental_Apply_Equipment_Set_Detail__c']);
- var userVLookUpFields = ['Incharge_Staff__c','Repair_Authenticator__c','OCSM_RC_CordingUser__c','OSH_Affirmant__c','OSHRAConfirmUser__c'];
+ //var VLookUpFields = new Set(['Source_QIS__c', 'AC_PAED__c', 'RC_PAED__c', 'Delivered_Product__c','Maintenance_Contract_Asset_Estimate__c','Asset__c','TransferApplyDetail__c','Hospital__c','Department_Class__c','Account__c','Dealer__c','Incharge_Staff_Contact__c','Maintenance_Contract__c','Repair_Alternative_ProductList_c__c','VM_Maintenance_Contract__c','Repair_Quotation_Id__c','RepairSubOrder__c','On_Call_ID__c','QIS_ID__c','InsReport__c','NFM108_Receipt__c','Rental_Apply_Equipment_Set_Detail__c']);
+ var VLookUpFields = {! VLookUpFieldsJson};
+ var userVLookUpFields = ['Incharge_Staff__c','Repair_Authenticator__c','OCSM_RC_CordingUser__c','OSH_Affirmant__c','OSHRAConfirmUser__c', 'Repair_Determine_result_ConfirmationUser__c', 'ZongjianApprovalManager__c', 'BuchangApprovalManager__c', 'JingliApprovalManager__c', 'Repair_complete_asset_final_check_staff__c', ''];
var redirectMode = 'Save';
//Redirect Required Parameter
@@ -88,12 +92,12 @@
payloadJson.address_ZipCode__c = r.object[0].addressZipCode;
payloadJson.Detailed_Address__c = r.object[0].detailedAddress;
payloadJson.RepairApplicant__c = r.object[0].repairApplicant;
- payloadJson.Address_Contacts_Encrypt__c = r.object[0].addressContactsEncrypt;
- payloadJson.Address_Contacts_Name_Encrypt__c = r.object[0].addressContactsNameEncrypt;
- payloadJson.Address_Telephone_Encrypt__c = r.object[0].addressTelephoneEncrypt;
- payloadJson.Address_ZipCode_Encrypt__c = r.object[0].addressZipCodeEncrypt;
- payloadJson.Detailed_Address_Encrypt__c = r.object[0].detailedAddressEncrypt;
- payloadJson.Repair_Applicant_Encrypt__c = r.object[0].repairApplicantEncrypt;
+ // payloadJson.Address_Contacts_Encrypt__c = r.object[0].addressContactsEncrypt;
+ // payloadJson.Address_Contacts_Name_Encrypt__c = r.object[0].addressContactsNameEncrypt;
+ // payloadJson.Address_Telephone_Encrypt__c = r.object[0].addressTelephoneEncrypt;
+ // payloadJson.Address_ZipCode_Encrypt__c = r.object[0].addressZipCodeEncrypt;
+ // payloadJson.Detailed_Address_Encrypt__c = r.object[0].detailedAddressEncrypt;
+ // payloadJson.Repair_Applicant_Encrypt__c = r.object[0].repairApplicantEncrypt;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
@@ -150,14 +154,25 @@
let nodelist = document.querySelectorAll("[data-id]");
let result = {}
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(document.getElementById(vlookUpNodeId)!=null){
- let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
- result[nodelist[index].getAttribute("data-id")] = vlookUpNodeValue;
+ if (tag_name == 'div') {
+ vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
}
+ 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;
@@ -287,22 +302,28 @@
let obj = JSON.parse(payloadForNewPI);
obj[0].dataId = '{!AWSDataId}';
let payloadForNewPIJson = JSON.stringify(obj);
- AWSService.update(staticResources.updateUrl, repairJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.update(staticResources.updateUrl, repairJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ AWSService.update(staticResourcesV2.updateUrl, repairJson, payloadForNewPIJson, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//Insert Sensitive Information to AWS
function NewPIToAWS(repairJson, payloadForNewPI) {
let controllerSaveMethod = '{!$RemoteAction.NewRepairController.saveRepair}';
- AWSService.insert(staticResources.newUrl, repairJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.insert(staticResources.newUrl, repairJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ AWSService.insert(staticResourcesV2.newUrl, repairJson, payloadForNewPI, controllerSaveMethod, staticResourcesV2.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]] && !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 {
if (blankRequiredFields == '') {
@@ -523,6 +544,7 @@
unblockUI();//add by Li Jun 20220428 By Li Jun
EditButton(false);//add by Li Jun 20220428 By Li Jun
};
+ debugger;
AWSService.query(staticResourceRepairSubOrder.queryUrl, '{!RepairSubOrderAWSDataId}', queryBackRepairSubOrder, staticResourceRepairSubOrder.token);
}
--
Gitblit v1.9.1