From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/NewAndEditReport.page | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 28 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 4d2acfa..6846592 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Report__c" extensions="NewAndEditReportController" id="page">
+<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)}"/>
@@ -13,16 +13,21 @@
</style>
<script>
+ sforce.connection.sessionId = '{!GETSESSIONID()}';
AWSService.sfSessionId = '{!GETSESSIONID()}';
var staticResources = JSON.parse('{!staticResource}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ var staticResourcesV2 = JSON.parse('{!staticResourceV2}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
var staticResourcesContact = JSON.parse('{!staticResourceContact}');
var redirectMode = 'Save';//1. Save 2. SaveAndNew
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
- var VLookUpFields = new Set(['Hospital_Reference__c','Consum_Apply__c','Department_Class_Ref__c', 'Daily_Report__c', 'OwnerId','Hospital_Department__c',
- 'Competition_Company_Name__c','Report_OPDPlan__c','Loaner_request_no1__c','Practitioner1__c','Practitioner2__c','Practitioner3__c','Practitioner4__c',
- 'Practitioner5__c','Opportunity1__c',
- 'Opportunity2__c','Product01__c','Product1__c','Product2__c','Product3__c','Product4__c','Product5__c','Order_No__c','Person_In_Charge__c']);
+ // var VLookUpFields = new Set(['Hospital_Reference__c','Consum_Apply__c','Department_Class_Ref__c', 'Daily_Report__c', 'OwnerId','Hospital_Department__c',
+ // 'Competition_Company_Name__c','Report_OPDPlan__c','Loaner_request_no1__c','Practitioner1__c','Practitioner2__c','Practitioner3__c','Practitioner4__c',
+ // 'Practitioner5__c','Opportunity1__c','Responsible_Person__c',
+ // 'Opportunity2__c','Product01__c','Product1__c','Product2__c','Product3__c','Product4__c','Product5__c','Order_No__c','Person_In_Charge__c','CIC_Number__c']);
+ var VLookUpFields = {! VLookUpFieldsJson};
var closeField = '';
// var myCkeditor = null;
// try {
@@ -74,12 +79,25 @@
let result = {}
result.RecordTypeId = '{!rtTypeId}';
for (let index = 0; index < nodelist.length; index++) {
- if (VLookUpFields.has(nodelist[index].getAttribute("data-id"))) {
+ let tag_name = nodelist[index].tagName.toLowerCase();
+ if(tag_name == 'div'){
+ console.log(nodelist[index])
+ }
+ if (VLookUpFields.indexOf(nodelist[index].getAttribute("data-id")) >= 0) {
console.log(nodelist[index].id.indexOf('lkwgt'));
if (nodelist[index].id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = nodelist[index].id + '_lkid';
- let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
- result[nodelist[index].getAttribute("data-id")] = vlookUpNodeValue;
+ if (tag_name == 'div') {
+ vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
+ }
+ let vlookUpNodeValue = document.getElementById(vlookUpNodeId);
+ let v = '';
+ if(vlookUpNodeValue){
+ v = vlookUpNodeValue.value;
+ }else{
+ v = nodelist[index].value;
+ }
+ result[nodelist[index].getAttribute("data-id")] = v;
}
} else if (nodelist[index].type == 'checkbox') {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].checked;
@@ -234,7 +252,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for(i = 0;i<requiredFieldAPIList.length;i++){
- if(formData[requiredFieldAPIList[i]]){
+ if (formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)) {
+ continue;
+ }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
}else{
if(blankRequiredFields == ''){
@@ -268,7 +288,7 @@
if (!tag_name) {
return false;
}
- return ['input','select','textarea'].indexOf(tag_name.toLowerCase())>-1;
+ return ['input','select','textarea','div'].indexOf(tag_name.toLowerCase())>-1;
}
function IsFormElement(e){
@@ -313,7 +333,10 @@
//鏂板缓
function NewPIToAWS(reportJson, payloadForNewPI) {
let controllerSaveMethod = '{!$RemoteAction.NewAndEditReportController.saveReport}';
- AWSService.insert(staticResources.newUrl, reportJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.insert(staticResources.newUrl, reportJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, {!isNewMode}, insertOrUpdateBack, redirectCallBack);
+ AWSService.insert(staticResourcesV2.newUrl, reportJson, payloadForNewPI, controllerSaveMethod, staticResourcesV2.token, staticResourcesV2.transactionUrl, {!isNewMode}, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//缂栬緫
@@ -322,7 +345,10 @@
let obj = JSON.parse(payloadForNewPI);
obj[0].dataId = '{!AWSDataId}';
let payloadForNewPIJson = JSON.stringify(obj);
- AWSService.update(staticResources.updateUrl, reportJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.update(staticResources.updateUrl, reportJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
+ AWSService.update(staticResourcesV2.updateUrl, reportJson, payloadForNewPIJson, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//鏌ヨ
@@ -525,29 +551,42 @@
payloadJson.Medical_History__c = result.object[0].medicalHistory;
payloadJson.sex__c = result.object[0].sex;
- payloadJson.VOC_Informer_Name_Encrypted__c = result.object[0].vocInformerNameEncrypt;
- payloadJson.Caller_phone_c_Encrypted__c = result.object[0].callerPhoneEncrypt;
- payloadJson.VOC_Informer_Contact_Encrypted__c = result.object[0].vocInformerContactEncrypt;
- payloadJson.Person_In_Charge_Text_Encrypted__c = result.object[0].personInChargeTextEncrypt;
- payloadJson.Professor_sigh_text_Encrypted__c = result.object[0].professorSighTextEncrypt;
- payloadJson.Staff_Info_Manual_c_Encrypted__c = result.object[0].staffInfoManualEncrypt;
- payloadJson.Responsible_Person_HP_c_Encrypted__c = result.object[0].responsiblePersonHPEncrypt;
- payloadJson.Practitioner1_Part_Encrypted__c = result.object[0].practitioner1PartEncrypt;
- payloadJson.Practitioner2_Part_Encrypted__c = result.object[0].practitioner2PartEncrypt;
- payloadJson.Practitioner3_Part_Encrypted__c = result.object[0].practitioner3PartEncrypt;
- payloadJson.Practitioner4_Part_Encrypted__c = result.object[0].practitioner4PartEncrypt;
- payloadJson.Practitioner5_Part_Encrypted__c = result.object[0].practitioner5PartEncrypt;
- 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;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ // payloadJson.VOC_Informer_Name_Encrypted__c = result.object[0].vocInformerNameEncrypt;
+ // payloadJson.Caller_phone_c_Encrypted__c = result.object[0].callerPhoneEncrypt;
+ // payloadJson.VOC_Informer_Contact_Encrypted__c = result.object[0].vocInformerContactEncrypt;
+ // payloadJson.Person_In_Charge_Text_Encrypted__c = result.object[0].personInChargeTextEncrypt;
+ // payloadJson.Professor_sigh_text_Encrypted__c = result.object[0].professorSighTextEncrypt;
+ // payloadJson.Staff_Info_Manual_c_Encrypted__c = result.object[0].staffInfoManualEncrypt;
+ // payloadJson.Responsible_Person_HP_c_Encrypted__c = result.object[0].responsiblePersonHPEncrypt;
+ // payloadJson.Practitioner1_Part_Encrypted__c = result.object[0].practitioner1PartEncrypt;
+ // payloadJson.Practitioner2_Part_Encrypted__c = result.object[0].practitioner2PartEncrypt;
+ // payloadJson.Practitioner3_Part_Encrypted__c = result.object[0].practitioner3PartEncrypt;
+ // payloadJson.Practitioner4_Part_Encrypted__c = result.object[0].practitioner4PartEncrypt;
+ // payloadJson.Practitioner5_Part_Encrypted__c = result.object[0].practitioner5PartEncrypt;
+ // 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;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+
if (isNewMode || {!isCloneMode}||!'{!AWSDataId}') {//Add by Li Jun for PIPL 20220413
payloadJson.AWS_Data_Id__c = result.object[0].dataId;
delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
+ if('{!sfRecordIdForEdit}'){
+ payloadJson.Id = '{!sfRecordIdForEdit}';
+ }
if('{!rtTypeId}'){
payloadJson.RecordTypeId = '{!rtTypeId}';//Add by Li Jun for Record Type Issue 20220421
+ }
+ if('{!isCloneMode}' == 'true'){
+ var reportId = '{!sfRecordIdForEdit}';
+ var r = sforce.connection.query("select Practitioner4__c,Practitioner5__c from Report__c where id='"+reportId+"'")
+ payloadJson.Practitioner4__c = r.getArray("records")[0].Practitioner4__c
+ payloadJson.Practitioner5__c = r.getArray("records")[0].Practitioner5__c
+ payloadJson.Id = null
}
return payloadJson;
}
@@ -682,6 +721,7 @@
}
console.log(api_id_map);
sfdcPage.appendToOnloadQueue(function () {
+ debugger
//鍒ゆ柇鏄惁涓哄彧璇婚�夐」
var layoutSections = JSON.parse('{!layoutSectionsStr}');
for (let m = 0; m < layoutSections.length; m++) {
@@ -713,7 +753,8 @@
//Replace Vlookup Field
replaceSearchContactLookup();
//3. Set Readonly Attribute
- document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
+ if(document.querySelector("[data-id='OwnerId']"))
+ document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
//濡傛灉鏄疧PD璁″垝杩囨潵鐨�
if('{!no1Name}' != '' && '{!no1Id}' != ''){
--
Gitblit v1.9.1