From 8badb57ea2c82557850ad5b39281c3e8714eb119 Mon Sep 17 00:00:00 2001
From: liuyan <liuyan@prec-tech.com>
Date: 星期四, 24 十一月 2022 10:08:31 +0800
Subject: [PATCH] 科室信息漏传SPO问题
---
force-app/main/default/pages/NewRepair.page | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/pages/NewRepair.page b/force-app/main/default/pages/NewRepair.page
index 642fc66..20b67eb 100644
--- a/force-app/main/default/pages/NewRepair.page
+++ b/force-app/main/default/pages/NewRepair.page
@@ -10,7 +10,7 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<style>
.disabledbutton {
pointer-events: none;
@@ -100,7 +100,9 @@
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
- debugger
+ if('{!rtTypeId}'){
+ payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
+ }
return payloadJson;
}
@@ -230,7 +232,19 @@
console.log(JSON.stringify(result));
return result;
}
+
+ function EditButton(isDisabled){
+ var topele = document.getElementById('topButtonRow');
+ var bottomele = document.getElementById('bottomButtonRow');
+ if (isDisabled) {
+ topele.classList.add("disabledbutton");
+ bottomele.classList.add("disabledbutton");
+ }else {
+ topele.classList.remove("disabledbutton");
+ bottomele.classList.remove("disabledbutton");
+ }
+ }
//Query from AWS
function QueryRepairFromAWS() {
AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
@@ -238,22 +252,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);
}
@@ -276,7 +300,9 @@
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 == '') {
@@ -292,6 +318,7 @@
//Base Process
function saveRepairProcess(saveMode) {
+ EditButton(true);
redirectMode = saveMode;
console.log('redirectMode' + redirectMode);
hiddenErrorMsgNode();
@@ -325,6 +352,7 @@
errorMsgNode.innerText = errorMsg;
errorMsgNode.className = 'pbError';
unblockUI();
+ EditButton(false);
}
//Hide Error Message
@@ -486,9 +514,14 @@
//濡傛灉浠庢姤淇瓙鍗曡繃鏉ワ紝闇�瑕佽В瀵嗘姤淇汉
if('{!RepairSubOrderAWSDataId}' != ''){
+ EditButton(true);//add by Li Jun 20220428 By Li Jun
+ 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
};
AWSService.query(staticResourceRepairSubOrder.queryUrl, '{!RepairSubOrderAWSDataId}', queryBackRepairSubOrder, staticResourceRepairSubOrder.token);
}
--
Gitblit v1.9.1