From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/pages/ConsumTrial.page | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/pages/ConsumTrial.page b/force-app/main/default/pages/ConsumTrial.page
index d546908..f18613b 100644
--- a/force-app/main/default/pages/ConsumTrial.page
+++ b/force-app/main/default/pages/ConsumTrial.page
@@ -432,14 +432,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;
@@ -456,7 +458,9 @@
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
}
document.getElementById(awsDataId+'_PI').remove();
@@ -519,6 +523,17 @@
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();
+ window.location.href='/apex/ConsumTrial?id=' + '{!parId}' + '&canedit=true&saveType=1';
+ return;
+ }
saveRecord();
}
@@ -535,8 +550,8 @@
console.log('confirmCallBack = '+JSON.stringify(result))
x++;
if(x == txIds.length){
- refopener();
- unblockUI();
+ //refopener();
+ //unblockUI();
window.location.href='/apex/ConsumTrial?id=' + '{!parId}' + '&canedit=true&saveType=1';
}
}
@@ -551,12 +566,13 @@
function saveRecordJS(){
if('{!pageB.fixMode}' != 'true'){
+ unblockUI();
return
}
q3().then(function(data){
return q4(data);
})
- unblockUI();
+ //unblockUI();
}
//2022 02 24 寮犲崕寤� display PI Data end
</script>
--
Gitblit v1.9.1