From 744f42c5496e656a1f9927740a3b37c0b97a6cba Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:34:12 +0800
Subject: [PATCH] lexcommunityupload0714

---
 force-app/main/default/pages/ConsumTrial.page |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/force-app/main/default/pages/ConsumTrial.page b/force-app/main/default/pages/ConsumTrial.page
index d546908..c1f5089 100644
--- a/force-app/main/default/pages/ConsumTrial.page
+++ b/force-app/main/default/pages/ConsumTrial.page
@@ -394,13 +394,15 @@
                 console.log('杩涘叆q2'+value)
                 for(var i=0;i<ids.length;i++){
                     console.log('i = '+i);
-                    document.getElementById(ids[i]).children[0].children[0].children[0].value = TrialUser[ids[i].substring(0,18)].trialUser;
+                    //document.getElementById(ids[i]).children[0].children[0].children[0].value = TrialUser[ids[i].substring(0,18)].trialUser;
+                    document.getElementById(ids[i]).children[0].children[0].children[0].value = TrialUser[ids[i].split('_')[0]].trialUser;      //zhj 鏀瑰杽鍙栧�� 2022-12-30
                     console.log('i = '+i);
                 }
             }); 
         }
         
         function queryUser(){
+            debugger
             rowBList = JSON.parse('{!rowListString}')
             console.log('pageB.fixMode = '+'{!pageB.fixMode}')
             if('{!pageB.fixMode}' == 'true'){
@@ -432,14 +434,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 +460,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();
@@ -474,7 +480,7 @@
                 let newCallBack = function newCallBack(result,indexNumber){
                     //璧嬪�糳ataId鍜宼rialUser
                     document.getElementById('allPage:allForm:dataBlock:dataline_R_aws:'+indexNumber+':EditAWSDataId').value = result.object[0].dataId;
-                    document.getElementById('allPage:allForm:dataBlock:dataline_R_aws:'+indexNumber+':TrialUserEncrypt').value = result.object[0].trialUserEncrypt;
+                    //document.getElementById('allPage:allForm:dataBlock:dataline_R_aws:'+indexNumber+':TrialUserEncrypt').value = result.object[0].trialUserEncrypt;       //zhj 鏂版柟妗堟敼閫� 2022-12-30
                     document.getElementById('allPage:allForm:dataBlock:dataline_R:'+indexNumber+':inputField:6:inputField').value = result.object[0].trialUser;
                     // let transParameters = {
                     //     txId: result.txId,
@@ -519,6 +525,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 +552,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 +568,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>
@@ -705,7 +723,7 @@
                 </div>
                 <apex:repeat id="dataline_R_aws" value="{!pageB.rowBList}" var="var">
                     <apex:inputHidden value="{!var.rnd.AWS_Data_Id__c}" id="EditAWSDataId"/> 
-                    <apex:inputHidden value="{!var.rnd.Trial_User_Encrypt__c}" id="TrialUserEncrypt"/> 
+                    <!-- <apex:inputHidden value="{!var.rnd.Trial_User_Encrypt__c}" id="TrialUserEncrypt"/>  zhj 鏂版柟妗堟敼閫� 2022-12-30 -->        
                 </apex:repeat>
                 <div id="in_Div" style="overflow:auto;">
                     <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData">

--
Gitblit v1.9.1