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/ConsumTrialUpdate.page | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/ConsumTrialUpdate.page b/force-app/main/default/pages/ConsumTrialUpdate.page
index 00d5674..591da9f 100644
--- a/force-app/main/default/pages/ConsumTrialUpdate.page
+++ b/force-app/main/default/pages/ConsumTrialUpdate.page
@@ -326,14 +326,16 @@
if(awsDataId.length == 0){
return
}
- if(TrialUser[awsDataId.substring(0,18)] == null){
+ let index = awsDataId.indexOf('_');
+ console.log('show index = ' + index);
+ if(TrialUser[awsDataId.substring(0,index)] == null){
return
}
console.log('awsDataId Value:'+awsDataId);
let parentNode = document.getElementById(awsDataId);
let createDiv = document.createElement("div");
createDiv.id = awsDataId+"_PI";
- let piInformation = TrialUser[awsDataId.substring(0,18)].trialUser
+ let piInformation = TrialUser[awsDataId.substring(0,index)].trialUser
//let piInformation = 'Name:'+contact['943114607025717249'].lastName +'\n' +'Phone:'+contact['943114607025717249'].phone
createDiv.innerText = piInformation;
let x=window.event.x;
@@ -350,7 +352,9 @@
if(awsDataId.length == 0){
return
}
- if(TrialUser[awsDataId.substring(0,18)] == null){
+ let index = awsDataId.indexOf('_');
+ console.log('hide index = ' + index);
+ if(TrialUser[awsDataId.substring(0,index)] == null){
return
}
document.getElementById(awsDataId+'_PI').remove();
@@ -409,10 +413,22 @@
function q4(){
debugger
+ let b = false;
+ for(var i=0;i<rowBList.length;i++){
+ if(document.getElementById('allPage:allForm:dataBlock:dataline_L:'+i+':rowCheck').checked == true){
+ b = true;
+ }
+ }
+ if(!b){
+ //unblockUI();
+ refopener();
+ return;
+ }
saveRecord();
}
function saveRecordJS(){
if('{!pageB.fixMode}' != 'true'){
+ unblockUI();
return
}
// q3().then(function(data){
--
Gitblit v1.9.1