From 69dc5df6ec51f6f7f6737c61d9c4c1e7757a2b96 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 17 三月 2022 21:05:08 +0800
Subject: [PATCH] PIPLFixBugs0317V1
---
force-app/main/default/pages/NewAndEditReport.page | 108 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 7b10a4b..fe838e7 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -77,15 +77,12 @@
}
}
//鎵嬫湳鍒嗙被1
- result.Technical_Category1__c = document.getElementById('page:form:j_id30:j_id60:4:j_id61:j_id62:2:j_id63')!=null?document.getElementById('page:form:j_id30:j_id60:4:j_id61:j_id62:2:j_id63').value:'';
+ result.Technical_Category1__c = document.getElementById('page:form:j_id5:j_id35:4:j_id36:j_id37:2:j_id38')!=null?document.getElementById('page:form:j_id5:j_id35:4:j_id36:j_id37:2:j_id38').value:'';
//鎵嬫湳鍒嗙被2
- result.Technical_Category2__c = document.getElementById('page:form:j_id30:j_id60:4:j_id61:j_id62:4:j_id63')!=null?document.getElementById('page:form:j_id30:j_id60:4:j_id61:j_id62:4:j_id63').value:'';
+ result.Technical_Category2__c = document.getElementById('page:form:j_id5:j_id35:4:j_id36:j_id37:4:j_id38')!=null?document.getElementById('page:form:j_id5:j_id35:4:j_id36:j_id37:4:j_id38').value:'';
//鐩殑2
- if(document.getElementById('page:form:j_id30:j_id60:3:j_id61:j_id62:1:j_id63')){
- result.Purpose2__c = document.getElementById('page:form:j_id30:j_id60:3:j_id61:j_id62:1:j_id63').value;
- }
- if(document.getElementById('page:form:j_id30:j_id60:2:j_id61:j_id62:1:j_id63')){
- result.Purpose2__c = document.getElementById('page:form:j_id30:j_id60:2:j_id61:j_id62:1:j_id63').value;
+ if(document.getElementById('page:form:j_id5:j_id35:2:j_id36:j_id37:1:j_id38')){
+ result.Purpose2__c = document.getElementById('page:form:j_id5:j_id35:2:j_id36:j_id37:1:j_id38').value;
}
//瀵屾枃鏈璧嬪��
//鐢ㄦ埛绛惧瓧鐨勭収鐗�
@@ -111,6 +108,12 @@
//瀵瑰簲缁撴灉绗竴娆� 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
+ }
+ if(result.From__c){
+ result.From__c = result.From__c.replace(/\//g, '-')+':00';
+ }
+ if(result.To__c){
+ result.To__c = result.To__c.replace(/\//g, '-')+':00';
}
return result;
}
@@ -309,55 +312,46 @@
if(document.querySelector("[data-id='Practitioner1__c']") != null){
let sfId = document.getElementById(document.querySelector("[data-id='Practitioner1__c']").id + '_lkid').value;
let dataId = contactsInfo[sfId];
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- queryContactNameFetch(url,'Practitioner1__c');
+ let url = staticResourcesContact.queryUrl;
+ queryContactNameFetch(url,dataId,'Practitioner1__c');
}
if(document.querySelector("[data-id='Practitioner2__c']") != null){
let sfId = document.getElementById(document.querySelector("[data-id='Practitioner2__c']").id + '_lkid').value;
let dataId = contactsInfo[sfId];
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- queryContactNameFetch(url,'Practitioner2__c');
+ let url = staticResourcesContact.queryUrl;
+ queryContactNameFetch(url,dataId,'Practitioner2__c');
}
if(document.querySelector("[data-id='Practitioner3__c']") != null){
let sfId = document.getElementById(document.querySelector("[data-id='Practitioner3__c']").id + '_lkid').value;
let dataId = contactsInfo[sfId];
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- queryContactNameFetch(url,'Practitioner3__c');
+ let url = staticResourcesContact.queryUrl;
+ queryContactNameFetch(url,dataId,'Practitioner3__c');
}
if(document.querySelector("[data-id='Practitioner4__c']") != null){
let sfId = document.getElementById(document.querySelector("[data-id='Practitioner4__c']").id + '_lkid').value;
let dataId = contactsInfo[sfId];
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- queryContactNameFetch(url,'Practitioner4__c');
+ let url = staticResourcesContact.queryUrl;
+ queryContactNameFetch(url,dataId,'Practitioner4__c');
}
if(document.querySelector("[data-id='Practitioner5__c']") != null){
let sfId = document.getElementById(document.querySelector("[data-id='Practitioner5__c']").id + '_lkid').value;
let dataId = contactsInfo[sfId];
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- queryContactNameFetch(url,'Practitioner5__c');
+ let url = staticResourcesContact.queryUrl;
+ queryContactNameFetch(url,dataId,'Practitioner5__c');
}
if(document.querySelector("[data-id='Person_In_Charge__c']") != null){
let sfId = document.getElementById(document.querySelector("[data-id='Person_In_Charge__c']").id + '_lkid').value;
let dataId = contactsInfo[sfId];
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- queryContactNameFetch(url,'Person_In_Charge__c');
+ let url = staticResourcesContact.queryUrl;
+ queryContactNameFetch(url,dataId,'Person_In_Charge__c');
}
}
- function queryContactNameFetch(url,filedId){
- fetch(url, {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'pi-token': staticResources.token
- }
- }).then((data) => {
- return data.json();
- }).then((result) => {
- if(result.object){
- document.querySelector("[data-id="+filedId+"]").value = result.object.lastName;
- }
- })
+ function queryContactNameFetch(url,dataId,filedId){
+ let queryBackContactNameFetch = function queryBackContactNameFetch(result){
+ document.querySelector("[data-id="+filedId+"]").value = result.object.lastName;
+ };
+ AWSService.query(url, dataId, queryBackContactNameFetch, staticResources.token);
}
//鑷畾涔塴ookup鏌ヨ
@@ -405,6 +399,11 @@
//鏂板缓缂栬緫鍥炶皟鍑芥暟
var insertOrUpdateBack = function insertOrUpdateBack(payloadJson, result, isNewMode) {
console.log(result);
+ if(result.status != '0'){
+ unblockUI();
+ console.log('鍥炶皟鍑芥暟鍑洪敊鎷�')
+ return
+ }
console.log('Result from AWS' + result);
console.log('payloadJson=' + payloadJson);
payloadJson.VOC_Informer_Name__c = result.object[0].vocInformerName;
@@ -476,7 +475,7 @@
// 3. Check Required Field
let checkRequiredFieldMsgResult = checkRequiredFieldMsg(reportJson);
if (checkRequiredFieldMsgResult) {
- alertErrorMessage('{!requiredErrorMsg}'+checkRequiredFieldMsgResult);
+ alertErrorMessage('{!Input_Required_Field_Msg}'+checkRequiredFieldMsgResult);
return
}
//4. Prepare the payload for New PI API To AWS - To Do
@@ -556,6 +555,18 @@
</apex:repeat>
<script>
sfdcPage.appendToOnloadQueue(function () {
+ //鍒ゆ柇鏄惁涓哄彧璇婚�夐」
+ var layoutSections = JSON.parse('{!layoutSectionsStr}');
+ for (let m = 0; m < layoutSections.length; m++) {
+ let layoutSection = layoutSections[m].layoutFields;
+ for (let n = 0; n < layoutSection.length; n++) {
+ let layoutField = layoutSection[n];
+ if (layoutField.fieldAPI != '' && document.querySelector("[data-id='"+layoutField.fieldAPI+"']") != null) {
+ document.querySelector("[data-id='"+layoutField.fieldAPI+"']").disabled = !(layoutField.editableField);
+ }
+ }
+ }
+
//1. Set Last Name label
//document.querySelector("[data-id='LastName']").parentNode.parentNode.parentNode.children[2].children[0].innerText = '濮撳悕';
//2. Query AWS Data by dataId
@@ -567,6 +578,35 @@
replaceSearchContactLookup();
//3. Set Readonly Attribute
document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
+ jQuery(".lookupInput").each(function (i, e) {
+ let je = jQuery(e).find('input');
+ je.attr("readonly", "");
+ je.css("background", "unset");
+
+ let dataid = je.attr('data-id');
+ if (['Practitioner1__c','Practitioner2__c','Practitioner3__c','Practitioner4__c','Practitioner5__c','Person_In_Charge__c'].indexOf(dataid) > -1)
+ jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="' + dataid + '" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
+ })
+
+ jQuery(".lookupInput").on("mouseenter", "img[generate]", function (e) {
+ this.className = "closeIconOn";
+ });
+
+ jQuery(".lookupInput").on("mouseleave", "img[generate]", function (e) {
+ this.className = "closeIcon"
+ });
+
+ jQuery(".lookupInput").on("click", "img[generate]", function (e) {
+ let id = jQuery("input[data-id='" + jQuery(this).attr("data-id") + "']").attr("id");
+ let input = document.getElementById(id);
+ if (input) {
+ input.value = '';
+ let hidden = document.getElementById(id + '_lkid');
+ if (hidden) {
+ hidden.value = '';
+ }
+ }
+ });
});
</script>
<div class="pbBottomButtons">
--
Gitblit v1.9.1