From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/pages/NewRepair.page | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/pages/NewRepair.page b/force-app/main/default/pages/NewRepair.page
index d2fbfff..a013c31 100644
--- a/force-app/main/default/pages/NewRepair.page
+++ b/force-app/main/default/pages/NewRepair.page
@@ -24,8 +24,9 @@
var staticResources = JSON.parse('{!staticResource}');
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
@@ -150,14 +151,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;
@@ -252,22 +264,32 @@
var queryBack = function queryBack(data) {
console.log(data);
- document.querySelector("[data-id='address_Contacts__c']").value = data.object.addressContacts;
- document.querySelector("[data-id='address_Contacts_Name__c']").value = data.object.addressContactsName;
- document.querySelector("[data-id='address_Telephone__c']").value = data.object.addressTelephone;
- document.querySelector("[data-id='address_ZipCode__c']").value = data.object.addressZipCode;
- document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
- document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicant;
+ if(document.querySelector("[data-id='address_Contacts__c']"))
+ document.querySelector("[data-id='address_Contacts__c']").value = data.object.addressContacts;
+ if(document.querySelector("[data-id='address_Contacts_Name__c']"))
+ document.querySelector("[data-id='address_Contacts_Name__c']").value = data.object.addressContactsName;
+ if(document.querySelector("[data-id='address_Telephone__c']"))
+ document.querySelector("[data-id='address_Telephone__c']").value = data.object.addressTelephone;
+ if(document.querySelector("[data-id='address_ZipCode__c']"))
+ document.querySelector("[data-id='address_ZipCode__c']").value = data.object.addressZipCode;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
+ if(document.querySelector("[data-id='RepairApplicant__c']"))
+ document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicant;
AWSService.query(staticResourceAddress.queryUrl, '{!DecryptAWSDataId}', queryBackDecrypt, staticResourceAddress.token);
};
var queryBackContact = function queryBack(data) {
console.log(data);
- document.querySelector("[data-id='address_Contacts__c']").value = data.object.lastName;
+ if(document.querySelector("[data-id='address_Contacts__c']"))
+ document.querySelector("[data-id='address_Contacts__c']").value = data.object.lastName;
};
var queryBackDecrypt = function queryBack(data) {
- document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
- document.querySelector("[data-id='address_ZipCode__c']").value = data.object.zipCode;
- document.querySelector("[data-id='address_Telephone__c']").value = data.object.telephone;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
+ if(document.querySelector("[data-id='address_ZipCode__c']"))
+ document.querySelector("[data-id='address_ZipCode__c']").value = data.object.zipCode;
+ if(document.querySelector("[data-id='address_Telephone__c']"))
+ document.querySelector("[data-id='address_Telephone__c']").value = data.object.telephone;
AWSService.query(staticResourceContact.queryUrl, '{!ContactAWSDataId}', queryBackContact, staticResourceContact.token);
}
@@ -290,7 +312,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for (i = 0; i < requiredFieldAPIList.length; i++) {
- if (formData[requiredFieldAPIList[i]]) {
+ if (formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)) {
+ continue;
+ }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
} else {
if (blankRequiredFields == '') {
@@ -506,10 +530,12 @@
blockme();//add by Li Jun 20220428 By Li Jun
var staticResourceRepairSubOrder = JSON.parse('{!staticResourceRepairSubOrder}');
let queryBackRepairSubOrder = function queryBackRepairSubOrder(data) {
- document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicantName;
+ if(document.querySelector("[data-id='RepairApplicant__c']"))
+ document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicantName;
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