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/NewAndEditReport.page | 188 +++++++++++++++++++++++++++++++++-------------
1 files changed, 135 insertions(+), 53 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 6846592..e7e9c6e 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -1,9 +1,15 @@
-<apex:page standardController="Report__c" extensions="NewAndEditReportController" id="page" lightningStylesheets="true">
- <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
- <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
- <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:page
+ standardController="Report__c"
+ extensions="NewAndEditReportController"
+ id="page"
+>
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
+ <apex:includeScript
+ value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"
+ />
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}" />
<style>
.disabledbutton {
@@ -68,7 +74,7 @@
let t = jQuery("label[for$='textAreaDelegate_"+api_name+"']").parent().next().find("textarea")[0];
if(t && t.id){
return CKEDITOR.instances[t.id]
-
+
}
return null;
}
@@ -227,7 +233,7 @@
// if(phone1 && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone1.value)){
// error_msg += ';淇℃伅鎻愪緵浜鸿仈绯绘柟寮忥紙鐢佃瘽锛夊彿鐮侀敊璇�';
// }
-
+
// let phone2 = document.querySelector(textPhone2);
// if(phone2 && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone2.value)){
// error_msg += ';鑱旂郴鐢佃瘽鍙风爜閿欒';
@@ -262,7 +268,7 @@
}else{
blankRequiredFields =blankRequiredFields+',' + fieldAPIToLabelMap[requiredFieldAPIList[i]];
}
-
+
}
}
return blankRequiredFields;
@@ -290,7 +296,7 @@
}
return ['input','select','textarea','div'].indexOf(tag_name.toLowerCase())>-1;
}
-
+
function IsFormElement(e){
return IsFormTag(e.tagName);
}
@@ -318,7 +324,7 @@
return JSON.stringify(reportPayloadList);
}
-
+
//5.鏂板缓鎴栫紪杈�
function ProcessPI(reportJson, payloadForNewPI) {
@@ -382,7 +388,7 @@
function replaceSearchContactLookup() {
if (!{!isNewMode}) {
queryContactName();
- }
+ }
if(document.querySelector("[data-id='Practitioner1__c']") != null){
let contactHtmlString = '<img src="/img/s.gif" onclick="searchContact(\'page:form:contactId\',\'Practitioner1__c\')" alt="Reference Document Number Lookup" class="lookupIcon" title="Reference Document Number Lookup (New Window)"/>';
let lookUpNode = htmlToElement(contactHtmlString);
@@ -426,8 +432,8 @@
parentNode.replaceChild(lookUpNode, document.querySelector("[data-id='Person_In_Charge__c']").parentNode.children[2]);
}
}
- var newSearchContactWindow = null;
-
+ var newSearchContactWindow = null;
+
function htmlToElement(html) {
var template = document.createElement('template');
html = html.trim(); // Never return a text node of whitespace as the result
@@ -489,8 +495,8 @@
let accountValue = "";
if (document.querySelector("[data-id='Hospital_Department__c']")) {
let accountNodeId = document.querySelector("[data-id='Hospital_Department__c']").id + '_lkid';
- accountValue = document.getElementById(accountNodeId).value;
- }
+ accountValue = document.getElementById(accountNodeId).value;
+ }
console.log(accountValue);
if(accountValue !='000000000000000'){
let baseUrl = "/apex/SearchContactPage";
@@ -630,7 +636,7 @@
let payloadForNewPI = getPIPayload(reportJson);
console.log('鍔犲瘑瀛楁锛�'+payloadForNewPI);
- //5. report to AWS
+ //5. report to AWS
ProcessPI(reportJson, payloadForNewPI);
}
</script>
@@ -638,16 +644,24 @@
<div class="bPageTitle">
<div class="ptBody">
<div class="content">
- <img src="/img/s.gif" alt="鎶ュ憡涔�" class="pageTitleIcon" title="鎶ュ憡涔�" />
- <h1 class="pageType">鎶ュ憡涔�
+ <img
+ src="/img/s.gif"
+ alt="鎶ュ憡涔�"
+ class="pageTitleIcon"
+ title="鎶ュ憡涔�"
+ />
+ <h1 class="pageType">
+ 鎶ュ憡涔�
<span class="titleSeparatingColon">:</span>
</h1>
- <h2 class="pageDescription"> 鏂板缓鎶ュ憡涔�</h2>
+ <h2 class="pageDescription">鏂板缓鎶ュ憡涔�</h2>
<div class="blank"> </div>
</div>
<div class="links">
- <a href="javascript:openPopupFocusEscapePounds(%27https://help.salesforce.com/apex/htdoor?loc=help&target=leads_edit.htm&section=Leads&language=zh_CN&release=234.18.8&instance=CS117&showSplash=true%27, %27Help%27, 700, 600, %27width=700,height=600,resizable=yes,toolbar=yes,status=no,scrollbars=yes,menubar=yes,directories=no,location=no,dependant=no%27, false, false);"
- title="姝ら〉闈㈢殑甯姪 锛堟柊绐楀彛锛�">
+ <a
+ href="javascript:openPopupFocusEscapePounds(%27https://help.salesforce.com/apex/htdoor?loc=help&target=leads_edit.htm&section=Leads&language=zh_CN&release=234.18.8&instance=CS117&showSplash=true%27, %27Help%27, 700, 600, %27width=700,height=600,resizable=yes,toolbar=yes,status=no,scrollbars=yes,menubar=yes,directories=no,location=no,dependant=no%27, false, false);"
+ title="姝ら〉闈㈢殑甯姪 锛堟柊绐楀彛锛�"
+ >
<span class="helpLink">姝ら〉闈㈢殑甯姪</span>
<img src="/img/s.gif" alt="" class="helpIcon" />
</a>
@@ -667,44 +681,89 @@
<tbody>
<tr>
<td class="pbTitle">
- <img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
+ <img
+ src="/img/s.gif"
+ alt=""
+ class="minWidth"
+ title=""
+ width="1"
+ height="1"
+ />
<h2 class="mainTitle">鎶ュ憡涔︾紪杈�</h2>
</td>
- <td class="pbButton" id="topButtonRow" style="pointer-events: none; opacity: 0.4;">
- <input class="btn" type="Button" value="淇濆瓨" onclick="saveReportProcess('Save')" />
- <input class="btn" type="Button" value="淇濆瓨骞舵柊寤�" onclick="saveReportProcess('SaveAndNew')" />
- <apex:commandButton action="{!cancel}" value="鍙栨秷" />
+ <td
+ class="pbButton"
+ id="topButtonRow"
+ style="pointer-events: none; opacity: 0.4"
+ >
+ <input
+ class="btn"
+ type="Button"
+ value="淇濆瓨"
+ onclick="saveReportProcess('Save')"
+ />
+ <input
+ class="btn"
+ type="Button"
+ value="淇濆瓨骞舵柊寤�"
+ onclick="saveReportProcess('SaveAndNew')"
+ />
+ <apex:commandButton
+ action="{!cancel}"
+ value="鍙栨秷"
+ />
</td>
</tr>
</tbody>
</table>
</div>
<!-- Error Msg-->
- <div style="text-align: center;">
+ <div style="text-align: center">
<apex:outputPanel id="errorMsg">
<apex:pageMessages id="msgContent" escape="false" />
</apex:outputPanel>
- </div>
- <br/>
+ </div>
+ <br />
<!-- Iterate the layoutSections, which is a list of sections -->
<apex:repeat value="{!layoutSections}" var="layoutSection">
- <apex:pageBlockSection title="{!layoutSection.name}" showHeader="{!layoutSection.useHeader}" collapsible="{!layoutSection.allowCollapse}"
- columns="{!layoutSection.columns}">
-
+ <apex:pageBlockSection
+ title="{!layoutSection.name}"
+ showHeader="{!layoutSection.useHeader}"
+ collapsible="{!layoutSection.allowCollapse}"
+ columns="{!layoutSection.columns}"
+ >
<!--Each section has layoutFields, let's iterate them as well-->
- <apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
+ <apex:repeat
+ value="{!layoutSection.layoutFields}"
+ var="layoutField"
+ >
<!-- <apex:inputField html-title="{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" styleClass="{!ApiPrefix} {!ApiPrefix}_{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
required="{!layoutField.isRequired}" /> -->
- <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
- required="{!layoutField.isRequired}" />
- <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}"
- required="{!layoutField.isRequired}" />
- <apex:outputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
+ <apex:inputField
+ styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}"
+ html-data-id="{!layoutField.fieldAPI}"
+ value="{!Report__c[layoutField.fieldAPI]}"
+ rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
+ required="{!layoutField.isRequired}"
/>
- <apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
+ <apex:inputField
+ styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}"
+ html-data-id="{!layoutField.fieldAPI}"
+ value="{!Report__c[layoutField.fieldAPI]}"
+ rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}"
+ required="{!layoutField.isRequired}"
+ />
+ <apex:outputField
+ styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}"
+ html-data-id="{!layoutField.fieldAPI}"
+ value="{!Report__c[layoutField.fieldAPI]}"
+ rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
+ />
+ <apex:pageblocksectionitem
+ rendered="{!layoutField.isPlaceHolder}"
+ >
</apex:pageblocksectionitem>
</apex:repeat>
-
</apex:pageBlockSection>
</apex:repeat>
<script>
@@ -716,12 +775,11 @@
if(e.getAttribute("multiple") != 'multiple' || e.style.display == 'none' && e.id.indexOf('selected') < 0){
api_id_map[GetEleApiName(e)] = e.id;
}
-
+
}
}
console.log(api_id_map);
sfdcPage.appendToOnloadQueue(function () {
- debugger
//鍒ゆ柇鏄惁涓哄彧璇婚�夐」
var layoutSections = JSON.parse('{!layoutSectionsStr}');
for (let m = 0; m < layoutSections.length; m++) {
@@ -745,7 +803,7 @@
//1. Set Last Name label
//document.querySelector("[data-id='LastName']").parentNode.parentNode.parentNode.children[2].children[0].innerText = '濮撳悕';
- //2. Query AWS Data by dataId
+ //2. Query AWS Data by dataId
console.log('Mode for Lead Page:' + {!isNewMode});
if (!{!isNewMode}) {
QueryLeadFromAWS();
@@ -765,10 +823,10 @@
document.getElementById(document.querySelector("[data-id='Loaner_request_no1__c']").id + '_lkid').value = '{!no1Id}'
}
}
-
+
document.getElementById('topButtonRow').style = '';
document.getElementById('bottomButtonRow').style = '';
-
+
let previous_value = {};
jQuery(".lookupInput input").each(function(i,e){
let je =jQuery(e);
@@ -823,17 +881,41 @@
<tbody>
<tr>
<td class="pbTitle">
- <img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" /> </td>
- <td class="pbButtonb" id="bottomButtonRow" style="pointer-events: none; opacity: 0.4;">
- <input class="btn" type="Button" value="淇濆瓨" onclick="saveReportProcess('Save')" />
- <input class="btn" type="Button" value="淇濆瓨骞舵柊寤�" onclick="saveReportProcess('SaveAndNew')" />
- <apex:commandButton action="{!cancel}" value="鍙栨秷" />
+ <img
+ src="/img/s.gif"
+ alt=""
+ class="minWidth"
+ title=""
+ width="1"
+ height="1"
+ />
+ </td>
+ <td
+ class="pbButtonb"
+ id="bottomButtonRow"
+ style="pointer-events: none; opacity: 0.4"
+ >
+ <input
+ class="btn"
+ type="Button"
+ value="淇濆瓨"
+ onclick="saveReportProcess('Save')"
+ />
+ <input
+ class="btn"
+ type="Button"
+ value="淇濆瓨骞舵柊寤�"
+ onclick="saveReportProcess('SaveAndNew')"
+ />
+ <apex:commandButton
+ action="{!cancel}"
+ value="鍙栨秷"
+ />
</td>
</tr>
</tbody>
</table>
</div>
</apex:pageblock>
-
</apex:form>
-</apex:page>
\ No newline at end of file
+</apex:page>
--
Gitblit v1.9.1