From cad0ca5abc735a90c02d1ab021151c73bc0958e1 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 09 五月 2022 17:15:23 +0800
Subject: [PATCH] Add Report URL 0509
---
force-app/main/default/pages/NewAndEditReport.page | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 97c0d49..bcb1395 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -3,7 +3,7 @@
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<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 {
@@ -46,7 +46,7 @@
//閿欒鎻愮ず
function alertErrorMessage(errorMsg) {
- let errorMsgNode = document.getElementById("page:form:j_id5:msgContent");
+ let errorMsgNode = document.getElementById("page:form:pageBlock:msgContent");
errorMsg = '閿欒锛氭棤鏁堟暟鎹��'+'\n' + errorMsg;
errorMsgNode.innerText = errorMsg;
errorMsgNode.className = 'pbError';
@@ -54,7 +54,7 @@
EditButton(false);
}
function hiddenErrorMsgNode() {
- let errorMsgNode = document.getElementById("page:form:j_id5:msgContent");
+ let errorMsgNode = document.getElementById("page:form:pageBlock:msgContent");
errorMsgNode.innerText = '';
errorMsgNode.className = '';
}
@@ -179,7 +179,7 @@
// if(document.querySelector("[aria-describedby = 'cke_38']")){
// result.VOC_follow_up_result__c = document.querySelector("[aria-describedby = 'cke_38']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
// }
- // //瀵瑰簲缁撴灉绗竴娆� VOC_follow_up_result1__c cke_71
+ // //瀵瑰簲缁撴灉绗竴娆� VOC_follow_up_result1__c cke_71
// if(document.querySelector("[aria-describedby = 'cke_71']")){
// result.VOC_follow_up_result1__c = document.querySelector("[aria-describedby = 'cke_71']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
// }
@@ -196,7 +196,7 @@
function validateFieldValueFormate() {
//VOC_Informer_Contact__c,Caller_phone_c__c
let error_msg = '';
- // let textEmail = "[data-id=' Follow_staff_email__c']";
+ // let textEmail = "[data-id=' Follow_staff_email__c']";
// let textPhone1 = "[data-id='VOC_Informer_Contact__c']";
// let textPhone2 = "[data-id='Caller_phone_c__c']";
// //Email
@@ -234,7 +234,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 == ''){
@@ -270,8 +272,8 @@
}
return ['input','select','textarea'].indexOf(tag_name.toLowerCase())>-1;
}
-
- function IsFormElement(e){
+
+ function IsFormElement(e){
return IsFormTag(e.tagName);
}
@@ -622,7 +624,7 @@
<!-- <apex:outputPanel id="errorMsg">
<apex:pageMessages id="msgContent" escape="false" />
</apex:outputPanel> -->
- <apex:pageblock >
+ <apex:pageblock id="pageBlock">
<div class="pbHeader">
<table cellspacing="0" cellpadding="0" border="0">
<tbody>
@@ -725,7 +727,7 @@
}
}
- document.getElementById('topButtonRow').style = '';
+ document.getElementById('topButtonRow').style = '';
document.getElementById('bottomButtonRow').style = '';
let previous_value = {};
--
Gitblit v1.9.1