From 5c01ebbfddb6b8674430b47c22977bea2e350084 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 13 四月 2022 10:58:46 +0800
Subject: [PATCH] BackupPIPLFunction0413
---
force-app/main/default/pages/NewAndEditReport.page | 124 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 5c4b6ed..bd565c3 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -46,6 +46,15 @@
errorMsgNode.className = '';
}
+ function getCKEinstance(api_name){
+ let t = jQuery("label[for$='textAreaDelegate_"+api_name+"']").parent().next().find("textarea")[0];
+ if(t && t.id){
+ return CKEDITOR.instances[t.id]
+
+ }
+ return null;
+ }
+
//1銆傝幏鍙栨墍鏈夊瓧娈靛��
function getReportInformation() {
let nodelist = document.querySelectorAll("[data-id]");
@@ -63,11 +72,36 @@
result[nodelist[index].getAttribute("data-id")] = nodelist[index].checked;
} else if (nodelist[index].type == 'select-multiple') {
//nodelist[index].getAttribute("data-id")
+ //let targets = document.querySelector("[data-id=" + multiple + "]").nextSibling.children[0].children[1].children[2].innerText;
+ //Before Update By Li Jun 20220411
+ // let targets = document.querySelector("[data-id=" + multiple + "]").parentNode.children[2].children[0].children[1].children[2].children[0].innerText;
+ // targets = targets.replace(/\n/g, ";");
+ // console.log('targets = ' + targets);
+ // result[nodelist[index].getAttribute("data-id")] = targets;
+ //Before Update By Li Jun 20220411
+
+ //After Update By Li Jun 20220411 Start
let multiple = nodelist[index].getAttribute("data-id");
- let targets = document.querySelector("[data-id=" + multiple + "]").nextSibling.children[0].children[1].children[2].innerText;
- targets = targets.replace(/\n/g, ";");
- console.log('targets = ' + targets);
- result[nodelist[index].getAttribute("data-id")] = targets;
+ let targets = document.querySelector("[data-id=" + multiple + "]").options;
+ let selValues = [];
+ for(i=0; i < targets.length; i++){
+ if(targets[i].selected){
+ selValues.push(targets[i].value);
+ }
+ }
+ let setValuesStr = JSON.stringify(selValues);
+ setValuesStr = setValuesStr.substring(1,setValuesStr.length-1);
+ if(setValuesStr){
+ setValuesStr = setValuesStr.replace(/"/g,"");
+ if(setValuesStr.indexOf(',')!=-1){
+ setValuesStr = setValuesStr.replace(/,/g,";");
+ }
+ }
+ console.log('targets = ' + setValuesStr);
+ result[nodelist[index].getAttribute("data-id")] = setValuesStr;
+ //After Update By Li Jun 20220411 End
+
+
} else {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].value;
}
@@ -85,30 +119,48 @@
result.Purpose2__c = document.getElementById('page:form:j_id5:j_id35:2:j_id36:j_id37:1:j_id38').value;
}
//瀵屾枃鏈璧嬪��
+ if(getCKEinstance('Customer_sigh_photo__c')){
+ result.Customer_sigh_photo__c = getCKEinstance('Customer_sigh_photo__c').getData()
+ }
+ if(getCKEinstance('Photo1__c')){
+ result.Photo1__c = getCKEinstance('Photo1__c').getData()
+ }
+ if(getCKEinstance('Photo2__c')){
+ result.Photo2__c = getCKEinstance('Photo2__c').getData()
+ }
+ if(getCKEinstance('Photo3__c')){
+ result.Photo3__c = getCKEinstance('Photo3__c').getData()
+ }
+ if(getCKEinstance('VOC_follow_up_result__c')){
+ result.VOC_follow_up_result__c = getCKEinstance('VOC_follow_up_result__c').getData()
+ }
+ if(getCKEinstance('VOC_follow_up_result1__c')){
+ result.VOC_follow_up_result1__c = getCKEinstance('VOC_follow_up_result1__c').getData()
+ }
//鐢ㄦ埛绛惧瓧鐨勭収鐗�
- if(document.querySelector("[aria-describedby = 'cke_34']")){
- result.Customer_sigh_photo__c = document.querySelector("[aria-describedby = 'cke_34']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
- }
- //鐓х墖1 Photo1__c
- if(document.querySelector("[aria-describedby = 'cke_42']")){
- result.Photo1__c = document.querySelector("[aria-describedby = 'cke_42']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
- }
- //鐓х墖2 Photo2__c
- if(document.querySelector("[aria-describedby = 'cke_75']")){
- result.Photo2__c = document.querySelector("[aria-describedby = 'cke_75']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
- }
- //鐓х墖3 Photo3__c
- if(document.querySelector("[aria-describedby = 'cke_108']")){
- result.Photo3__c = document.querySelector("[aria-describedby = 'cke_108']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
- }
- //瀵瑰簲缁撴灉 VOC_follow_up_result__c cke_38
- 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
- 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(document.querySelector("[aria-describedby = 'cke_34']")){
+ // result.Customer_sigh_photo__c = document.querySelector("[aria-describedby = 'cke_34']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
+ // }
+ // //鐓х墖1 Photo1__c
+ // if(document.querySelector("[aria-describedby = 'cke_42']")){
+ // result.Photo1__c = document.querySelector("[aria-describedby = 'cke_42']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
+ // }
+ // //鐓х墖2 Photo2__c
+ // if(document.querySelector("[aria-describedby = 'cke_75']")){
+ // result.Photo2__c = document.querySelector("[aria-describedby = 'cke_75']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
+ // }
+ // //鐓х墖3 Photo3__c
+ // if(document.querySelector("[aria-describedby = 'cke_108']")){
+ // result.Photo3__c = document.querySelector("[aria-describedby = 'cke_108']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
+ // }
+ // //瀵瑰簲缁撴灉 VOC_follow_up_result__c cke_38
+ // 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
+ // 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';
}
@@ -202,7 +254,7 @@
//5.鏂板缓鎴栫紪杈�
function ProcessPI(reportJson, payloadForNewPI) {
blockme();
- if ({!isNewMode}) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(reportJson, payloadForNewPI)
}else {
UpdatePIToAWS(reportJson, payloadForNewPI)
@@ -439,8 +491,9 @@
payloadJson.age_Encrypted__c = result.object[0].ageEncrypt;
payloadJson.Medical_History_Encrypted__c = result.object[0].medicalHistoryEncrypt;
payloadJson.sex_Encrypted__c = result.object[0].sexEncrypt;
- if (isNewMode) {
+ if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = result.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
@@ -547,7 +600,7 @@
<!--Each section has layoutFields, let's iterate them as well-->
<apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
- <apex:inputField html-data-id="{!layoutField.fieldAPI}" styleClass="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
+ <apex:inputField html-title="{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" styleClass="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
required="{!layoutField.isRequired}" />
<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
</apex:pageblocksectionitem>
@@ -564,7 +617,16 @@
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);
+ let e = document.querySelector("[data-id='"+layoutField.fieldAPI+"']");
+ e.disabled = !(layoutField.editableField);
+ if (!(layoutField.editableField)) {
+ if (e.getAttribute("multiple") && e.getAttribute("multiple") == 'multiple') {
+ e.parentNode.classList.add("disabledbutton");
+ }
+ if (e.tagName == 'DIV') {
+ e.classList.add("disabledbutton");
+ }
+ }
}
}
}
--
Gitblit v1.9.1